aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'demand: TMS系统 - 运输管理 - 货物组批次编辑相同运单移除后又添加显示0bug修复' (#154) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/154
This commit is contained in:
heyu 2025-08-12 14:05:38 +08:00
commit a6b3030dea
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchDtlServiceImpl.java
View File

@ -141,9 +141,6 @@ public class EmisTmsSiteBatchDtlServiceImpl implements IEmisTmsSiteBatchDtlServi
if (StringUtils.isBlank(billCode)) { if (StringUtils.isBlank(billCode)) {
throw new EmisBizError(EmisBizErrorType.FAIL, "运单号不能为空"); throw new EmisBizError(EmisBizErrorType.FAIL, "运单号不能为空");
} }
if (StringUtils.isBlank(batchNo)) {
throw new EmisBizError(EmisBizErrorType.FAIL, "批次号不能为空");
}
if (StringUtils.isBlank(startSiteCode)) { if (StringUtils.isBlank(startSiteCode)) {
throw new EmisBizError(EmisBizErrorType.FAIL, "起始网点编码不能为空"); throw new EmisBizError(EmisBizErrorType.FAIL, "起始网点编码不能为空");
} }
@ -161,6 +158,7 @@ public class EmisTmsSiteBatchDtlServiceImpl implements IEmisTmsSiteBatchDtlServi
EmisTmsSiteBatchDtl result = new EmisTmsSiteBatchDtl(); EmisTmsSiteBatchDtl result = new EmisTmsSiteBatchDtl();
result.setWaybillDetail(emisWaybill); result.setWaybillDetail(emisWaybill);
if (StringUtils.isNotBlank(batchNo)) {
// 根据批次号、运单号查询emis_tms_site_batch_dtl，如果存在，直接返回数据 // 根据批次号、运单号查询emis_tms_site_batch_dtl，如果存在，直接返回数据
EmisTmsSiteBatchDtl existingBatchDtl = emisTmsSiteBatchDtlMapper EmisTmsSiteBatchDtl existingBatchDtl = emisTmsSiteBatchDtlMapper
.selectEmisTmsSiteBatchDtlByBatchNoAndBillCode(batchNo, billCode); .selectEmisTmsSiteBatchDtlByBatchNoAndBillCode(batchNo, billCode);
@ -170,6 +168,7 @@ public class EmisTmsSiteBatchDtlServiceImpl implements IEmisTmsSiteBatchDtlServi
result.setBatchVolume(existingBatchDtl.getBatchVolume()); result.setBatchVolume(existingBatchDtl.getBatchVolume());
return result; return result;
} }
}
// 查询运输计划规则 // 查询运输计划规则
EmisTransPlanRule emisTransPlanRule = new EmisTransPlanRule(); EmisTransPlanRule emisTransPlanRule = new EmisTransPlanRule();