Explorar o código

运单未签收状态修复

njs hai 5 meses
pai
achega
b8aff0e780

+ 5 - 6
suishenbang-system/src/main/java/com/dgtly/system/service/impl/MetaHanaDeliverSignServiceImpl.java

@@ -180,13 +180,13 @@ public class MetaHanaDeliverSignServiceImpl implements IMetaHanaDeliverSignServi
         List<DeliverSignVO> tmsShipMentList =  metaHanaDeliverSignMapper.selectDeliverSignByTmsShipmentNumber();
         if(tmsShipMentList !=null && tmsShipMentList.size()>0){
             List<TmsShipmentSignVO> tmsList = new ArrayList<>();
-            List<String> tmsSignList = new ArrayList<>();
             // 先建立运单号与对象的映射关系
             Map<String, List<DeliverSignVO>> shipmentMap = tmsShipMentList.stream()
                     .collect(Collectors.groupingBy(DeliverSignVO::getTmsShipmentNum));
 
             // 遍历处理每个运单号
                         shipmentMap.forEach((shipmentNum, list) -> {
+                            List<String> tmsSignList = new ArrayList<>();
                                 //已处理过就跳过
                                 if (!tmsList.contains(shipmentNum)) {
                                     TmsShipmentSignVO signVO = new TmsShipmentSignVO();
@@ -204,22 +204,21 @@ public class MetaHanaDeliverSignServiceImpl implements IMetaHanaDeliverSignServi
                                                 //正常签收
                                                 //没有签收时间的则为未签收
                                                 if (sign.getZDate() != null && !("").equals(sign.getZDate()) && !sign.getZDate().equals("00000000")) {
-                                                    sign.setSignType("1");
+                                                    tmsSignList.add("1");
                                                 } else {
-                                                    sign.setSignType("3");
+                                                    tmsSignList.add("3");
                                                 }
                                             } else {
                                                 //abnormalStatus 1未签收;2未开始补货;3部分签收;4全部签收
                                                 if (("4").equals(sign.getAbnormalStatus())) {
                                                     //正常签收
-                                                    sign.setSignType("1");
+                                                    tmsSignList.add("1");
                                                 } else {
                                                     //异常签收 待签收
-                                                    sign.setSignType("0");
+                                                    tmsSignList.add("0");
                                                 }
 
                                             }
-                                            tmsSignList.add(sign.getSignType().toString());
 
                                         });