Merge branch 'v5.5_settlement_20231011' into release

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

@@ -93,6 +93,8 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
         poundAuditDetail.setCreateTime(null);
         poundAuditDetail.setModifiedTime(null);
 
+        BigDecimal dif = param.getLoadNet().subtract(orderChild.getLoadNet());
+
         Integer type = OrderChildLogEnum.Type.POUND_AUDIT.getCode();
         if(Objects.equals(param.getStatus(), OrderChildPoundAuditEnum.Status.REJECT.getCode())){
             type = OrderChildLogEnum.Type.POUND_AUDIT_REJECT.getCode();
@@ -107,8 +109,6 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
                 orderChild.setUnloadNet(param.getUnloadNet());
             }
         }
-
-        BigDecimal dif = orderChild.getLoadNet().subtract(orderChild.getWeight());
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setFreight(orderChildFreightCalc(orderChild));
 

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

@@ -770,6 +770,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setUnloadTare(param.getUnloadTare());
         orderChild.setUnloadNet(param.getUnloadNet());
         orderChild.setUnloadTime(LocalDateTime.now());
+        orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setPoundStatus(OrderChildPoundAuditEnum.Status.AUDIT.getCode());
         orderChild.setFreight(orderChildFreightCalc(orderChild));