fix(wms/coil): 修正操作类型校验逻辑,增加对类型505的排除

在钢卷操作校验逻辑中,原代码仅排除了操作类型501(入库)对子卷操作类型的校验。调整后,增加对操作类型505(出库)的排除,确保在入库和出库操作中,子卷的操作类型字段不会因非空而被错误校验,避免因校验不匹配导致的业务异常。
This commit is contained in:
2026-06-03 15:06:25 +08:00
parent 9bd6077599
commit c34fc1e477

View File

@@ -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()