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-12-26 11:51:50 +08:00
parent 8a062516ed
commit 8cbb06f203
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1791,14 +1791,16 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// 如果已被定制账单，面单删除等不允许做问题件 // 如果已被定制账单，面单删除等不允许做问题件
EmisSettleSubBill emisSettleSubBill=emisSettleSubBillMapper.selectSettleSubBillBySubBillNo(mainBillCode); EmisSettleSubBill emisSettleSubBill=emisSettleSubBillMapper.selectSettleSubBillBySubBillNo(mainBillCode);
if("1".equals(emisSettleSubBill.getBlMerge()) if(emisSettleSubBill!=null) {
&& ( "151".equals(problemType) || "170".equals(problemType) || "173".equals(problemType) ) if ("1".equals(emisSettleSubBill.getBlMerge())
){ && ("151".equals(problemType) || "170".equals(problemType) || "173".equals(problemType))
scanResultItem.setResult("fail"); ) {
scanResultItem.setMessage("已定制账单，不允许登记，请联系财务从账单中剔除后再操作"); scanResultItem.setResult("fail");
scanResultItem.setErrorCode(EmisBizErrorType.BILL_LOCK.errorCode); scanResultItem.setMessage("已定制账单，不允许登记，请联系财务从账单中剔除后再操作");
itemList.add(scanResultItem); scanResultItem.setErrorCode(EmisBizErrorType.BILL_LOCK.errorCode);
return itemList; itemList.add(scanResultItem);
return itemList;
}
} }
EmisWaybillProblemInfo emisWaybillProblemInfo = new EmisWaybillProblemInfo(); EmisWaybillProblemInfo emisWaybillProblemInfo = new EmisWaybillProblemInfo();

3
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -366,6 +366,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 开始下单 // 开始下单
if(!isOms) { if(!isOms) {
addNewWaybill(emisWaybillSave); addNewWaybill(emisWaybillSave);
// 生成缅甸虚拟单
}else{ }else{
addNewWaybillByOms(emisWaybillSave); addNewWaybillByOms(emisWaybillSave);
} }