From c9570f8cb0da189da6c66e2c842cd5c505c46820 Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Mon, 25 Apr 2022 19:01:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E4=BC=97=E7=9C=8B=E6=9D=BF=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=8F=8A=E5=B7=B2=E7=BB=93=E7=AE=97=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Report/KanbanUnSettledDapperRepository.cs | 5 ++-- .../Report/WmsOutputSumDapperRepository.cs | 23 +++++++++++-------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/KanbanUnSettledDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/KanbanUnSettledDapperRepository.cs index f5c5f196..cb0b52aa 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/KanbanUnSettledDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/KanbanUnSettledDapperRepository.cs @@ -216,14 +216,13 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " ) TEMP1\n" + " LEFT JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE Version = '202110' ) TEMP2 ON TEMP1.SapCode = TEMP2.MaterialCode \n" + " ) UNION1\n" + - " LEFT JOIN temp_vwkanban UNION2 ON UNION1.Kanban= UNION2.[看板号] \n" + + " LEFT JOIN temp_vwkanban UNION2 ON UNION1.Kanban= UNION2.[看板号] \n" + " AND UNION1.CustomerPartCode= UNION2.[客户零件号] \n" + " WHERE\n" + " UNION2.[看板号] IS NULL \n" + " AND UNION2.[客户零件号] IS NULL \n" + " ) aaa \n" + - "WHERE\n" + - " aaa.CustomerPartCode NOT IN ( '30G839904A041', '80D867172KJ7' )"; + " WHERE 1=1"; 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 c0f8a1e1..62ae8173 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 @@ -211,6 +211,11 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report [ImporterHeader(Name = "行号")] [ExporterHeader(DisplayName = "行号")] public string 行号 { set; get; } + + [ImporterHeader(Name = "版本")] + [ExporterHeader(DisplayName = "版本")] + public string 版本 { set; get; } + [ImporterHeader(Name = "客户")] [ExporterHeader(DisplayName = "客户")] public string 客户 { set; get; } @@ -244,10 +249,10 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report //[ExporterHeader(DisplayName = "结算数量")] public decimal 结算数量 { set; get; } [ImporterHeader(Name = "实际出库数量")] - [ExporterHeader(DisplayName = "实际出库数量")] + [ExporterHeader(DisplayName = "实际出库数量",IsIgnore =true)] public decimal 实际出库数量 { set; get; } [ImporterHeader(Name = "差异数量")] - [ExporterHeader(DisplayName = "差异数量")] + [ExporterHeader(DisplayName = "差异数量", IsIgnore = true)] public decimal 差异数量 { set; get; } [ImporterHeader(Name = "开票单价")] [ExporterHeader(DisplayName = "开票单价")] @@ -1165,7 +1170,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report getcnumber = getcnumber.TrimEnd(','); var _sql = "SELECT\n" + - " ROW_NUMBER ( ) OVER ( ORDER BY Type DESC ) 行号 ,\n" + + " ROW_NUMBER ( ) OVER ( ORDER BY Type DESC ) 行号 ,temp1.Version 版本,\n" + " temp1.Client 客户,\n" + " temp1.Type 出库类型,\n" + " temp1.BillNum 结算单,\n" + @@ -1184,7 +1189,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report "FROM\n" + " (\n" + " SELECT\n" + - " '大众准时化出库' AS Type,\n" + + " '大众准时化出库' AS Type,Version,\n" + " '大众' Client,\n" + " BillNum,\n" + " MaterialCode,\n" + @@ -1200,7 +1205,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " ChassisNumber IN ({0}) \n" + " AND State = 2 UNION ALL\n" + " SELECT\n" + - " '大众看板出库' AS Type,\n" + + " '大众看板出库' AS Type,Version,\n" + " '大众' Client,\n" + " BillNum,\n" + " MaterialCode,\n" + @@ -1216,7 +1221,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " Kanban IN ({0}) \n" + " AND State = 2 UNION ALL\n" + " SELECT\n" + - " '大众备件条码出库' AS Type,\n" + + " '大众备件条码出库' AS Type,Version,\n" + " '大众' Client,\n" + " BillNum,\n" + " MaterialCode,\n" + @@ -1232,7 +1237,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " OrderBillNum IN ({0}) \n" + " AND State = 2 UNION ALL\n" + " SELECT\n" + - " '红旗看板出库' AS Type,\n" + + " '红旗看板出库' AS Type,Version,\n" + " '红旗' Client,\n" + " BillNum,\n" + " MaterialCode,\n" + @@ -1248,7 +1253,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " Kanban IN ({0}) \n" + " AND State = 2 \n" + " UNION ALL SELECT\n" + - " '自定义发货出库' AS Type,\n" + + " '自定义发货出库' AS Type,Version,\n" + " customercode Client,\n" + " BillNum,\n" + " SapMaterialCode,\n" + @@ -1303,7 +1308,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report getcnumber = getcnumber.TrimEnd(','); } var _sql = "SELECT\n" + - " ROW_NUMBER ( ) OVER ( ORDER BY Type DESC ) 行号 ,\n" + + " ROW_NUMBER ( ) OVER ( ORDER BY Type DESC ) 行号 \n" + " temp1.Client 客户,\n" + " temp1.Type 出库类型,\n" + " temp1.BillNum 结算单,\n" +