From 9be369c1141627aa67469fb7ff95eb1ad27aa98b Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Win102022PTZDGH>
Date: Fri, 10 Jun 2022 14:05:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/WMS/WmsUnInterface.cs                         | 7 +------
 .../Report/InvoiceSettledDetailDiffDapperRepository.cs     | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs
index f6896fbc..e8c25ba4 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs
@@ -69,8 +69,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         [UnitOfWork(false)]
         public async Task<string> ReportMake(string version)
         {
-           var _ls= _dapper.GetWmsSumExtendList(version);//报表
-
+            var _ls= _dapper.GetWmsSumExtendList(version);//报表
             var _count= _wmsRepository.Count(p => p.Version == version && p.State>0);
             if (_count > 0)
             {
@@ -90,10 +89,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                 List<WmsDetailReport> _lst = new List<WmsDetailReport>();
                 if (_difflst != null && _difflst.Count() > 0)
                 {
-                   
                     foreach (var itm in _difflst)
                     {
-                     
                         _lst.Add(new WmsDetailReport(Guid.NewGuid(),
                              int.Parse(itm.行号),
                             itm.客户,
@@ -122,8 +119,6 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                     }
                 }
                 await _wmsRepository.GetDbContext().BulkInsertAsync(_lst);
-
-
             }
             else
             {
diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs
index 3fd15d9a..25d04a4e 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs
@@ -120,7 +120,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
     "	FROM\n" +
     "		Set_PriceList \n" +
     "   WHERE\n" +
-    "	version = ( SELECT Max( Version ) FROM Set_PriceList  ) TEMP2 ON TEMP1.SapMaterialCode = TEMP2.MaterialCode";
+    "	version = ( SELECT Max( Version ) FROM Set_PriceList  ) and type=10   ) TEMP2 ON TEMP1.SapMaterialCode = TEMP2.MaterialCode";
                 var _sql = string.Format(str, version, condition);
 
                 var _query = DbConnection.Query<InvoiceSettledDetailDiff>(_sql, null, null, true, 1200, null);