自动生成PO序号问题修复

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -35,6 +35,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics;
 using Volo.Abp.Uow;
+using Spire.Pdf.Exporting.XPS.Schema;
 
 namespace Business.ResourceExamineManagement
 {
@@ -1406,10 +1407,10 @@ namespace Business.ResourceExamineManagement
                     po_Main.supplier_id = item.pr_purchaseid;
                     po_Main.supplier_name = item.pr_purchasename;
                     po_Main.supplier_no = item.pr_purchasenumber;
-                    po_Main.contact = itemsupplier?.FirstOrDefault().contact;
-                    po_Main.suppliertelephone = itemsupplier?.FirstOrDefault().telephone;
+                    po_Main.contact = itemsupplier is null? itemsupplier?.FirstOrDefault().contact:"";
+                    po_Main.suppliertelephone = itemsupplier is null ? itemsupplier?.FirstOrDefault().telephone:"";
                     po_Main.deliveryaddress = "";
-                    po_Main.supplierdddress = itemsupplier?.FirstOrDefault().supplier_address;
+                    po_Main.supplierdddress = itemsupplier is null ? itemsupplier?.FirstOrDefault().supplier_address:"";
                     po_Main.confirmstate = 1;
                     po_Main.logisticsstate = 0;
                     po_Main.financialstate = 0;
@@ -1425,7 +1426,7 @@ namespace Business.ResourceExamineManagement
                     podetail.mysql_id = help.NextId();
                     podetail.po_id = po_Main.mysql_id;
                     podetail.po_billno = po_Main.po_billno;
-                    podetail.polist_row = podetaillist.Count + 1;
+                    podetail.polist_row = podetaillist.Where(a=>a.po_billno== po_Main.po_billno).Count() + 1;
                     podetail.pr_id = item.mysql_id;
                     podetail.pr_billno = item.pr_billno;
                     podetail.pr_purchase_id = po_Main.supplier_id;
@@ -1479,7 +1480,7 @@ namespace Business.ResourceExamineManagement
                             podetail.mysql_id = help.NextId();
                             podetail.po_id = pomain.mysql_id;
                             podetail.po_billno = pomain.po_billno;
-                            podetail.polist_row = podetaillist.Count + 1;
+                            podetail.polist_row = podetaillist.Where(a => a.po_billno == pomain.po_billno).Count() + 1;
                             podetail.pr_id = item.mysql_id;
                             podetail.pr_billno = item.pr_billno;
                             podetail.pr_purchase_id = pomain.supplier_id;
@@ -1530,10 +1531,10 @@ namespace Business.ResourceExamineManagement
                         po_Main.supplier_id = item.pr_purchaseid;
                         po_Main.supplier_name = item.pr_purchasename;
                         po_Main.supplier_no = item.pr_purchasenumber;
-                        po_Main.contact = itemsupplier?.FirstOrDefault().contact;
-                        po_Main.suppliertelephone = itemsupplier?.FirstOrDefault().telephone;
+                        po_Main.contact = itemsupplier is null ? itemsupplier?.FirstOrDefault().contact:"";
+                        po_Main.suppliertelephone = itemsupplier is null ? itemsupplier?.FirstOrDefault().telephone:"";
                         po_Main.deliveryaddress = "";
-                        po_Main.supplierdddress = itemsupplier?.FirstOrDefault().supplier_address;
+                        po_Main.supplierdddress = itemsupplier is null ? itemsupplier?.FirstOrDefault().supplier_address:"";
                         po_Main.confirmstate = 1;
                         po_Main.logisticsstate = 0;
                         po_Main.financialstate = 0;
@@ -1549,7 +1550,7 @@ namespace Business.ResourceExamineManagement
                         podetail.mysql_id = help.NextId();
                         podetail.po_id = po_Main.mysql_id;
                         podetail.po_billno = po_Main.po_billno;
-                        podetail.polist_row = podetaillist.Count + 1;
+                        podetail.polist_row = podetaillist.Where(a => a.po_billno == po_Main.po_billno).Count() + 1;
                         podetail.pr_id = item.mysql_id;
                         podetail.pr_billno = item.pr_billno;
                         podetail.pr_purchase_id = po_Main.supplier_id;
@@ -1620,10 +1621,10 @@ namespace Business.ResourceExamineManagement
                     po_Main.supplier_id = item.pr_purchaseid;
                     po_Main.supplier_name = item.pr_purchasename;
                     po_Main.supplier_no = item.pr_purchasenumber;
-                    po_Main.contact = itemsupplier?.FirstOrDefault().contact;
-                    po_Main.suppliertelephone = itemsupplier?.FirstOrDefault().telephone;
+                    po_Main.contact = itemsupplier is null ? itemsupplier?.FirstOrDefault().contact:"";
+                    po_Main.suppliertelephone = itemsupplier is null ? itemsupplier?.FirstOrDefault().telephone:"";
                     po_Main.deliveryaddress = "";
-                    po_Main.supplierdddress = itemsupplier?.FirstOrDefault().supplier_address;
+                    po_Main.supplierdddress = itemsupplier is null ? itemsupplier?.FirstOrDefault().supplier_address:"";
                     po_Main.confirmstate = 1;
                     po_Main.logisticsstate = 0;
                     po_Main.financialstate = 0;
@@ -1639,7 +1640,7 @@ namespace Business.ResourceExamineManagement
                     podetail.mysql_id = help.NextId();
                     podetail.po_id = po_Main.mysql_id;
                     podetail.po_billno = po_Main.po_billno;
-                    podetail.polist_row = podetaillist.Count + 1;
+                    podetail.polist_row = podetaillist.Where(a => a.po_billno == po_Main.po_billno).Count() + 1;
                     podetail.pr_id = item.mysql_id;
                     podetail.pr_billno = item.pr_billno;
                     podetail.pr_purchase_id = po_Main.supplier_id;
@@ -1693,7 +1694,7 @@ namespace Business.ResourceExamineManagement
                             podetail.mysql_id = help.NextId();
                             podetail.po_id = pomain.mysql_id;
                             podetail.po_billno = pomain.po_billno;
-                            podetail.polist_row = podetaillist.Count + 1;
+                            podetail.polist_row = podetaillist.Where(a => a.po_billno == pomain.po_billno).Count() + 1;
                             podetail.pr_id = item.mysql_id;
                             podetail.pr_billno = item.pr_billno;
                             podetail.pr_purchase_id = pomain.supplier_id;
@@ -1744,10 +1745,10 @@ namespace Business.ResourceExamineManagement
                         po_Main.supplier_id = item.pr_purchaseid;
                         po_Main.supplier_name = item.pr_purchasename;
                         po_Main.supplier_no = item.pr_purchasenumber;
-                        po_Main.contact = itemsupplier?.FirstOrDefault().contact;
-                        po_Main.suppliertelephone = itemsupplier?.FirstOrDefault().telephone;
+                        po_Main.contact = itemsupplier is null ? itemsupplier?.FirstOrDefault().contact:"";
+                        po_Main.suppliertelephone = itemsupplier is null ? itemsupplier?.FirstOrDefault().telephone:"";
                         po_Main.deliveryaddress = "";
-                        po_Main.supplierdddress = itemsupplier?.FirstOrDefault().supplier_address;
+                        po_Main.supplierdddress = itemsupplier is null ? itemsupplier?.FirstOrDefault().supplier_address:"";
                         po_Main.confirmstate = 1;
                         po_Main.logisticsstate = 0;
                         po_Main.financialstate = 0;
@@ -1763,7 +1764,7 @@ namespace Business.ResourceExamineManagement
                         podetail.mysql_id = help.NextId();
                         podetail.po_id = po_Main.mysql_id;
                         podetail.po_billno = po_Main.po_billno;
-                        podetail.polist_row = podetaillist.Count + 1;
+                        podetail.polist_row = podetaillist.Where(a => a.po_billno == po_Main.po_billno).Count() + 1;
                         podetail.pr_id = item.mysql_id;
                         podetail.pr_billno = item.pr_billno;
                         podetail.pr_purchase_id = po_Main.supplier_id;