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

Merge pull request 'demand: TMS系统 APP - 问题件录入 - 已签收允许扫描' (#309) from develop into master

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

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

@ -1958,14 +1958,14 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
}
// 已签收不允许扫描
boolean isSign = checkWaybillIsSign(mainBillCode);
if (isSign) {
scanResultItem.setResult("fail");
scanResultItem.setMessage("已签收");
scanResultItem.setErrorCode(EmisBizErrorType.SCAN_HAS_SIGN.errorCode);
itemList.add(scanResultItem);
return itemList;
}
// boolean isSign = checkWaybillIsSign(mainBillCode);
// if (isSign) {
// scanResultItem.setResult("fail");
// scanResultItem.setMessage("已签收");
// scanResultItem.setErrorCode(EmisBizErrorType.SCAN_HAS_SIGN.errorCode);
// itemList.add(scanResultItem);
// return itemList;
// }
// 如果已被定制账单，面单删除等不允许做问题件
EmisSettleSubBill emisSettleSubBill=emisSettleSubBillMapper.selectSettleSubBillBySubBillNo(mainBillCode);