Merge branch 'master' of https://e.coding.net/ccwin-in/PG/Win.Sfs.SmartSettlementSystem.PG

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

@@ -92,7 +92,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
             "	( temp1.[结算数量] * ISNULL( temp3.Price, 0 ) ) AS 结算金额,\n" +
             "	isnull( TEMP2.Price, 0 ) AS 发货定价,\n" +
             "	isnull( temp1.发货数量, 0 ) * isnull( TEMP2.Price, 0 ) AS 发货总金额,\n" +
-            "	0 AS 数量差异,\n" +
+            "	(isnull( temp1.发货数量, 0 )-isnull(temp1.[结算数量],0)) AS 数量差异,\n" +
             "	ISNULL( temp3.Price, 0 ) - ISNULL( TEMP2.Price, 0 ) AS 单价差异,\n" +
             "	( ISNULL( temp3.Price, 0 ) - ISNULL( TEMP2.Price, 0 ) ) * temp1.结算数量 AS 差异总金额 \n" +
             "FROM\n" +
@@ -104,12 +104,12 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
             "		a.StorageLocation AS 收货仓库,\n" +
             "		a.StorageLocationDesc AS 收货仓库描述,\n" +
             "		a.HQHKanBan AS 订货看板编号,\n" +
-            "		'' AS 订货零件号,\n" +
+            "		a.MaterialCode AS 订货零件号,\n" +
             "		c.MaterialCode Sap编码,\n" +
             "		a.MaterialCode 结算物料代码,\n" +
             "		c.MaterialDesc AS 零件中文名称,\n" +
             "		isnull( b.Qty, 0 ) AS 发货数量,\n" +
-            "		0 AS 发货状态,\n" +
+            "		2 AS 发货状态,\n" +
             "		'' AS 结算验收单号,\n" +
             "		isnull( a.Qty, 0 ) AS 结算数量,\n" +
             "		C.EstimateTypeDesc AS 物料组,\n" +
@@ -320,6 +320,8 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
                 var first = _ls.FirstOrDefault(p => p.Kanban == itm.Kanban && p.MaterialCode == itm.MaterialCode);
                 if (first != null)
                 {
+                    itm.WmsDate = DateTime.Parse(itm.WmsDate).ToShortDateString();
+
                     first.WmsBillNum += "," + itm.WmsBillNum;
                     first.WmsDate += "," + itm.WmsDate;
                 }