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

md

Browse Source
This commit is contained in:
linfso 2024-06-24 21:52:53 +08:00
parent 595c0265fc
commit 62031a737e
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
View File

@ -519,6 +519,11 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
throw new EmisBizError(EmisBizErrorType.SCAN_PARAM_ERROR,"合包号不属于该网点"); throw new EmisBizError(EmisBizErrorType.SCAN_PARAM_ERROR,"合包号不属于该网点");
} }
if(!emisTmsPack.getPackStatus().equals("0")){
throw new EmisBizError(EmisBizErrorType.SCAN_PARAM_ERROR,"合包已组包或拆包，不允许再次组包");
}
// 子单号处理 // 子单号处理
for (String scanBillCode : billCodeArr) { for (String scanBillCode : billCodeArr) {
// 返回原始数据返回 // 返回原始数据返回
@ -622,6 +627,11 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
return itemList; 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, "已签收"); // throw new EmisBizError(EmisBizErrorType.SCAN_HAS_SIGN, "已签收");
} }
// 已组包，不允许再组包 // 已组包，不允许再组包
int scanCnt=emisTmsPackDtlMapper.checkIsExists(scanBillCode); int scanCnt=emisTmsPackDtlMapper.checkIsExists(scanBillCode);
if (scanCnt > 0) { if (scanCnt > 0) {
@ -898,7 +906,6 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
} }
// 更新合包总重量 // 更新合包总重量
EmisTmsPack emisTmsPack = new EmisTmsPack();
emisTmsPack.setPackNo(packNo); emisTmsPack.setPackNo(packNo);
emisTmsPack.setTotalWeight(scanWeight); emisTmsPack.setTotalWeight(scanWeight);
emisTmsPack.setTotalWaybillQty(mainBillMap.size()); emisTmsPack.setTotalWaybillQty(mainBillMap.size());
@ -953,8 +960,12 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
return itemList; 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.getCreateSite())
&& !getCurrentUser().getOwnerSiteCode().equals(emisTmsPack.getNextSiteCode()) && !getCurrentUser().getOwnerSiteCode().equals(emisTmsPack.getNextSiteCode())
){ ){