Merge remote-tracking branch 'origin/test' into test

performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java

@@ -279,25 +279,28 @@ public class OrderChildDtsListener  {
     private void afterLogicalProcessing(OrderChild before,OrderChild after){
         BigDecimal beforeLoadNet = before.getLoadNet();//变化前装车净重
         BigDecimal afterLoadNet = after.getLoadNet();//变化后装车净重
-        Integer status = after.getStatus();
+        Integer beforeStatus = before.getStatus();//之前状态
+        Integer afterStatus = after.getStatus();//之后状态
         String orderGoodsNo = after.getOrderGoodsNo();//货单号
-        log.info("之前装车净重:{},之后装车净重:{},运单状态:{},货单号:{}",beforeLoadNet,afterLoadNet,status,orderGoodsNo);
+        log.info("之前装车净重:{},之后装车净重:{},之前运单状态:{},之后运单状态:{},货单号:{}",
+                beforeLoadNet,afterLoadNet,beforeStatus,afterStatus,orderGoodsNo);
 
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderGoodsNo)
                 .orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);//货单详情查询
 
-        BigDecimal loadNet = BigDecimal.ZERO;//定义实际装车吨数
-        if(Objects.nonNull(afterLoadNet) && Objects.equals(after.getStatus(),OrderChildEnum.Status.LOAD.getCode())){//第一次装车
+        BigDecimal loadNet;//定义实际装车吨数
+        if(Objects.nonNull(afterLoadNet)){
+            if(Objects.equals(after.getStatus(),OrderChildEnum.Status.LOAD.getCode())
+                    && !Objects.equals(afterStatus,beforeStatus)){//第一次装车
                 loadNet = afterLoadNet;
-        }else if(Objects.nonNull(afterLoadNet) && OrderChildEnum.DTS_LISTEN_CANCEL_lIST.contains(after.getStatus())){//装车后取消
+            }else if(OrderChildEnum.DTS_LISTEN_CANCEL_lIST.contains(after.getStatus())){//装车后取消
                 //运单取消,货单装车吨数需要减掉
                 loadNet = afterLoadNet.negate();
-        }else if(Objects.nonNull(before.getLoadNet()) && Objects.equals(before.getLoadNet(),after.getLoadNet())){//修改装车吨数
+            }else if(!Objects.equals(beforeLoadNet,afterLoadNet)){//修改装车吨数
                 loadNet = afterLoadNet.subtract(beforeLoadNet);
             }else{
                 return;
             }
-
             //货单已经装车吨数
             BigDecimal alreadyLoadWeight = orderGoods.getAlreadyLoadWeight() == null? BigDecimal.ZERO:orderGoods.getAlreadyLoadWeight();
             alreadyLoadWeight = alreadyLoadWeight.add(loadNet);
@@ -307,6 +310,10 @@ public class OrderChildDtsListener  {
             og.setId(orderGoods.getId());
             og.setAlreadyLoadWeight(alreadyLoadWeight);
             orderGoodsDao.updateEntityByKey(og);
+        }
+
+
+
 
 
     }