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-25 17:53:34 +08:00
parent 63f4451fba
commit c530466643
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,6 +72,9 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
@Autowired @Autowired
private EmisWaybillProblemInfoMapper emisWaybillProblemInfoMapper; private EmisWaybillProblemInfoMapper emisWaybillProblemInfoMapper;
@Autowired
private EmisSettleSubBillMapper emisSettleSubBillMapper;
/** /**
* 获取稽核数据 * 获取稽核数据
@ -1786,6 +1789,18 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
return itemList; return itemList;
} }
// 如果已被定制账单，面单删除等不允许做问题件
EmisSettleSubBill emisSettleSubBill=emisSettleSubBillMapper.selectSettleSubBillBySubBillNo(mainBillCode);
if("1".equals(emisSettleSubBill.getBlMerge())
&& ( "151".equals(problemType) || "170".equals(problemType) || "173".equals(problemType) )
){
scanResultItem.setResult("fail");
scanResultItem.setMessage("已定制账单，不允许登记，请联系财务从账单中剔除后再操作");
scanResultItem.setErrorCode(EmisBizErrorType.BILL_LOCK.errorCode);
itemList.add(scanResultItem);
return itemList;
}
EmisWaybillProblemInfo emisWaybillProblemInfo = new EmisWaybillProblemInfo(); EmisWaybillProblemInfo emisWaybillProblemInfo = new EmisWaybillProblemInfo();
emisWaybillProblemInfo.setBillCode(scanBillCode); emisWaybillProblemInfo.setBillCode(scanBillCode);
emisWaybillProblemInfo.setProblemType(Integer.valueOf(problemType)); emisWaybillProblemInfo.setProblemType(Integer.valueOf(problemType));