From 0c5bd7d4f61ca68fd7e900d117aa54d49b780af2 Mon Sep 17 00:00:00 2001
From: 44673626 <44673626@qq.com>
Date: Wed, 23 Feb 2022 17:36:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E4=BC=97=E7=9C=8B=E6=9D=BF=E6=9C=AA?=
 =?UTF-8?q?=E7=BB=93=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HQHSettledDetailDapperRepository.cs       |  1 +
 .../Services/Report/KanBanUnSettledExport.cs  | 20 +++++++++----------
 .../SettleAccountJobModule.cs                 |  5 +++++
 3 files changed, 16 insertions(+), 10 deletions(-)

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 79512946..aa26574e 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
@@ -186,6 +186,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
                     first.WmsBillNum += itm.WmsBillNum;
                     first.WmsDate += itm.WmsDate;
                 }
+
             }
 
             foreach (var itm in listCompare1.ToList())
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/KanBanUnSettledExport.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/KanBanUnSettledExport.cs
index c8e69f87..89032352 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/KanBanUnSettledExport.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/KanBanUnSettledExport.cs
@@ -37,20 +37,20 @@ namespace SettleAccount.Job.Services.Report
         {
             var _filename = exportName.FirstOrDefault();
             var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value;
-            var begin = p_list.Where(p => p.Name == "BeginTime").FirstOrDefault().Value;
+            var begin = p_list.Where(p => p.Name == "BegingTime").FirstOrDefault().Value;
             var end = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value;
             var materialGroup = p_list.Where(p => p.Name == "MaterialGroup").FirstOrDefault().Value;
-            var sapCode = p_list.Where(p => p.Name == "SapCode").FirstOrDefault().Value;
+            var sapCode = p_list.Where(p => p.Name == "SAPCode").FirstOrDefault().Value;
             var _ls = _dapper.GetKanbanReportList(version, begin,end);
            // var _lst = _dapper.GetNoKanbanReportList(version, begin, end);
-            if (!string.IsNullOrEmpty(materialGroup))
-            {
-                var _groupList = materialGroup.Split(new char[] { ',' }).Distinct().ToList();
-                if (_groupList.Count() > 0)
-                {
-                    _ls = _ls.Where(p => _groupList.Contains(p.MaterialGroup)).ToList();
-                }
-            }
+            //if (!string.IsNullOrEmpty(materialGroup))
+            //{
+            //    var _groupList = materialGroup.Split(new char[] { ',' }).Distinct().ToList();
+            //    if (_groupList.Count() > 0)
+            //    {
+            //        _ls = _ls.Where(p => _groupList.Contains(p.MaterialGroup)).ToList();
+            //    }
+            //}
             //if (!string.IsNullOrEmpty(materialCode))
             //{
             //    var _groupList = materialCode.Split(new char[] { '\n' }).Distinct().ToList();
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs
index 819077be..2c8851a7 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs
@@ -200,6 +200,11 @@ namespace Win.Sfs.SettleAccount
                     {
                         return implementationFactory.GetService<WmsOutputSumExportService>();
                     }
+                    //大众看板未结输出
+                    if (key.Equals(typeof(KanBanUnSettledExport).FullName))
+                    {
+                        return implementationFactory.GetService<KanBanUnSettledExport>();
+                    }
                     else
                     {
                         throw new ArgumentException($"Not Support key:{key}");