更新版本

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

@@ -52,6 +52,8 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 
             string sqlString = "SELECT\n" +
        "	* ,\n" +
+       "	temp5.WmsBillNum WMSDeliveryNote,--交货单号\n" +
+       "	CONVERT ( VARCHAR ( 100 ), TEMP5.WmsDate, 23 ) AS WMSActualGoodsDate,\n" +
        "	ISNULL ( temp1.InvoicePrice * temp1.Qty, 0 ) AS InvoiceMoney,--开票金额\n" +
        "	ISNULL ( Price * WMSDeliveryQty, 0 ) AS Amount,--金额\n" +
        "	ISNULL ( Price * temp1.Qty, 0 ) AS SettlePrice,--结算金额\n" +
@@ -64,8 +66,6 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
        "	(\n" +
        "	SELECT ROW_NUMBER\n" +
        "		( ) OVER ( ORDER BY b.EstimateTypeDesc ) AS RowId,\n" +
-"--c.WMSDeliveryNote,--交货单号\n" +
-"--CONVERT ( VARCHAR ( 100 ), c.WMSActualGoodsDate, 23 ) AS WMSActualGoodsDate,--实际发货日期年-月-日\n" +
        "		A.Kanban,--条码号\n" +
        "		b.MaterialCode SapMaterialCode,--厂内物料号\n" +
        "		b.MaterialDesc,--物料描述\n" +
@@ -101,13 +101,25 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
        "		A.VERSION = '{0}' {1} \n" +
        "	) TEMP1\n" +
        "	LEFT JOIN set_backQty temp3 ON temp1.Kanban = temp3.Code\n" +
+       "	LEFT JOIN (\n" +
+       "	SELECT A\n" +
+       "		.WMSActualGoodsDate WmsBillNum,\n" +
+       "		t1.MaterialCode MaterialCode,\n" +
+       "		A.Kanban,\n" +
+       "		A.WMSActualGoodsDate WmsDate \n" +
+       "	FROM\n" +
+       "		Set_WMSKanBanSettle\n" +
+       "		A INNER JOIN ( SELECT MaterialCode, Kanban FROM Set_WMSKanBanSettle GROUP BY MaterialCode, Kanban HAVING COUNT ( 1 ) = 1 ) B ON A.Kanban = B.Kanban \n" +
+       "		AND A.MaterialCode = B.MaterialCode\n" +
+       "		LEFT JOIN Set_material t1 ON A.MaterialCode = t1.CustomerPartCode \n" +
+       "	) temp5 ON temp1.SapMaterialCode = temp5.MaterialCode \n" +
+       "	AND temp1.Kanban = temp5.Kanban \n" +
        "	AND temp1.SapMaterialCode = temp3.MaterialCode\n" +
        "	LEFT JOIN ( SELECT Price, --定价\n" +
        "		MaterialCode --厂内物料号\n" +
        "	FROM Set_PriceList WHERE VERSION = ( SELECT MAX ( VERSION ) FROM Set_PriceList ) ) TEMP2 ON TEMP1.SapMaterialCode = TEMP2.MaterialCode \n" +
        "WHERE\n" +
-"	1 = 1 \n";
+       "	1 = 1;";
-
 
 
 
@@ -200,16 +212,16 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 
 
 
-            var sql2 = "SELECT\n" +
+            var sql2 = "SELECT A\n" +
-           "	a.WmsBillNum,\n" +
+"	.WMSActualGoodsDate WmsBillNum,\n" +
 "	t1.MaterialCode MaterialCode,\n" +
-           "	a.Kanban ,\n" +
+"	A.Kanban,\n" +
-            "	A.LastModificationTime  WmsDate \n" +
+"	 A.WMSActualGoodsDate WmsDate  \n" +
 "   FROM\n" +
-           "	Set_HQ_H_Kanban A\n" +
+"	Set_WMSKanBanSettle\n" +
-           "	INNER JOIN ( SELECT MaterialCode, Kanban FROM Set_HQ_H_Kanban GROUP BY MaterialCode, Kanban HAVING COUNT(*)> 1 ) B ON A.Kanban = B.Kanban \n" +
+"	A INNER JOIN ( SELECT MaterialCode, Kanban FROM Set_WMSKanBanSettle GROUP BY MaterialCode, Kanban HAVING COUNT ( * ) > 1 ) B ON A.Kanban = B.Kanban \n" +
-           "	AND A.MaterialCode = B.MaterialCode " +
+"	AND A.MaterialCode = B.MaterialCode\n" +
-           "    left join Set_material t1 on a.MaterialCode=t1.CustomerPartCode ";
+"	LEFT JOIN Set_material t1 ON A.MaterialCode = t1.CustomerPartCode";
 
             var listCompare = DbConnection.Query<CompareExtend>(sql2);
             var _lst=_query.ToList();