Parcourir la source

未上tms工厂运维

njs il y a 2 ans
Parent
commit
881451ad3e

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

@@ -533,9 +533,9 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                         }
                         if ((keytmsMap == null) || (!keytmsMap.containsKey(deliver.getDeliverNumber()) && !tms.contains(deliver.getDeliverNumber()))) {
                             TmsLogisticsStatus tmsLogisticsStatus = new TmsLogisticsStatus();
-                            tmsLogisticsStatus.setCreateBy("HBS");
+                            tmsLogisticsStatus.setCreateBy("未上TMS");
                             tmsLogisticsStatus.setCreateTime(new Date());
-                            tmsLogisticsStatus.setUpdateBy("HBS");
+                            tmsLogisticsStatus.setUpdateBy("未上TMS");
                             tmsLogisticsStatus.setUpdateTime(new Date());
                             tmsLogisticsStatus.setIsDelete("0");
                             tmsLogisticsStatus.setOrderCreationTime("");
@@ -546,8 +546,8 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                                 tmsLogisticsStatus.setTmsShipmentNumber(deliver.getShipmentNumber());
                             }
                             tmsLogisticsStatus.setStatus("1");
-                            tmsLogisticsStatus.setDriverName("HBS");
-                            tmsLogisticsStatus.setCarNumber("好邦手");
+                            tmsLogisticsStatus.setDriverName("未上TMS");
+                            tmsLogisticsStatus.setCarNumber("未上TMS");
                             tmsLogisticsStatus.setDriverPhone("13888888888");
                             tmsLogisticsStatus.setCustomerCode(deliver.getCustomerCode());
                             tmsLogisticsStatus.setOrderNumber(deliver.getDocNumber());
@@ -570,9 +570,9 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                             }
                             if ((keytmsMap == null ) || (!keytmsMap.containsKey(deliver.getDeliverNumber()) && !tms.contains(deliver.getDeliverNumber()))) {
                                 TmsLogisticsStatus tmsLogisticsStatus = new TmsLogisticsStatus();
-                                tmsLogisticsStatus.setCreateBy("HBS");
+                                tmsLogisticsStatus.setCreateBy("未上TMS");
                                 tmsLogisticsStatus.setCreateTime(new Date());
-                                tmsLogisticsStatus.setUpdateBy("HBS");
+                                tmsLogisticsStatus.setUpdateBy("未上TMS");
                                 tmsLogisticsStatus.setUpdateTime(new Date());
                                 tmsLogisticsStatus.setIsDelete("0");
                                 tmsLogisticsStatus.setOrderCreationTime("");
@@ -583,8 +583,8 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                                     tmsLogisticsStatus.setTmsShipmentNumber(deliver.getShipmentNumber());
                                 }
                                 tmsLogisticsStatus.setStatus("5");
-                                tmsLogisticsStatus.setDriverName("HBS");
-                                tmsLogisticsStatus.setCarNumber("好邦手");
+                                tmsLogisticsStatus.setDriverName("未上TMS");
+                                tmsLogisticsStatus.setCarNumber("未上TMS");
                                 tmsLogisticsStatus.setDriverPhone("13888888888");
                                 tmsLogisticsStatus.setCustomerCode(deliver.getCustomerCode());
                                 tmsLogisticsStatus.setOrderNumber(deliver.getDocNumber());
@@ -598,6 +598,8 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                                     //LOGGER.error("时间转换错误, string = {}", s, e);
                                 }
                                 tmsLogisticsStatus.setArrivalGoodsTime(date);
+                                tmsLogisticsStatus.setGetGoodsTime(date);
+                                tmsLogisticsStatus.setFactoryTime(date);
                                 tmslistYes.add(tmsLogisticsStatus);
                                 if (tmslistYes != null && tmslistYes.size() > 5000) {
                                     sysBatchSignForMapper.saveTmsLogisticsStatus(tmslistYes);
@@ -633,6 +635,9 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                                             //LOGGER.error("时间转换错误, string = {}", s, e);
                                         }
                                         tmsStatus.get().setArrivalGoodsTime(date);
+                                        tmsStatus.get().setArrivalGoodsTime(date);
+                                        tmsStatus.get().setGetGoodsTime(date);
+                                        tmsStatus.get().setFactoryTime(date);
                                         tmsStatus.get().setUpdateTime(new Date());
                                         tmsStatus5list.add(tmsStatus.get());
                                         if (tmsStatus5list != null && tmsStatus5list.size() > 5000) {
@@ -644,9 +649,9 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                                 List<String> newdeliver = deliverlist.stream().map(DeliverQuantityConfirm::getCode).collect(Collectors.toList());
                                 if ((deliverNumbers.size() == 0 && !newdeliver.contains(deliver.getCode())) || (!deliverNumbers.contains(deliver.getCode()) && !newdeliver.contains(deliver.getCode()))) {
                                     DeliverQuantityConfirm number = new DeliverQuantityConfirm();
-                                    number.setCreateBy("HBS");
+                                    number.setCreateBy("未上TMS");
                                     number.setCreateTime(new Date());
-                                    number.setUpdateBy("HBS");
+                                    number.setUpdateBy("未上TMS");
                                     number.setUpdateTime(new Date());
                                     number.setIsDelete("0");
                                     number.setOrderNumber(deliver.getDocNumber());