红旗未结

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

@@ -2104,7 +2104,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
         [ExporterHeader(DisplayName = "实际发货数量")]
         public decimal 实际发货数量 { set; get; }
 
-        [ExporterHeader(DisplayName = "未结数量")]
+        [ExporterHeader(DisplayName = "未结数量", IsIgnore = true)]
         public decimal 未结数量 { set; get; }
 
         [ExporterHeader(DisplayName = "发货定价")]

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

@@ -695,10 +695,10 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "		temp1.开票数量,\n" +
 "		temp1.收货与交货差异,\n" +
 "		ISNULL( temp3.Qty, 0 ) 退货数量,\n" +
-"		ISNULL( temp1.发货数量, 0 ) - ISNULL( temp3.Qty, 0 ) 实际发货数量,\n" +
-"		ISNULL( temp1.发货数量, 0 ) - ISNULL( temp3.Qty, 0 ) - ISNULL( temp1.开票数量, 0 ) 未结数量,\n" +
+"		ISNULL( temp1.发货数量, 0 ) - ISNULL( temp3.Qty, 0 ) 未结数量,\n" +
+"		ISNULL( temp1.发货数量, 0 ) - ISNULL( temp3.Qty, 0 ) - ISNULL( temp1.开票数量, 0 ) 实际发货数量,\n" +
 "		ISNULL( TEMP2.Price, 0 ) AS 定价,\n" +
-"		ISNULL( TEMP2.Price, 0 ) * ( ISNULL( temp1.发货数量, 0 ) - ISNULL( temp3.Qty, 0 ) ) 实际发货总金额 \n" +
+"		ISNULL( TEMP2.Price, 0 ) * ( ISNULL( temp1.发货数量, 0 ) - ISNULL( temp3.Qty, 0 ) - ISNULL( temp1.开票数量, 0 ) ) 实际发货总金额 \n" +
 "	FROM\n" +
 "		(\n" +
 "		SELECT\n" +
@@ -755,10 +755,10 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "		temp1.开票数量,\n" +
 "		temp1.收货与交货差异,\n" +
 "		ISNULL( temp3.Qty, 0 ) 退货数量,\n" +
-"		ISNULL( temp1.发货数量, 0 ) - ISNULL( temp3.Qty, 0 ) 实际发货数量,\n" +
-"		ISNULL( temp1.发货数量, 0 ) - ISNULL( temp3.Qty, 0 ) - ISNULL( temp1.开票数量, 0 ) 未结数量,\n" +
+"		ISNULL( temp1.发货数量, 0 ) - ISNULL( temp3.Qty, 0 ) 未结数量,\n" +
+"		ISNULL( temp1.发货数量, 0 ) - ISNULL( temp3.Qty, 0 ) - ISNULL( temp1.开票数量, 0 ) 实际发货数量,\n" +
 "		ISNULL( TEMP2.Price, 0 ) AS 定价,\n" +
-"		ISNULL( TEMP2.Price, 0 ) * ( ISNULL( temp1.发货数量, 0 ) - ISNULL( temp3.Qty, 0 ) ) 实际发货总金额 \n" +
+"		ISNULL( TEMP2.Price, 0 ) * (ISNULL( temp1.发货数量, 0 ) - ISNULL( temp3.Qty, 0 ) - ISNULL( temp1.开票数量, 0 ) ) 实际发货总金额 \n" +
 "	FROM\n" +
 "		(\n" +
 "		SELECT\n" +

src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs

@@ -239,7 +239,7 @@ namespace SettleAccount.Job.Services.Report
             }
 
 
-
+            //DiffQty 为实际发货数量=发货数量-结算数量-退货数量 财务要求
             var kanbanList = _ls.GroupBy(p => new { p.SapCode, p.MaterialDesc, p.MaterialGroup, p.CustomerPartCode })
                    .Select(p => new UnSettledSum
                    {
@@ -249,7 +249,7 @@ namespace SettleAccount.Job.Services.Report
                        //客户物料 = p.Key.CustomerPartCode,
                        物料描述 = p.Key.MaterialDesc,
                        物料组车型 = p.Key.MaterialGroup,
-                       SAS未结明细汇总 = p.Sum(p => p.WMSDeliveryQty).ToString()
+                       SAS未结明细汇总 = p.Sum(p => p.DiffQty).ToString()
 
                    }).ToList();
 
@@ -305,14 +305,20 @@ namespace SettleAccount.Job.Services.Report
                        //客户物料 = p.Key.客户物料号,
                        物料描述 = p.Key.零件中文名称,
                        物料组车型 = p.Key.物料组,
-                       SAS未结明细汇总 = p.Sum(p => p.发货数量).ToString()
+                       SAS未结明细汇总 = p.Sum(p => p.未结数量).ToString()
 
                    }).ToList();
 
             return kanbanList;
         }
 
-
+        /// <summary>
+        /// 大众备件未对
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="exportName"></param>
+        /// <param name="p_list"></param>
+        /// <returns></returns>
         public List<UnSettledSum> GetSparePartSum(Guid id, List<string> exportName, List<CustomCondition> p_list)
         {
             var fileName = exportName.FirstOrDefault();
@@ -337,7 +343,7 @@ namespace SettleAccount.Job.Services.Report
                     _ls = _ls.Where(p => _groupList.Contains(p.SAP编码)).ToList();
                 }
             }
-
+            //说明 为实际发货数量=发货数量-结算数量-退货数量 财务要求
             var kanbanList = _ls.GroupBy(p => new { p.SAP编码, p.物料描述, p.物料代码 })
                                .Select(p => new UnSettledSum
                                {
@@ -347,7 +353,7 @@ namespace SettleAccount.Job.Services.Report
                                    //客户物料 = p.Key.物料代码,
                                    物料描述 = p.Key.物料描述,
                                    物料组车型 = string.Empty,
-                                   SAS未结明细汇总 = p.Sum(p => p.发货数量).ToString()
+                                   SAS未结明细汇总 = p.Sum(p =>Convert.ToDecimal(p.实际发货数量)).ToString()
 
                                }).ToList();