diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchDtlServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchDtlServiceImpl.java index c10be6ab0..7e7c8ce4f 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchDtlServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchDtlServiceImpl.java @@ -141,9 +141,6 @@ public class EmisTmsSiteBatchDtlServiceImpl implements IEmisTmsSiteBatchDtlServi if (StringUtils.isBlank(billCode)) { throw new EmisBizError(EmisBizErrorType.FAIL, "运单号不能为空"); } - if (StringUtils.isBlank(batchNo)) { - throw new EmisBizError(EmisBizErrorType.FAIL, "批次号不能为空"); - } if (StringUtils.isBlank(startSiteCode)) { throw new EmisBizError(EmisBizErrorType.FAIL, "起始网点编码不能为空"); } @@ -161,14 +158,16 @@ public class EmisTmsSiteBatchDtlServiceImpl implements IEmisTmsSiteBatchDtlServi EmisTmsSiteBatchDtl result = new EmisTmsSiteBatchDtl(); result.setWaybillDetail(emisWaybill); - // 根据批次号、运单号查询emis_tms_site_batch_dtl,如果存在,直接返回数据 - EmisTmsSiteBatchDtl existingBatchDtl = emisTmsSiteBatchDtlMapper - .selectEmisTmsSiteBatchDtlByBatchNoAndBillCode(batchNo, billCode); - if (existingBatchDtl != null) { - result.setBatchParcelQty(existingBatchDtl.getBatchParcelQty()); - result.setBatchWeight(existingBatchDtl.getBatchWeight()); - result.setBatchVolume(existingBatchDtl.getBatchVolume()); - return result; + if (StringUtils.isNotBlank(batchNo)) { + // 根据批次号、运单号查询emis_tms_site_batch_dtl,如果存在,直接返回数据 + EmisTmsSiteBatchDtl existingBatchDtl = emisTmsSiteBatchDtlMapper + .selectEmisTmsSiteBatchDtlByBatchNoAndBillCode(batchNo, billCode); + if (existingBatchDtl != null) { + result.setBatchParcelQty(existingBatchDtl.getBatchParcelQty()); + result.setBatchWeight(existingBatchDtl.getBatchWeight()); + result.setBatchVolume(existingBatchDtl.getBatchVolume()); + return result; + } } // 查询运输计划规则