Эх сурвалжийг харах

贸易订单审核通过才校验自动派车物流合同

donglang 5 сар өмнө
parent
commit
ab5f3e19be

+ 2 - 1
sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -2137,7 +2137,8 @@ public class KwoTradeOrderService {
         Map<String, Map<String, String>> dict = remoteSystemService.queryDictByType(List.of(DictTypeEnum.UNIT_TYPE.getType()));
         List<LogisticsEntDtoVO> validContractLog = new ArrayList<>();
         List<LogisticsEntDto> logisticsContractId = new ArrayList<>();
-        if (Objects.equals(DispatchWayEnums.AUTO_DISPATCH.getCode(), tradeContractResDto.getDispatchWay())) {
+        if (Objects.equals(DispatchWayEnums.AUTO_DISPATCH.getCode(), tradeContractResDto.getDispatchWay())
+                && Objects.equals(tradeOrderAuditParam.getStatus(), Global.NUMERICAL_ONE)) {
             //自动派单校验: 判断当前有无包含该商品的有效自动派车物流合同
             validContractLog = checkAutoContractLogOrder(unitMap, byOrderId, tradeContractResDto);
         } else {