From 62031a737ea952d8c111571fce1ea001bb628e3c Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 24 Jun 2024 21:52:53 +0800 Subject: [PATCH] md --- .../impl/EmisTmsScanRecordServiceImpl.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java index 67e10daa3..1edfaacf4 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java @@ -519,6 +519,11 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm throw new EmisBizError(EmisBizErrorType.SCAN_PARAM_ERROR,"合包号不属于该网点"); } + if(!emisTmsPack.getPackStatus().equals("0")){ + throw new EmisBizError(EmisBizErrorType.SCAN_PARAM_ERROR,"合包已组包或拆包，不允许再次组包"); + } + + // 子单号处理 for (String scanBillCode : billCodeArr) { // 返回原始数据返回 @@ -622,6 +627,11 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm return itemList; } + if(!emisTmsPack.getPackStatus().equals("1")){ + throw new EmisBizError(EmisBizErrorType.SCAN_PARAM_ERROR,"合包未组包"); + } + + // 检查是否是合包,如果合包则做拆包处理 // // 检查组包信息是否存在 @@ -801,8 +811,6 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm // throw new EmisBizError(EmisBizErrorType.SCAN_HAS_SIGN, "已签收"); } - - // 已组包，不允许再组包 int scanCnt=emisTmsPackDtlMapper.checkIsExists(scanBillCode); if (scanCnt > 0) { @@ -898,7 +906,6 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm } // 更新合包总重量 - EmisTmsPack emisTmsPack = new EmisTmsPack(); emisTmsPack.setPackNo(packNo); emisTmsPack.setTotalWeight(scanWeight); emisTmsPack.setTotalWaybillQty(mainBillMap.size()); @@ -953,8 +960,12 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm return itemList; } + if(!emisTmsPack.getPackStatus().equals("1")){ + throw new EmisBizError(EmisBizErrorType.SCAN_PARAM_ERROR,"合包未组包"); + } - if( + + if( !getCurrentUser().getOwnerSiteCode().equals(emisTmsPack.getCreateSite()) && !getCurrentUser().getOwnerSiteCode().equals(emisTmsPack.getNextSiteCode()) ){