From c53046664365bbd7251e5ab459b585d60615d404 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 25 Dec 2024 17:53:34 +0800
Subject: [PATCH] md

---
 .../impl/EmisTmsScanRecordServiceImpl.java        | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

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 871bd5ed8..7b54c0e07 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
@@ -72,6 +72,9 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
     @Autowired
     private EmisWaybillProblemInfoMapper emisWaybillProblemInfoMapper;
 
+    @Autowired
+    private EmisSettleSubBillMapper emisSettleSubBillMapper;
+
 
     /**
      * 获取稽核数据
@@ -1786,6 +1789,18 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
                 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.setBillCode(scanBillCode);
             emisWaybillProblemInfo.setProblemType(Integer.valueOf(problemType));