更新版本

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs

@@ -60,13 +60,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         /// <summary>
         /// 大众看板-出库
         /// </summary>
-
+      
-
-
-
-        //private readonly ISettleAccountBranchEfCoreRepository<WmsKanbanOutPutDetial, Guid> _wmsRepository;
-        //private readonly ISettleAccountBranchEfCoreRepository<WmsKanbanOutPut, Guid> _wmsVersionRepository;
-
         private readonly ISettleAccountBranchEfCoreRepository<WmsWithOutKanbanOutPutDetial, Guid> _wmsRepository;
         private readonly ISettleAccountBranchEfCoreRepository<WmsWithOutKanbanOutPut, Guid> _wmsVersionRepository;
 

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

@@ -44,25 +44,25 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
         {
             List<Material> _materialList = new List<Material>();
             List<ErpPrice> _priceList = new List<ErpPrice>();
-            if (CacheManager.CacheMaterials != null)
+            //if (CacheManager.CacheMaterials != null)
-            {
+            //{
-                _materialList = CacheManager.CacheMaterials;
+            //    _materialList = CacheManager.CacheMaterials;
-                _materialList= CacheManager.CacheMaterials.GroupBy(p => new { p.MaterialCode }).Select(p => p.FirstOrDefault()).ToList();
+            //    _materialList= CacheManager.CacheMaterials.GroupBy(p => new { p.MaterialCode }).Select(p => p.FirstOrDefault()).ToList();
-            }
+            //}
-            else
+            //else
-            {
+            //{
                 _materialList = DbConnection.Query<Material>("select max(Id) ID,'' Factory,MaterialCode,MaterialDesc from Set_material group by MaterialCode,MaterialDesc,EstimateTypeDesc,EstimateType ").ToList();
-            }
+            //}
-            if (CacheManager.CachePriceList != null)
+            //if (CacheManager.CachePriceList != null)
-            {
+            //{
-                _priceList = CacheManager.CachePriceList;
+            //    _priceList = CacheManager.CachePriceList;
-                _priceList = CacheManager.CachePriceList.GroupBy(p => new { p.SapErpPartCode }).Select(p => p.FirstOrDefault()).ToList();
+            //    _priceList = CacheManager.CachePriceList.GroupBy(p => new { p.SapErpPartCode }).Select(p => p.FirstOrDefault()).ToList();
-
+
-            }
+            //}
-            else
+            //else
-            {
+            //{
                 _priceList = DbConnection.Query<ErpPrice>("select Price SapPrice, MaterialCode SapErpPartCode  from Set_PriceList where  type='10' and version=(select max(version) from Set_PriceListVersion)").ToList();
-            }
+            //}
             List<T> tmpList = new List<T>();
             if (isNotHistoryPart == true)
             {

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

src/Shared/Win.Sfs.Shared/obj/Release/Win.Sfs.Shared.2.0.0.nuspec

@@ -18,6 +18,6 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="G:\TIANHE\src\Shared\Win.Sfs.Shared\bin\Release\netcoreapp5\Win.Sfs.Shared.dll" target="lib\net5.0\Win.Sfs.Shared.dll" />
+    <file src="C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Sfs.Shared\bin\Release\netcoreapp5\Win.Sfs.Shared.dll" target="lib\net5.0\Win.Sfs.Shared.dll" />
   </files>
 </package>

src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-8c6a81f97815a2cfb60a8659a340d98942ef9df5
+4361bc171670f1fc07423ef01008f0dad4065a0e

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

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