结算后端代码

src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs

@@ -617,7 +617,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
 
 
         /// <summary>
-        /// H平台发运核对输出
+        /// H平台未结明细
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -632,14 +632,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("H平台发运核对输出", ExportExtentsion.Excel, input.Version, null, CurrentUser, typeof(HQHShippingExportService), customConditionList, (rs) =>
+            var _taskid = await _service.ExportEnqueueAsync("H平台未结明细", ExportExtentsion.Excel, input.Version, null, CurrentUser, typeof(HQHShippingExportService), customConditionList, (rs) =>
             {
             });
             return _taskid;
         }
 
         /// <summary>
-        /// F平台发运核对输出
+        /// F平台未结明细
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -654,14 +654,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;
         }
 
         /// <summary>
-        /// M平台发运核对输出
+        /// M平台未明细
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -676,7 +676,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;

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

@@ -245,9 +245,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 
             List<HQFSharePartSettledDetailDiff> _list = new List<HQFSharePartSettledDetailDiff>();
 
-            string condition = " where 1=1 ";
+            string condition = "  ";
-
-
 
             if (!string.IsNullOrEmpty(begin))
             {

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

@@ -22,7 +22,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 
             List<HQFShippingDiff> _list = new List<HQFShippingDiff>();
 
-            string condition = " where 1=1 ";
+            string condition = " ";
             if (!string.IsNullOrEmpty(begin))
             {
                 condition += string.Format(" and b.LastModificationTime>='{0}' ", begin);

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

@@ -25,9 +25,9 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 
             List<HQHSettledDetailDiff> _list = new List<HQHSettledDetailDiff>();
 
-            string condition = " where 1=1 ";
+            //string condition = " where 1=1 ";
-
 
+            string condition = "  ";
             ////if (!string.IsNullOrEmpty(materialCode))
             ////{
 
@@ -174,9 +174,9 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 
             List<HQHSharePartSettledDetailDiff> _list = new List<HQHSharePartSettledDetailDiff>();
 
-            string condition = " where 1=1 ";
+            //string condition = " where 1=1 ";
-
 
+            string condition = "  ";
 
             if (!string.IsNullOrEmpty(begin))
             {

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

@@ -25,7 +25,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 
             List<HQMSettledDetailDiff> _list = new List<HQMSettledDetailDiff>();
 
-            string condition = " where 1=1 ";
+            string condition = "  ";
 
 
             ////if (!string.IsNullOrEmpty(materialCode))
@@ -155,7 +155,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 
             List<HQMSharePartSettledDetailDiff> _list = new List<HQMSharePartSettledDetailDiff>();
 
-            string condition = " where 1=1 ";
+            string condition = "  ";
 
 
 

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

@@ -22,7 +22,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 
             List<HQMShippingDiff> _list = new List<HQMShippingDiff>();
 
-            string condition = " where 1=1 ";
+            string condition = "  ";
             if (!string.IsNullOrEmpty(begin))
             {
                 condition += string.Format(" and b.LastModificationTime>='{0}' ", begin);