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("检验信息");