From 8cbb06f203a2a9831ff4d069b01c7dee854f5a40 Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 26 Dec 2024 11:51:50 +0800 Subject: [PATCH] md --- .../impl/EmisTmsScanRecordServiceImpl.java | 18 ++++++++++-------- .../service/impl/EmisWaybillServiceImpl.java | 3 +++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java index 6fcf4f3b8..87af23583 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java @@ -1791,14 +1791,16 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm // 如果已被定制账单，面单删除等不允许做问题件 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; + if(emisSettleSubBill!=null) { + 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(); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 882c6552b..c939d5154 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -366,6 +366,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 开始下单 if(!isOms) { addNewWaybill(emisWaybillSave); + + // 生成缅甸虚拟单 + }else{ addNewWaybillByOms(emisWaybillSave); }