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

Merge pull request 'develop' (#310) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/310
This commit is contained in:
heyu 2026-01-29 17:37:00 +08:00
commit e0a2e33363
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -412,7 +412,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// 已签收不允许扫描 // 已签收不允许扫描
boolean isSign = checkWaybillIsSign(mainBillCode); boolean isSign = checkWaybillIsSign(mainBillCode);
if (isSign) { if (isSign && !ScanType.PICKUP_SCAN.opCode.equals(scanType)) {
scanResultItem.setResult("fail"); scanResultItem.setResult("fail");
scanResultItem.setMessage("运单已签收"); scanResultItem.setMessage("运单已签收");
scanResultItem.setErrorCode(EmisBizErrorType.SCAN_HAS_SIGN.errorCode); scanResultItem.setErrorCode(EmisBizErrorType.SCAN_HAS_SIGN.errorCode);
@ -673,7 +673,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// 已签收不允许扫描 // 已签收不允许扫描
boolean isSign = checkWaybillIsSign(mainBillCode); boolean isSign = checkWaybillIsSign(mainBillCode);
if (isSign) { if (isSign && !ScanType.PICKUP_SCAN.opCode.equals(scanType)) {
scanResultItem.setResult("fail"); scanResultItem.setResult("fail");
scanResultItem.setMessage("运单已签收"); scanResultItem.setMessage("运单已签收");
scanResultItem.setErrorCode(EmisBizErrorType.SCAN_HAS_SIGN.errorCode); scanResultItem.setErrorCode(EmisBizErrorType.SCAN_HAS_SIGN.errorCode);