Merge remote-tracking branch 'origin/v6.4_transportation_20231110' into test

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

@@ -2,10 +2,7 @@ package com.clx.performance.service.impl;
 
 
 import com.clx.performance.dao.*;
-import com.clx.performance.enums.OrderChildLogEnum;
-import com.clx.performance.enums.OrderChildPoundAuditEnum;
-import com.clx.performance.enums.OrderGoodsStatusEnum;
-import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.enums.*;
 import com.clx.performance.model.*;
 import com.clx.performance.param.pc.PoundAuditParam;
 import com.clx.performance.service.OrderChildLogService;
@@ -77,6 +74,9 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
         //运单详情
         OrderChild orderChild = orderChildDao.getByChildNo(param.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
+        if(OrderChildEnum.CANCEL_lIST.contains(orderChild.getStatus())){
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_CANCELED);
+        }
         //待审核磅单
         OrderChildPoundAudit poundAuditDetail = orderChildPoundAuditDao.getPoundAuditDetail(param.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         if(!Objects.equals(poundAuditDetail.getStatus(),OrderChildPoundAuditEnum.Status.AUDIT.getCode())){