From 76bb00110c57ce7486320f4f70db62b1adbee185 Mon Sep 17 00:00:00 2001
From: PastSaid <603806070@qq.com>
Date: Sun, 10 Dec 2023 04:11:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E5=8D=95-?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=89=93=E5=8D=B0-=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=9D=A1=E4=BB=B6-=E5=B7=B2=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E5=8F=91=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SAL_OUTSTOCK/MergePrintIssueAnInvPlugIn.cs | 30 +++++++++++++++-------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/SAL_OUTSTOCK/MergePrintIssueAnInvPlugIn.cs b/SAL_OUTSTOCK/MergePrintIssueAnInvPlugIn.cs
index b77f77b..f9fb86a 100644
--- a/SAL_OUTSTOCK/MergePrintIssueAnInvPlugIn.cs
+++ b/SAL_OUTSTOCK/MergePrintIssueAnInvPlugIn.cs
@@ -117,7 +117,7 @@ namespace SAL_OUTSTOCK
             var headSql = $@"
 SELECT 
     ID,DOCUMENTSTATUS,APPLYID,APPLYNAME,BILLALLAMOUNT,BILLAMOUNT,BILLTAXAMOUNT,BILLNO
-    CUSTID,CUSTNAME,INVOICETITLE,INVOICEBANKNAME,INVOICEBANKACCOUNT,
+    CUSTID,CUSTNAME,INVOICETITLE,INVOICEBANKNAME,INVOICEBANKACCOUNT,INVOICENUMBER,
     TAXREGISTERCODE,SOCIALCRECODE,INVOICETEL,INVOICEADDRESS
 FROM 
     V_INVINFO_OUTSTOCK
@@ -155,20 +155,32 @@ WHERE ID IN ({string.Join(",", fidList)})
                     SuccessStatus = false
                 });
 
-            var sheadInfos2 = sHeadInfos.Where(x => !x["DOCUMENTSTATUS"].ToString().Trim().Equals("C"));
-            if (sheadInfos2 != null && sheadInfos2.Any())
+            if (sHeadInfos != null && sHeadInfos.Any())
             {
-                foreach (var item in sheadInfos2)
+                foreach (var item in sHeadInfos)
                 {
-                    opResult.OperateResult.Add(new OperateResult
+                    if (!item["INVOICENUMBER"].IsNullOrEmptyOrWhiteSpace())
                     {
-                        Name = item["BILLNO"].ToString(),
-                        Message = $"{item["BILLNO"]}该订单未审核完毕！",
-                        SuccessStatus = false
-                    });
+                        opResult.OperateResult.Add(new OperateResult
+                        {
+                            Name = item["BILLNO"].ToString(),
+                            Message = $"{item["BILLNO"]}该订单已打印过发票！",
+                            SuccessStatus = false
+                        });
+                        continue;
+                    }
+
+                    if (!item["DOCUMENTSTATUS"].ToString().Trim().Equals("C"))
+                        opResult.OperateResult.Add(new OperateResult
+                        {
+                            Name = item["BILLNO"].ToString(),
+                            Message = $"{item["BILLNO"]}该订单未审核完毕！",
+                            SuccessStatus = false
+                        });
                 }
             }
 
+
             if (opResult.OperateResult.Any())
                 throw new Exception("检验信息");