diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 629ea78fd..f6bd107ae 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -1730,6 +1730,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"产品已停用,请重新选择产品"); } + if(emisWaybillSave.getParcelQty()==null || emisWaybillSave.getParcelQty().intValue()<=0){ + throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"总件数必须大于0"); + } + // 检查数据 if(emisWaybillSave.getBillWeight()==null || emisWaybillSave.getBillWeight().floatValue()<=0.0f){ throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"实重必须大于0"); @@ -2838,6 +2842,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb */ private void addNewWaybill(EmisWaybill emisWaybillSave) throws EmisBizError { + // 获取运单号,判断是不是子单已存在 + getMainBillCode() + + // 子单号做扣减 if ("1".equals(emisWaybillSave.getBlGenSubbill())) { Integer subBillCount = emisElectronicSitePagService.getTotalAvailablePagCount(emisWaybillSave.getSendSiteCode(), "T7080", "1002");