更新版本

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

@@ -99,7 +99,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
        "	WHERE\n" +
        "		A.VERSION = '{0}' {1} \n" +
        "	) TEMP1\n" +
-       "	LEFT JOIN set_backQty temp3 ON temp1.Kanban = temp3.Code\n" +
+       "	LEFT JOIN set_backQty temp3 ON temp1.Kanban = temp3.Code and temp1.SapMaterialCode=temp3.MaterialCode     \n" +
       
        
        "	LEFT JOIN ( SELECT Price, --定价\n" +
@@ -290,6 +290,15 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 
             foreach (var itm1 in _lst)
             {
+                var item = _ls1.FirstOrDefault(p => p.Kanban == itm1.Kanban && p.MaterialCode == itm1.MaterialCode);
+                if (item != null)
+                {
+                    itm1.WMSDeliveryNote = item.WmsBillNum;
+                    itm1.WMSActualGoodsDate = item.WmsDate;
+                }
+
+
+
                 var itm = _ls.FirstOrDefault(p => p.Kanban == itm1.Kanban && p.MaterialCode == itm1.MaterialCode);
                 if (itm != null)
                 {