调整

suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysUserOrderAuthorServiceImpl.java

@@ -483,10 +483,7 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
      */
     @Override
     public void tmsPlantByOrder() {
-        List<TmsLogisticsStatus> tmslist = new ArrayList<TmsLogisticsStatus>();
-        List<DeliverQuantityConfirm> deliverlist = new ArrayList<DeliverQuantityConfirm>();
         List<TmsLogisticsStatus> tmsStatusLog=sysBatchSignForMapper.selectByDelivery();
-        List<TmsLogisticsStatus> tmsStatus5list = new ArrayList<TmsLogisticsStatus>();
         Map<Object,List<TmsLogisticsStatus>> keytmsMap=new HashMap<>();
        if(tmsStatusLog !=null && tmsStatusLog.size()>0){
            keytmsMap=tmsStatusLog.stream().collect(Collectors.groupingBy(TmsLogisticsStatus::getDeliveryNumber));
@@ -499,10 +496,11 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
         }
         List<MetaHanaDeliverOrder> deliverOrderListstatusNo=metaHanaDeliverOrderMapper.selectMetaDeliverOrderListByNo();
         if(deliverOrderListstatusNo !=null && deliverOrderListstatusNo.size()>0){
+            List<TmsLogisticsStatus> tmslistNo = new ArrayList<TmsLogisticsStatus>();
             for (MetaHanaDeliverOrder deliver:deliverOrderListstatusNo
                  ) {
                 if(("未复核").equals(deliver.getReviewStatus())){
-                    List<String> tms = tmslist.stream().map(TmsLogisticsStatus::getDeliveryNumber).collect(Collectors.toList());
+                    List<String> tms = tmslistNo.stream().map(TmsLogisticsStatus::getDeliveryNumber).collect(Collectors.toList());
                     if((keytmsMap ==null && !tms.contains(deliver.getDeliverNumber())) || (!keytmsMap.containsKey(deliver.getDeliverNumber()) && !tms.contains(deliver.getDeliverNumber())) ){
                                TmsLogisticsStatus tmsLogisticsStatus=new TmsLogisticsStatus();
                                tmsLogisticsStatus.setCreateBy("HBS");
@@ -525,17 +523,23 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                                tmsLogisticsStatus.setOrderNumber(deliver.getDocNumber());
                                tmsLogisticsStatus.setAssignTime(new Date());
                                tmsLogisticsStatus.setTransferOrder("n");
-                               tmslist.add(tmsLogisticsStatus);
+                               tmslistNo.add(tmsLogisticsStatus);
                     }
                 }
             }
+            if(tmslistNo !=null && tmslistNo.size()>0){
+                sysBatchSignForMapper.saveTmsLogisticsStatus(tmslistNo);
+            }
         }
         List<MetaHanaDeliverOrder> deliverOrderListstatusYes=metaHanaDeliverOrderMapper.selectMetaDeliverOrderListByYes();
         if(deliverOrderListstatusYes !=null && deliverOrderListstatusYes.size()>0){
+            List<TmsLogisticsStatus> tmslistYes = new ArrayList<TmsLogisticsStatus>();
+            List<TmsLogisticsStatus> tmsStatus5list = new ArrayList<TmsLogisticsStatus>();
+            List<DeliverQuantityConfirm> deliverlist = new ArrayList<DeliverQuantityConfirm>();
             for (MetaHanaDeliverOrder deliver:deliverOrderListstatusYes
             ) {
                 if(("已复核").equals(deliver.getReviewStatus())){
-                    List<String> tms = tmslist.stream().map(TmsLogisticsStatus::getDeliveryNumber).collect(Collectors.toList());
+                    List<String> tms = tmslistYes.stream().map(TmsLogisticsStatus::getDeliveryNumber).collect(Collectors.toList());
                         if((keytmsMap ==null && !tms.contains(deliver.getDeliverNumber())) || (!keytmsMap.containsKey(deliver.getDeliverNumber())  && !tms.contains(deliver.getDeliverNumber()))){
                                 TmsLogisticsStatus tmsLogisticsStatus=new TmsLogisticsStatus();
                                 tmsLogisticsStatus.setCreateBy("HBS");
@@ -566,7 +570,7 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                                     //LOGGER.error("时间转换错误, string = {}", s, e);
                                 }
                                 tmsLogisticsStatus.setArrivalGoodsTime(date);
-                                tmslist.add(tmsLogisticsStatus);
+                            tmslistYes.add(tmsLogisticsStatus);
                } else if(keytmsMap !=null && keytmsMap.containsKey(deliver.getDeliverNumber())){
                     List<TmsLogisticsStatus> tmsStatusList= keytmsMap.get(deliver.getDeliverNumber());
                     if(tmsStatusList !=null && tmsStatusList.size()>0){
@@ -616,8 +620,8 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                 }
                 }
             }
-            if(tmslist !=null && tmslist.size()>0){
-                sysBatchSignForMapper.saveTmsLogisticsStatus(tmslist);
+            if(tmslistYes !=null && tmslistYes.size()>0){
+                sysBatchSignForMapper.saveTmsLogisticsStatus(tmslistYes);
             }
             if(tmsStatus5list !=null && tmsStatus5list.size()>0) {
                 sysBatchSignForMapper.updateBatchTmsStatus(tmsStatus5list);