Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into test

performance-api/src/main/java/com/clx/performance/feign/PerformanceSDKFeign.java

@@ -49,6 +49,7 @@ public interface PerformanceSDKFeign {
     Result<List<PerformanceProgressOperationLogVO>> queryPerformanceProgressLog(@RequestBody QueryPerformanceProgressLogAction action);
 
 
+
     @GetMapping(value = {"clx-performance/feign/sdk/getOrderCanExtractWeight"})
     Result<OrderCanExtractWeightDTO> getOrderCanExtractWeight(@RequestParam(value = "orderNo") String orderNo);
 

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

@@ -505,7 +505,6 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
         UserSessionData loginUserInfo =  TokenUtil.getLoginUserInfo();
         OrderGoodsEditParams orderGoodsParams = param.getOrderGoodsParams();
         OrderGoods oldOrderGoods = orderGoodsDao.getByOrderGoodsNo(orderGoodsParams.getOrderGoodsNo()).get();
-        //FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(param.getOrderNo());
         if (orderGoodsParams.getExtractWeight().compareTo(oldOrderGoods.getAlreadyTransportWeight()) < 0) {
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前货单提取吨数不能小于货单已拉运吨数");
         }
@@ -513,27 +512,25 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
         //考虑到借吨、恢复吨数的货单，逻辑判断实际的提取吨数
         BigDecimal oldResidueTransportWeight = this.calcOrderGoodsResidueWeight
                 (oldOrderGoods.getExtractWeight(),oldOrderGoods.getAlreadyTransportWeight());
-        BigDecimal realExtractWeight = oldResidueTransportWeight.compareTo(BigDecimal.ZERO) == 0?
-                oldOrderGoods.getAlreadyTransportWeight():oldOrderGoods.getAlreadyTransportWeight().add(oldResidueTransportWeight);
-        oldOrderGoods.setExtractWeight(realExtractWeight);
-        //本次提取增加或者减少的吨数  =  本次提取的吨数 - 货单原实际提取吨数
-        BigDecimal changeWeight = orderGoodsParams.getExtractWeight().subtract(realExtractWeight);
 
-        BigDecimal residueTransportWeight = this.calcOrderGoodsResidueWeight
-                (oldOrderGoods.getExtractWeight(),oldOrderGoods.getAlreadyTransportWeight());
+        OrderExtractWeightVO orderCanExtractWeight = orderWeightService.getOrderCanExtractWeight(param.getOrderNo());
+
+        BigDecimal canExtractWeight = orderCanExtractWeight.getCanExtractWeight();
+
+        BigDecimal changeWeight = orderGoodsParams.getExtractWeight().subtract(oldOrderGoods.getExtractWeight());
+
+        //当计算出的订单可提取量为负数时，说明订单下调吨数，货单超过订单量，所以货单编辑吨数的时候只能进行下调操作
+        if(canExtractWeight.compareTo(BigDecimal.ZERO) < 0  && changeWeight.compareTo(BigDecimal.ZERO) > 0){
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前货单总量已超吨，只能做吨数下调操作");
 
-        if (changeWeight.compareTo(BigDecimal.ZERO) > 0) {
-            orderGoodsParams.setResidueTransportWeight(residueTransportWeight.add(changeWeight));
-        }else if (changeWeight.compareTo(BigDecimal.ZERO) < 0 ){
-            orderGoodsParams.setResidueTransportWeight(orderGoodsParams.getExtractWeight().subtract(oldOrderGoods.getAlreadyTransportWeight()));
-        } else {
-            //当编辑吨数等于0 的时候，不进行拦截
-            orderGoodsParams.setResidueTransportWeight(residueTransportWeight);
         }
+        BigDecimal realExtractWeight = oldResidueTransportWeight.compareTo(BigDecimal.ZERO) <= 0?
+                oldOrderGoods.getAlreadyTransportWeight():oldOrderGoods.getExtractWeight();
+        oldOrderGoods.setExtractWeight(realExtractWeight);
 
         BigDecimal orderResidueWeight = orderWeightService.getOrderResidueWeight(param.getOrderNo());
 
-        if (orderResidueWeight.compareTo(orderGoodsParams.getExtractWeight().subtract(oldOrderGoods.getExtractWeight())) < 0) {
+        if (orderResidueWeight.compareTo(changeWeight) < 0) {
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前货单提取吨数已超订单可提取吨数");
         }