commit

PddServer/src/main/java/org/ta/pddserver/controller/PddLocalController.java

@@ -476,6 +476,7 @@ public class PddLocalController {
         PddServiceConsoInboundRequest notifyRequest = new PddServiceConsoInboundRequest();
         // 查询orderNO 下所有mailNo,判断是全部还是部分
         Long unNum = logOrderMailDetailImpl.getSumByCodeStatus(mailNoResponse.getLogisticsOrderCode(), (long) StatusEnum.SIGNED.getCode());
+        unNum += logOrderMailDetailImpl.getSumByCodeStatus(mailNoResponse.getLogisticsOrderCode(), (long) StatusEnum.ORDERCREATE.getCode());
         LogOrderEntity logOrderEntity = logOrderImpl.getByOrderCode(mailNoResponse.getLogisticsOrderCode());
         Long num = (long) logOrderEntity.getNum();
         log.info("已入库数量 {} ； 未入库数量 {}", num, unNum);
@@ -488,6 +489,7 @@ public class PddLocalController {
             num += 1;
             mailNoResponse.setEnterTime(TimeTool.getNowDate());
             mailNoResponse.setStatus(StatusEnum.INBOUND.getCode());
+            unNum -= 1;
         }
         notifyRequest.setPackageQuantity(num);
         mailNoResponse.setLength(inBoundRequest.getLength().intValue());
@@ -501,7 +503,7 @@ public class PddLocalController {
         notifyRequest.setTimeZone("UTC+8");
 
 
-        if (notifyRequest.getPackageQuantity() == num) {
+        if (unNum <= 0) {
             notifyRequest.setStatus("FULL_INBOUND");
         } else {
             notifyRequest.setStatus("PART_INBOUND");