diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs index fb1bed12..d8692cef 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs @@ -617,7 +617,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices /// - /// H平台发运核对输出 + /// H平台未结明细 /// /// /// @@ -640,7 +640,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices } /// - /// F平台发运核对输出 + /// F平台未结明细 /// /// /// @@ -655,14 +655,14 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version }); customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin }); customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End }); - var _taskid = await _service.ExportEnqueueAsync("F平台发运核对输出", ExportExtentsion.Excel, input.Version, null, CurrentUser, typeof(HQFShippingExportService), customConditionList, (rs) => + var _taskid = await _service.ExportEnqueueAsync("F平台未结明细", ExportExtentsion.Excel, input.Version, null, CurrentUser, typeof(HQFShippingExportService), customConditionList, (rs) => { }); return _taskid; } /// - /// M平台发运核对输出 + /// M平台未明细 /// /// /// @@ -677,7 +677,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version }); customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin }); customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End }); - var _taskid = await _service.ExportEnqueueAsync("M平台发运核对输出", ExportExtentsion.Excel, input.Version, null, CurrentUser, typeof(HQMShippingExportService), customConditionList, (rs) => + var _taskid = await _service.ExportEnqueueAsync("M平台未明细", ExportExtentsion.Excel, input.Version, null, CurrentUser, typeof(HQMShippingExportService), customConditionList, (rs) => { }); return _taskid; diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs index b4ae1f7d..a8de758f 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs @@ -245,8 +245,6 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report string condition =string.Empty; - - if (!string.IsNullOrEmpty(begin)) { condition += string.Format(" and a.LastModificationTime>='{0}' ", begin); diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFShippingDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFShippingDapperRepository.cs index cc8cd239..0629b26e 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFShippingDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFShippingDapperRepository.cs @@ -22,7 +22,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report List _list = new List(); - string condition = " where 1=1 "; + string condition = " "; if (!string.IsNullOrEmpty(begin)) { condition += string.Format(" and b.LastModificationTime>='{0}' ", begin); diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs index dcd4643f..48eca5bc 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs @@ -25,8 +25,14 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report List _list = new List(); - string condition = " "; + //string condition = " where 1=1 "; + string condition = " "; + ////if (!string.IsNullOrEmpty(materialCode)) + ////{ + + //// condition += string.Format(" and d.MaterialCode in ({0}) ", materialCode); + ////} if (!string.IsNullOrEmpty(begin)) { condition += string.Format(" and b.LastModificationTime>='{0}' ", begin); @@ -35,9 +41,28 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report { condition += string.Format(" and b.LastModificationTime<='{0}' ", end); } + //if (!string.IsNullOrEmpty(cp7begin)) + //{ + // condition += string.Format(" and B.cp7>='{0}' ", cp7begin); + //} + //if (!string.IsNullOrEmpty(cp7end)) + //{ + // condition += string.Format(" and B.cp7<='{0}' ", cp7end); + //} + ////if (!string.IsNullOrEmpty(kennCode)) + ////{ + //// condition += string.Format(" and B.kenncode='{0}' ", kennCode); + ////} + ////if (!string.IsNullOrEmpty(chassisNumber)) + ////{ + //// condition += string.Format(" and B.chassisNumber='{0}' ", chassisNumber); + ////} + ////if (!string.IsNullOrEmpty(materialGroup)) + ////{ + //// condition += string.Format(" B.chassisNumber='{0}' ", materialGroup); + ////} string str = "SELECT\n" + - " temp1.行号, \n"+ " isnull(temp1.交货单号,'') 交货单号,\n" + " temp1.交货时间,\n" + " isnull(temp1.手工或自动,'') 手工或自动,\n" + @@ -63,7 +88,6 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report "FROM\n" + " (\n" + " SELECT\n" + - " b.poLine AS 行号,\n" + " b.WmsBillNum AS 交货单号,\n" + " b.LastModificationTime AS 交货时间,\n" + " b.IsAuto AS 手工或自动,\n" + @@ -111,18 +135,31 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report { List _list = new List(); var str = - "SELECT\n" + -" temp1.MaterialCode 客户物料号,\n" + -" temp1.HQHKanBan 看板号,\n" + -" temp1.SettleQty 结算数量,\n" + -" ISNULL( temp2.Qty, 0 ) 发货数量,(\n" + -" temp1.SettleQty - ISNULL( temp2.Qty, 0 )) 差异数量 \n" + -"FROM\n" + -" ( SELECT SUM( Qty ) SettleQty, HQHKanBan, MaterialCode FROM Set_HQ_H_Platform WHERE version = '{0}' GROUP BY HQHKanBan, MaterialCode ) temp1\n" + -" LEFT JOIN ( SELECT SUM( Qty ) Qty, Kanban, MaterialCode FROM Set_HQ_H_Kanban GROUP BY Kanban, MaterialCode ) temp2 ON temp1.HQHKanBan = temp2.Kanban \n" + -" AND temp1.MaterialCode = temp2.MaterialCode \n" + -"WHERE\n" + -" temp1.SettleQty != ISNULL( temp2.Qty, 0 )"; + "SELECT temp1.MaterialCode 客户物料号,temp1.HQHKanBan 看板号 ,temp1.SettleQty 结算数量, temp2.Qty 发货数量,( temp1.SettleQty - temp2.Qty ) 差异数量 \n" + + "FROM\n" + + " (\n" + + " SELECT\n" + + " SUM( Qty ) SettleQty,\n" + + " HQHKanBan,\n" + + " MaterialCode \n" + + " FROM\n" + + " Set_HQ_H_Platform where version='{0}'\n" + + " GROUP BY\n" + + " HQHKanBan,\n" + + " MaterialCode \n" + + " ) temp1\n" + + " LEFT JOIN (\n" + + " SELECT\n" + + " SUM( Qty ) Qty,\n" + + " Kanban,\n" + + " MaterialCode \n" + + " FROM\n" + + " Set_HQ_H_Kanban \n" + + " GROUP BY\n" + + " Kanban,\n" + + " MaterialCode \n" + + " ) temp2 ON temp1.HQHKanBan = temp2.Kanban \n" + + " AND temp1.MaterialCode = temp2.MaterialCode where temp1.SettleQty!=temp2.Qty "; str = string.Format(str, version); var _query = DbConnection.Query(str, null, null, true, 1200, null); @@ -137,9 +174,9 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report List _list = new List(); - string condition = " "; - + //string condition = " where 1=1 "; + string condition = " "; if (!string.IsNullOrEmpty(begin)) { @@ -205,6 +242,10 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report return _list; } + + + + } public class HQHSharePartSettledDetailDiff diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMSettledDetailDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMSettledDetailDapperRepository.cs index 1026ea7c..ac559d34 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMSettledDetailDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMSettledDetailDapperRepository.cs @@ -25,7 +25,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report List _list = new List(); - string condition = " where 1=1 "; + string condition = " "; ////if (!string.IsNullOrEmpty(materialCode)) @@ -155,7 +155,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report List _list = new List(); - string condition = " where 1=1 "; + string condition = " "; diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMShippingDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMShippingDapperRepository.cs index 6a4ee5b7..191e9c81 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMShippingDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMShippingDapperRepository.cs @@ -22,7 +22,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report List _list = new List(); - string condition = " where 1=1 "; + string condition = " "; if (!string.IsNullOrEmpty(begin)) { condition += string.Format(" and b.LastModificationTime>='{0}' ", begin);