Merge branch 'refs/heads/v26.2-jdk17springboot3-20240912' into test_jdk17

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

@@ -16,7 +16,7 @@ import com.msl.message.sms.api.sms.content.SmsMessageContentImpl;
 import com.msl.message.sms.api.sms.recipient.SmsMessageRecipientImpl;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Component;

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

@@ -110,7 +110,11 @@ 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());
+
+        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);
             }
@@ -118,7 +122,9 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
                 throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_TRACE_GT_ROUGH);
             }
 
-        BigDecimal unLoadNet = param.getUnloadRough().subtract(param.getUnloadTare());
+            unLoadNet = param.getUnloadRough().subtract(param.getUnloadTare());
+        }
+
         if(OrderChildEnum.CANCEL_lIST.contains(orderChild.getStatus())){
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_CANCELED);
         }