后端代码提交

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleKBWithCodeDapperReportRepository.cs

@@ -132,7 +132,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
         public decimal SumDiffMoney { set; get; }
 
         [ExporterHeader(DisplayName = "出库单号")]
-        public decimal DeliveryOrderNo { set; get; }
+        public string DeliveryOrderNo { set; get; }
 
 
     }

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleSparePartDapperReportRepository.cs

@@ -44,7 +44,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
             " 	FROM  \n" +
             " 		Set_SparePart AS a  \n" +
             " 		LEFT JOIN Set_material AS b ON a.MaterialCode= b.CustomerPartCode  \n" +
-            "		LEFT JOIN Set_WMSSparePart c ON a.PurchaseOrderNo= c.WMSDeliveryNote \n" +
+            " 		LEFT JOIN Set_WMSSparePart c ON a.PurchaseOrderNo= c.PurchaseOrderNo   \n" +
             " 		AND a.MaterialCode= c.MaterialCode  \n" +
             " 		LEFT JOIN ( SELECT SUM ( amt ) / SUM ( Qty ) InvoicePrice, MaterialCode,Amt FROM set_invoice WHERE version = '202109' GROUP BY materialcode,Amt ) d ON a.MaterialCode= d.MaterialCode   \n" +
             " 	) TEMP1  \n" +

src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs

@@ -108,6 +108,17 @@ namespace Win.Sfs.SettleAccount
                         return implementationFactory.GetService<SettleFisDiffExportService>();
                     }
 
+                    //大众看板结算与交货核对明细表(有条码)
+                    if (key.Equals(typeof(SettleKBWithCodeExportService).FullName))
+                    {
+                        return implementationFactory.GetService<SettleKBWithCodeExportService>();
+                    }
+                    //大众备件结算核对明细表
+                    if (key.Equals(typeof(SettleSparePartExportService).FullName))
+                    {
+                        return implementationFactory.GetService<SettleSparePartExportService>();
+                    }
+                    
                     else
                     {
                         throw new ArgumentException($"Not Support key:{key}");