Merge branch 'refs/heads/v18.5_pound_list_ocr_20240701' into test

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -983,7 +983,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setLoadRough(param.getLoadRough());
         orderChild.setLoadTare(param.getLoadTare());
         orderChild.setLoadNet(loadNet);
-        orderChild.setLoadTime(StringUtils.isBlank(param.getLoadTime())?null:covertStringToDefaultLocalDateTime(param.getLoadTime()));
+        orderChild.setLoadTime(StringUtils.isBlank(param.getLoadTime())?LocalDateTime.now():covertStringToDefaultLocalDateTime(param.getLoadTime()));
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setFreight(orderChildFreightCalc(orderChild));
         orderChild.setStatus(OrderChildEnum.Status.LOAD.getCode());
@@ -1021,7 +1021,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setLoadRough(param.getLoadRough());
         orderChild.setLoadTare(param.getLoadTare());
         orderChild.setLoadNet(loadNet);
-        orderChild.setLoadTime(StringUtils.isBlank(param.getLoadTime())?null:covertStringToDefaultLocalDateTime(param.getLoadTime()));
+        orderChild.setLoadTime(StringUtils.isBlank(param.getLoadTime())?LocalDateTime.now():covertStringToDefaultLocalDateTime(param.getLoadTime()));
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setFreight(orderChildFreightCalc(orderChild));
         //更新货单吨数
@@ -1167,7 +1167,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setUnloadRough(param.getUnloadRough());
         orderChild.setUnloadTare(param.getUnloadTare());
         orderChild.setUnloadNet(loadNet);
-        orderChild.setUnloadTime(StringUtils.isBlank(param.getUnloadTime())?null:covertStringToDefaultLocalDateTime(param.getUnloadTime()));
+        orderChild.setUnloadTime(StringUtils.isBlank(param.getUnloadTime())?LocalDateTime.now():covertStringToDefaultLocalDateTime(param.getUnloadTime()));
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setStatus(OrderChildEnum.Status.UNLOAD.getCode());
         orderChild.setPoundStatus(OrderChildPoundAuditEnum.Status.AUDIT.getCode());
@@ -1229,7 +1229,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setUnloadRough(param.getUnloadRough());
         orderChild.setUnloadTare(param.getUnloadTare());
         orderChild.setUnloadNet(loadNet);
-        orderChild.setUnloadTime(StringUtils.isBlank(param.getUnloadTime())?null:covertStringToDefaultLocalDateTime(param.getUnloadTime()));
+        orderChild.setUnloadTime(StringUtils.isBlank(param.getUnloadTime())?LocalDateTime.now():covertStringToDefaultLocalDateTime(param.getUnloadTime()));
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setPoundStatus(OrderChildPoundAuditEnum.Status.AUDIT.getCode());
         orderChild.setFreight(orderChildFreightCalc(orderChild));
@@ -1351,8 +1351,8 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setFreight(orderChildFreightCalc(orderChild));
         orderChild.setPoundStatus(OrderChildPoundAuditEnum.Status.AUDIT.getCode());
-        orderChild.setLoadTime(StringUtils.isBlank(param.getLoadTime())?null:covertStringToDefaultLocalDateTime(param.getLoadTime()));
-        orderChild.setUnloadTime(StringUtils.isBlank(param.getUnloadTime())?null:covertStringToDefaultLocalDateTime(param.getUnloadTime()));
+        orderChild.setLoadTime(StringUtils.isBlank(param.getLoadTime())?orderChild.getLoadTime():covertStringToDefaultLocalDateTime(param.getLoadTime()));
+        orderChild.setUnloadTime(StringUtils.isBlank(param.getUnloadTime())?orderChild.getUnloadTime():covertStringToDefaultLocalDateTime(param.getUnloadTime()));
 
         OrderChildPoundAudit audit = new OrderChildPoundAudit();
         audit.setChildNo(childNo);