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

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

@@ -960,7 +960,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setFreight(orderChildFreightCalc(orderChild));
         orderChild.setStatus(OrderChildEnum.Status.LOAD.getCode());
-        orderChild.setFirstLoadTime(LocalDateTime.now());
+        orderChild.setFirstLoadTime(covertStringToDefaultLocalDateTime(param.getLoadTime()));
         orderChildDao.updateLoad(orderChild);
 
         orderChildImageDao.batchSaveEntity(imageList);
@@ -1132,7 +1132,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setStatus(OrderChildEnum.Status.UNLOAD.getCode());
         orderChild.setPoundStatus(OrderChildPoundAuditEnum.Status.AUDIT.getCode());
         orderChild.setFreight(orderChildFreightCalc(orderChild));
-        orderChild.setFirstUnloadTime(LocalDateTime.now());
+        orderChild.setFirstUnloadTime(covertStringToDefaultLocalDateTime(param.getUnloadTime()));
 
         OrderChildPoundAudit audit = new OrderChildPoundAudit();
         audit.setChildNo(childNo);