From 62172dfa0910ebef35f840653fd8581fbf9964c6 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Win102022PTZDGH>
Date: Thu, 3 Mar 2022 11:31:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Report/WmsOutputSumDapperRepository.cs    | 44 ++++++++++++-------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs
index 79e9ddd1..0b15b177 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs
@@ -34,6 +34,8 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
         public string 开票单价 { set; get; }
         [ExporterHeader(DisplayName = "结算金额")]
         public string 结算金额 { set; get; }
+        [ExporterHeader(DisplayName = "已出库金额")]
+        public string 已出库金额 { set; get; }
         [ExporterHeader(DisplayName = "WMS待出库金额")]
         public string WMS待出库金额 { set; get; }
 
@@ -110,7 +112,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
  "	isnull([0], 2 ) - ISNULL([2], 0 ) 数量差异,\n" +
  "	Price 开票单价,\n" +
  "	Round( ISnull([0], 2 )* Price, 2 ) 结算金额,\n" +
- "	Round( ISNULL([2], 0 )* Price, 2 ) WMS待出库金额,\n" +
+ "	Round( ISNULL([2], 0 )* Price, 2 ) 已出库金额,\n" +
  "	ROUND(( isnull([0], 2 ) - ISNULL([2], 0 ))* Price, 2 ) WMS待出库金额 \n" +
  "FROM\n" +
  "	(\n" +
@@ -495,11 +497,12 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
             "		0 OutputQty,\n" +
             "		0 IsBack,\n" +
             "		Price,\n" +
-            "		ChassisNumber CNumber \n" +
+            "		ChassisNumber CNumber, \n" +
+            "		Remark \n" +
             "	FROM\n" +
             "		Set_WmsJitOutPutDetial \n" +
             "	WHERE\n" +
-            "		VERSION = '202201' \n" +
+            "		VERSION = '{0}' \n" +
             "		AND State = 3 UNION ALL\n" +
             "	SELECT\n" +
             "		'大众看板出库' AS Type,\n" +
@@ -510,11 +513,12 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
             "		0 OutputQty,\n" +
             "		0 IsBack,\n" +
             "		Price,\n" +
-            "		Kanban CNumber \n" +
+            "		Kanban CNumber, \n" +
+            "		Remark \n" +
             "	FROM\n" +
             "		Set_WmsKanbanOutPutDetial \n" +
             "	WHERE\n" +
-            "		VERSION = '202201' \n" +
+            "		VERSION = '{0}' \n" +
             "		AND State = 3 UNION ALL\n" +
             "	SELECT\n" +
             "		'大众无看板出库' AS Type,\n" +
@@ -525,11 +529,12 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
             "		RealityNumber OutputQty,\n" +
             "		0 IsBack,\n" +
             "		Price,\n" +
-            "		'' CNumber \n" +
+            "		'' CNumber, \n" +
+            "		Remark \n" +
             "	FROM\n" +
             "		Set_WmsWithOutKanbanOutPutDetial \n" +
             "	WHERE\n" +
-            "		VERSION = '202201' \n" +
+            "		VERSION = '{0}' \n" +
             "		AND State = 3 UNION ALL\n" +
             "	SELECT\n" +
             "		'大众备件汇总出库' AS Type,\n" +
@@ -540,11 +545,12 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
             "		RealityNumber OutputQty,\n" +
             "		1 IsBack,\n" +
             "		Price,\n" +
-            "		'' CNumber \n" +
+            "		'' CNumber, \n" +
+            "		Remark \n" +
             "	FROM\n" +
             "		Set_WmsSharePartOutPutDetial \n" +
             "	WHERE\n" +
-            "		VERSION = '202201' \n" +
+            "		VERSION = '{0}' \n" +
             "		AND State = 3 UNION ALL\n" +
             "	SELECT\n" +
             "		'大众备件条码出库' AS Type,\n" +
@@ -555,11 +561,12 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
             "		0 OutPutQty,\n" +
             "		1 IsBack,\n" +
             "		Price,\n" +
-            "		OrderBillNum CNumber \n" +
+            "		OrderBillNum CNumber, \n" +
+            "		Remark \n" +
             "	FROM\n" +
             "		Set_WmsSharePart90OutPutDetial \n" +
             "	WHERE\n" +
-            "		VERSION = '202201' \n" +
+            "		VERSION = '{0}' \n" +
             "		AND State = 3 UNION ALL\n" +
             "	SELECT\n" +
             "		'红旗看板出库' AS Type,\n" +
@@ -570,11 +577,12 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
             "		0 OutPutQty,\n" +
             "		0 IsBack,\n" +
             "		Price,\n" +
-            "		Kanban CNumber \n" +
+            "		Kanban CNumber, \n" +
+               "		Remark \n" +
             "	FROM\n" +
             "		Set_WmsHQHKanbanOutPutDetial \n" +
             "	WHERE\n" +
-            "		VERSION = '202201' \n" +
+            "		VERSION = '{0}' \n" +
             "		AND State = 3 UNION ALL\n" +
             "	SELECT\n" +
             "		'红旗一轿手工出库' AS Type,\n" +
@@ -585,12 +593,13 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
             "		RealityNumber OutputQty,\n" +
             "		IsBack,\n" +
             "		Price,\n" +
-            "		'' CNumber \n" +
+            "		'' CNumber, \n" +
+            "		Remark \n" +
             "	FROM\n" +
             "		Set_WmsHQWithOutKanbanOutPutDetial \n" +
             "	WHERE\n" +
             "		IsBack = 0 \n" +
-            "		AND VERSION = '202201' \n" +
+            "		AND VERSION = '{0}' \n" +
             "		AND State = 3 UNION ALL\n" +
             "	SELECT\n" +
             "		'红旗一轿手工出库(备件)' AS Type,\n" +
@@ -601,12 +610,13 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
             "		RealityNumber OutputQty,\n" +
             "		IsBack,\n" +
             "		Price,\n" +
-            "		'' CNumber \n" +
+            "		'' CNumber ,\n" +
+            "		Remark \n" +
             "	FROM\n" +
             "		Set_WmsHQWithOutKanbanOutPutDetial \n" +
             "	WHERE\n" +
             "		IsBack = 1 \n" +
-            "		AND VERSION = '202201' \n" +
+            "		AND VERSION = '{0}' \n" +
             "	AND State = 3 \n" +
             "	) temp1";