diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs
index de929e42..6f0b32aa 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs
@@ -60,13 +60,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
///
/// 大众看板-出库
///
-
-
-
-
- //private readonly ISettleAccountBranchEfCoreRepository _wmsRepository;
- //private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository;
-
+
private readonly ISettleAccountBranchEfCoreRepository _wmsRepository;
private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository;
diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpPartDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpPartDapperRepository.cs
index db9cceea..a67b4970 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpPartDapperRepository.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpPartDapperRepository.cs
@@ -44,25 +44,25 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
{
List _materialList = new List();
List _priceList = new List();
- if (CacheManager.CacheMaterials != null)
- {
- _materialList = CacheManager.CacheMaterials;
- _materialList= CacheManager.CacheMaterials.GroupBy(p => new { p.MaterialCode }).Select(p => p.FirstOrDefault()).ToList();
- }
- else
- {
+ //if (CacheManager.CacheMaterials != null)
+ //{
+ // _materialList = CacheManager.CacheMaterials;
+ // _materialList= CacheManager.CacheMaterials.GroupBy(p => new { p.MaterialCode }).Select(p => p.FirstOrDefault()).ToList();
+ //}
+ //else
+ //{
_materialList = DbConnection.Query("select max(Id) ID,'' Factory,MaterialCode,MaterialDesc from Set_material group by MaterialCode,MaterialDesc,EstimateTypeDesc,EstimateType ").ToList();
- }
- if (CacheManager.CachePriceList != null)
- {
- _priceList = CacheManager.CachePriceList;
- _priceList = CacheManager.CachePriceList.GroupBy(p => new { p.SapErpPartCode }).Select(p => p.FirstOrDefault()).ToList();
-
- }
- else
- {
+ //}
+ //if (CacheManager.CachePriceList != null)
+ //{
+ // _priceList = CacheManager.CachePriceList;
+ // _priceList = CacheManager.CachePriceList.GroupBy(p => new { p.SapErpPartCode }).Select(p => p.FirstOrDefault()).ToList();
+
+ //}
+ //else
+ //{
_priceList = DbConnection.Query("select Price SapPrice, MaterialCode SapErpPartCode from Set_PriceList where type='10' and version=(select max(version) from Set_PriceListVersion)").ToList();
- }
+ //}
List tmpList = new List();
if (isNotHistoryPart == true)
{
diff --git a/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.assets.cache b/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.assets.cache
index 4a672406..e54dfbca 100644
Binary files a/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.assets.cache and b/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.assets.cache differ
diff --git a/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache b/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache
index 45b1455d..f5e894ae 100644
Binary files a/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache and b/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache differ
diff --git a/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.FileListAbsolute.txt b/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.FileListAbsolute.txt
index 35956516..49ef6f30 100644
--- a/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.FileListAbsolute.txt
+++ b/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.FileListAbsolute.txt
@@ -10,3 +10,15 @@ G:\TIANHE\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflak
G:\TIANHE\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.dll
G:\TIANHE\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\ref\Win.Abp.Snowflakes.dll
G:\TIANHE\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.pdb
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Abp.Snowflakes\bin\Release\netcoreapp5\Win.Abp.Snowflakes.deps.json
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Abp.Snowflakes\bin\Release\netcoreapp5\Win.Abp.Snowflakes.dll
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Abp.Snowflakes\bin\Release\netcoreapp5\ref\Win.Abp.Snowflakes.dll
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Abp.Snowflakes\bin\Release\netcoreapp5\Win.Abp.Snowflakes.pdb
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.csproj.AssemblyReference.cache
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.AssemblyInfoInputs.cache
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.AssemblyInfo.cs
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.dll
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\ref\Win.Abp.Snowflakes.dll
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.pdb
diff --git a/src/Shared/Win.Sfs.Shared/bin/Release/Win.Sfs.Shared.2.0.0.nupkg b/src/Shared/Win.Sfs.Shared/bin/Release/Win.Sfs.Shared.2.0.0.nupkg
index ed9899db..6b386c05 100644
Binary files a/src/Shared/Win.Sfs.Shared/bin/Release/Win.Sfs.Shared.2.0.0.nupkg and b/src/Shared/Win.Sfs.Shared/bin/Release/Win.Sfs.Shared.2.0.0.nupkg differ
diff --git a/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Sfs.Shared.dll b/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Sfs.Shared.dll
index 5d291ae4..247025c4 100644
Binary files a/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Sfs.Shared.dll and b/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Sfs.Shared.dll differ
diff --git a/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Sfs.Shared.pdb b/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Sfs.Shared.pdb
index 03b62881..2833a7fd 100644
Binary files a/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Sfs.Shared.pdb and b/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Sfs.Shared.pdb differ
diff --git a/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.assets.cache b/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.assets.cache
index df4a20c6..44965c08 100644
Binary files a/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.assets.cache and b/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.assets.cache differ
diff --git a/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache b/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache
index c48d05b7..db4b8084 100644
Binary files a/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache and b/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache differ
diff --git a/src/Shared/Win.Sfs.Shared/obj/Release/Win.Sfs.Shared.2.0.0.nuspec b/src/Shared/Win.Sfs.Shared/obj/Release/Win.Sfs.Shared.2.0.0.nuspec
index 203cb657..3ce47faf 100644
--- a/src/Shared/Win.Sfs.Shared/obj/Release/Win.Sfs.Shared.2.0.0.nuspec
+++ b/src/Shared/Win.Sfs.Shared/obj/Release/Win.Sfs.Shared.2.0.0.nuspec
@@ -18,6 +18,6 @@
-
+
\ No newline at end of file
diff --git a/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache b/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache
index adbf7fa1..f5e894ae 100644
Binary files a/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache and b/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache differ
diff --git a/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache b/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache
index c7d5aa15..2c8a7236 100644
--- a/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache
+++ b/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8c6a81f97815a2cfb60a8659a340d98942ef9df5
+4361bc171670f1fc07423ef01008f0dad4065a0e
diff --git a/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.FileListAbsolute.txt b/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.FileListAbsolute.txt
index c68d2805..a82ab0a4 100644
--- a/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.FileListAbsolute.txt
+++ b/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.FileListAbsolute.txt
@@ -13,3 +13,18 @@ G:\TIANHE\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.cspro
G:\TIANHE\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.dll
G:\TIANHE\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\ref\Win.Sfs.Shared.dll
G:\TIANHE\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.pdb
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Sfs.Shared\bin\Release\netcoreapp5\Win.Sfs.Shared.deps.json
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Sfs.Shared\bin\Release\netcoreapp5\Win.Sfs.Shared.dll
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Sfs.Shared\bin\Release\netcoreapp5\ref\Win.Sfs.Shared.dll
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Sfs.Shared\bin\Release\netcoreapp5\Win.Sfs.Shared.pdb
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Sfs.Shared\bin\Release\netcoreapp5\Win.Utils.dll
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Sfs.Shared\bin\Release\netcoreapp5\Win.Utils.pdb
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.csproj.AssemblyReference.cache
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.AssemblyInfoInputs.cache
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.AssemblyInfo.cs
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.csproj.CoreCompileInputs.cache
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.csproj.CopyComplete
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.dll
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\ref\Win.Sfs.Shared.dll
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.pdb
diff --git a/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.dll b/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.dll
index 5d291ae4..247025c4 100644
Binary files a/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.dll and b/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.dll differ
diff --git a/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.pdb b/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.pdb
index 03b62881..2833a7fd 100644
Binary files a/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.pdb and b/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.pdb differ
diff --git a/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.assets.cache b/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.assets.cache
index 7b99fbf1..e65c016b 100644
Binary files a/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.assets.cache and b/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.assets.cache differ
diff --git a/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache b/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache
index 495a9fad..f5e894ae 100644
Binary files a/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache and b/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache differ
diff --git a/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.FileListAbsolute.txt b/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.FileListAbsolute.txt
index d13ec32f..2095d861 100644
--- a/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.FileListAbsolute.txt
+++ b/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.FileListAbsolute.txt
@@ -10,3 +10,15 @@ G:\TIANHE\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.csproj.CoreComp
G:\TIANHE\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.dll
G:\TIANHE\src\Shared\Win.Utils\obj\Release\netcoreapp5\ref\Win.Utils.dll
G:\TIANHE\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.pdb
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Utils\bin\Release\netcoreapp5\Win.Utils.deps.json
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Utils\bin\Release\netcoreapp5\Win.Utils.dll
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Utils\bin\Release\netcoreapp5\ref\Win.Utils.dll
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Utils\bin\Release\netcoreapp5\Win.Utils.pdb
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.csproj.AssemblyReference.cache
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.GeneratedMSBuildEditorConfig.editorconfig
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.AssemblyInfoInputs.cache
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.AssemblyInfo.cs
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.csproj.CoreCompileInputs.cache
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.dll
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Utils\obj\Release\netcoreapp5\ref\Win.Utils.dll
+C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.pdb