This commit is contained in:
linfso 2024-12-26 05:46:22 +08:00
parent c3d30c8cab
commit 845e844f75

View File

@ -3633,8 +3633,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
}
if(!"1".equals(emisWaybillOld.getPickupMethod())){
throw new EmisBizError(EmisBizErrorType.FAIL,"取件方式非仓库收货");
if(!"1".equals(emisWaybillOld.getPickupMethod()) && !"3".equals(emisWaybillOld.getPickupMethod())){
throw new EmisBizError(EmisBizErrorType.FAIL,"取件方式非仓库收货/整柜提货");
}
if(StringUtils.isEmpty(emisWaybillOld.getIntoWarehouseBillCode())){
@ -3791,8 +3791,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
}
if(!"1".equals(emisWaybillOld.getPickupMethod())){
throw new EmisBizError(EmisBizErrorType.FAIL,"取件方式非仓库收货");
if(!"1".equals(emisWaybillOld.getPickupMethod()) && !"3".equals(emisWaybillOld.getPickupMethod())){
throw new EmisBizError(EmisBizErrorType.FAIL,"取件方式非仓库收货/整柜提货");
}
if(StringUtils.isEmpty(emisWaybillOld.getIntoWarehouseBillCode())){