diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index 012aeefe..90b56d80 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -5000,7 +5000,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { if (childCoilBo.getActualWarehouseId() != null) { validateActualWarehouseForAssign(childCoilBo.getActualWarehouseId(), null); } - if (pendingAction.getActionType() != 501 && childCoilBo.getActionType() != null) { + if (pendingAction.getActionType() != 501 && pendingAction.getActionType() != 505 && childCoilBo.getActionType() != null) { // 校验子卷净重不超过母卷 if (childCoilBo.getNetWeight() != null && parentCoil.getNetWeight() != null) { if (childCoilBo.getNetWeight().compareTo(parentCoil.getNetWeight()) > 0) { @@ -5136,7 +5136,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { .map(WmsMaterialCoil::getCurrentCoilNo) .collect(Collectors.toList()); - if (pendingAction.getActionType() != 501) { + if (pendingAction.getActionType() != 501 && pendingAction.getActionType() != 505) { // 校验所有子卷总重不超过母卷净重 if (parentCoil.getNetWeight() != null) { BigDecimal totalChildWeight = childCoils.stream()