皮重毛重限制校验

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -44,6 +44,8 @@ public enum PerformanceResultEnum implements ResultEnum {
     ORDER_CHILD_CANCELED(1303, "运单状态已取消"),
     ORDER_CHILD_COMPLETE(1304, "运单状态已完成"),
     ORDER_CHILD_OPERATION_FORBID(1305, "没有权限操作"),
+    ORDER_CHILD_LOAD_NET_ERROR(1306, "净重不能大于99吨"),
+    ORDER_CHILD_TRACE_GT_ROUGH(1306, "皮重不能大于毛重"),
 
     ORDER_CHILD_SAVE_FAIL(1321, "接单失败,请稍后再试"),
     ORDER_CHILD_SAVE_FREQUENCY_ERROR(1322, "请误频繁点击"),

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

@@ -79,6 +79,13 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
         //运单详情
         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 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/OrderChildServiceImpl.java

@@ -696,6 +696,13 @@ public class OrderChildServiceImpl implements OrderChildService {
     private void updateLoadFirst(OrderChildLoadParam param, OrderChild orderChild, OrderGoods orderGoods) {
         String childNo = param.getChildNo();
         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);
+        }
+
 //        // 装车时间验证
 //        FeignOrderInfoVO orderInfo = orderService.getOrderInfo(orderChild.getOrderNo()).orElseThrow
 //        (PerformanceResultEnum.DATA_NOT_FIND);
@@ -741,6 +748,12 @@ public class OrderChildServiceImpl implements OrderChildService {
     private void updateReload(OrderChildLoadParam param, OrderChild orderChild, OrderGoods orderGoods) {
         String childNo = param.getChildNo();
         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);
+        }
 
         List<OrderChildImage> imageList = new ArrayList<>();
         for (String item : param.getLoadImageList()) {
@@ -817,6 +830,13 @@ public class OrderChildServiceImpl implements OrderChildService {
 
     private void updateUnloadFirst(OrderChildUnloadParam param, OrderChild orderChild) {
         String childNo = param.getChildNo();
+        BigDecimal loadNet = param.getUnloadRough().subtract(param.getUnloadTare());
+        if (loadNet.compareTo(new BigDecimal(99)) > 0) {
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_LOAD_NET_ERROR);
+        }
+        if (param.getUnloadTare().compareTo(param.getUnloadRough()) > 0) {
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_TRACE_GT_ROUGH);
+        }
 
 //        // 装车时间验证
 //        FeignOrderInfoVO orderInfo = orderService.getOrderInfo(orderChild.getOrderNo()).orElseThrow
@@ -842,7 +862,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setUnloadPoundNo(param.getUnloadPoundNo());
         orderChild.setUnloadRough(param.getUnloadRough());
         orderChild.setUnloadTare(param.getUnloadTare());
-        orderChild.setUnloadNet(orderChild.getUnloadRough().subtract(orderChild.getUnloadTare()));
+        orderChild.setUnloadNet(loadNet);
         orderChild.setUnloadTime(LocalDateTime.now());
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setStatus(OrderChildEnum.Status.UNLOAD.getCode());
@@ -880,7 +900,13 @@ public class OrderChildServiceImpl implements OrderChildService {
 
     private void updateReUnload(OrderChildUnloadParam param, OrderChild orderChild) {
         String childNo = param.getChildNo();
-
+        BigDecimal loadNet = orderChild.getUnloadRough().subtract(orderChild.getUnloadTare());
+        if (loadNet.compareTo(new BigDecimal(99)) > 0) {
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_LOAD_NET_ERROR);
+        }
+        if (param.getUnloadTare().compareTo(param.getUnloadRough()) > 0) {
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_TRACE_GT_ROUGH);
+        }
         // 审核中
         if (Objects.equals(orderChild.getPoundStatus(), OrderChildPoundAuditEnum.Status.AUDIT.getCode())) {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_POUND_AUDIT);
@@ -898,7 +924,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setUnloadPoundNo(param.getUnloadPoundNo());
         orderChild.setUnloadRough(param.getUnloadRough());
         orderChild.setUnloadTare(param.getUnloadTare());
-        orderChild.setUnloadNet(orderChild.getUnloadRough().subtract(orderChild.getUnloadTare()));
+        orderChild.setUnloadNet(loadNet);
         orderChild.setUnloadTime(LocalDateTime.now());
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setPoundStatus(OrderChildPoundAuditEnum.Status.AUDIT.getCode());
@@ -926,6 +952,21 @@ public class OrderChildServiceImpl implements OrderChildService {
         Long userNo = loginUserInfo.getUserNo();
         String childNo = param.getChildNo();
         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 unLoadNet = param.getUnloadRough().subtract(param.getUnloadTare());
+
+        if (unLoadNet.compareTo(new BigDecimal(99)) > 0) {
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_LOAD_NET_ERROR);
+        }
+        if (param.getUnloadTare().compareTo(param.getUnloadRough()) > 0) {
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_TRACE_GT_ROUGH);
+        }
+
         OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(
                 PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
         if (Objects.equals(orderChild.getDriverUserNo(), userNo)) {
@@ -983,7 +1024,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setLoadNet(loadNet);
         orderChild.setUnloadRough(param.getUnloadRough());
         orderChild.setUnloadTare(param.getUnloadTare());
-        orderChild.setUnloadNet(param.getUnloadNet());
+        orderChild.setUnloadNet(unLoadNet);
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setFreight(orderChildFreightCalc(orderChild));