Merge remote-tracking branch 'origin/v26.2-jdk17springboot3-20240912' into test_jdk17

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

@@ -110,15 +110,21 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
     public void updatePoundAudit(PoundAuditParam param) {
         //运单详情
         OrderChild orderChild = orderChildDao.getByChildNo(param.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-        BigDecimal loadNet = param.getLoadRough().subtract(param.getLoadTare());
-        if (loadNet.compareTo(new BigDecimal(99)) > 0) {
-            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_LOAD_NET_ERROR);
-        }
-        if (param.getLoadTare().compareTo(param.getLoadRough()) > 0) {
-            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_TRACE_GT_ROUGH);
+
+        BigDecimal loadNet = orderChild.getLoadNet();
+        BigDecimal unLoadNet = orderChild.getUnloadNet();
+        if (Objects.equals(param.getStatus(), OrderChildPoundAuditEnum.Status.APPROVED.getCode())) {
+            loadNet = param.getLoadRough().subtract(param.getLoadTare());
+            if (loadNet.compareTo(new BigDecimal(99)) > 0) {
+                throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_LOAD_NET_ERROR);
+            }
+            if (param.getLoadTare().compareTo(param.getLoadRough()) > 0) {
+                throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_TRACE_GT_ROUGH);
+            }
+
+            unLoadNet = param.getUnloadRough().subtract(param.getUnloadTare());
         }
 
-        BigDecimal unLoadNet = param.getUnloadRough().subtract(param.getUnloadTare());
         if(OrderChildEnum.CANCEL_lIST.contains(orderChild.getStatus())){
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_CANCELED);
         }

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

@@ -46,6 +46,7 @@ public class VehicleWarnUserServiceImpl implements VehicleWarnUserService {
         if (optional.isPresent()){
             throw new ServiceSystemException(ResultEnum.VEHICLE_WARN_USER_EXIST);
         }
+
         List<Integer> warnTypeList = Arrays.stream(VehicleWarnConfigEnum.WarnType.values())
                 .map(item -> item.getCode()).collect(Collectors.toList());
         List<Integer> lineWarnTypeList = Arrays.stream(LineWarnConfigEnum.WarnType.values())
@@ -54,6 +55,7 @@ public class VehicleWarnUserServiceImpl implements VehicleWarnUserService {
         VehicleWarnUser vehicleWarnUser = new VehicleWarnUser();
         vehicleWarnUser.setName(param.getName());
         vehicleWarnUser.setMobile(param.getMobile());
+        vehicleWarnUser.setOrderWarnTypeJson(JSON.toJSONString(new ArrayList<>()));
         vehicleWarnUser.setWarnTypeJson(JSON.toJSONString(warnTypeList));
         vehicleWarnUser.setLineWarnTypeJson(JSON.toJSONString(lineWarnTypeList));
         vehicleWarnUser.setCreateBy(loginUserInfo.getUserName());