更新版本

.vs/VSWorkspaceState.json

@@ -2,6 +2,6 @@
   "ExpandedNodes": [
     ""
   ],
-  "SelectedNode": "\\SettleAccount.sln (src\\SettleAccount.sln)",
+  "SelectedNode": "\\SmartFactorySuite.sln",
   "PreviewInSolutionExplorer": false
 }

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettleAccounts/SettleAccountAppService.cs

@@ -46,6 +46,8 @@ using TaskJob.EventArgs;
 using Win.Sfs.SettleAccount.Entities.WMS;
 using Win.Sfs.SettleAccount.Entities.Wms;
 using Win.Sfs.SettleAccount.Repository;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Information;
+using Org.BouncyCastle.Bcpg.OpenPgp;
 
 namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
 {
@@ -572,9 +574,16 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         [UnitOfWork(isTransactional: false)]
         public async Task<bool> UPdateFisAsync()
         {
-            _repository.GetDbContext().Database.SetCommandTimeout(300);
+
+
+            string sql = string.Format("  EXEC [dbo].[sp_settle_fis_update] @Version = N'{0}'  ");
+
             await _repository.GetDbContext().Database.ExecuteSqlRawAsync(
-               "EXEC sp_settle_fis_update"
+               $" EXEC sp_settle_fis_update "
+
+            
+
+
            );
             return true;
 
@@ -584,4 +593,4 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
 
 
     }
-}
+}

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

@@ -89,9 +89,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             WMSEfCoreRepository<WmsJitOutPutDetial> wmsefRespository,
             WMSEfCoreRepository<TB_BILL> wmstbRespository,
             IDistributedCache<WmsJitOutPutDetial> cache,
-             ISnowflakeIdGenerator snowflakeIdGenerator,
-           ICommonManager commonManager,
-
+            ISnowflakeIdGenerator snowflakeIdGenerator,
+            ICommonManager commonManager,
             ErpPartDapperRepository repository,
             TaskJobService service
 
@@ -513,7 +512,19 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
 
         public async Task<bool> WmsJitOutPutPass(WmsJitRequestDto input)
         {
-            List<CustomCondition> customConditionList = new List<CustomCondition>();
+            var list= _wmsRepository.Where(p => p.BillNum == input.BillNum ).ToList();
+            var alreay=list.FirstOrDefault(p => p.BillNum == input.BillNum && p.State==1);
+            if (alreay.State == 1)
+            {
+              throw new UserFriendlyException("单据中有申请状态记录不能重复提交","8989");
+            }
+            var updatelist=list.Where(p => p.State != 4 && p.State != 2).ToList();
+            foreach (var itm in updatelist)
+            {
+                itm.State = 1;
+            }
+            await _wmsRepository.GetDbContext().BulkUpdateAsync(updatelist);
+            List <CustomCondition> customConditionList = new List<CustomCondition>();
             customConditionList.Add(new CustomCondition() { Name = "BillNum", Value = input.BillNum ?? string.Empty });
             customConditionList.Add(new CustomCondition() { Name = "Date", Value = input.AccountDate.ToString() });
             var _taskid = await _service.ExportEnqueueAsync("准时化出库服务"+input.BillNum, ExportExtentsion.Excel, input.Version, string.Empty, CurrentUser, typeof(FisOutputService), customConditionList, (rs) =>
@@ -526,13 +537,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             //              "		@type = 0,\n" +
             //              "     @date = N'{1}'\n"+
             //              "SELECT	'Return Value' = @return_value";
-            //    await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
+            //       await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
             //       string.Format(sql,input.BillNum,input.AccountDate.ToShortDateString())
             //     );
-
-
-
-
             return true;
         }
 
@@ -715,4 +722,4 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
 
 
     }
-}
+}

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

@@ -42,14 +42,12 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
     {
         public FisUpdateDapperRepository(IDbContextProvider<SettleAccountDbContext> dbContextProvider) : base(dbContextProvider)
         {
-
+           
         }
         [UnitOfWork(isTransactional: false)]
         public virtual void UpdateFisSettle(string version)
         {
-
-            DbConnection.Execute(string.Format("EXEC sp_settle_fis_update N'{0}'", version), null, null, 1200, null);
-
+            DbConnection.ExecuteScalar(string.Format("EXEC [dbo].[sp_settle_fis_update] @Version = N'{0}'", version), null, null, 1200, null);
         }
 
 

src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.GeneratedMSBuildEditorConfig.editorconfig

@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
 build_property.EnforceExtendedAnalyzerRules = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Win.Utils
-build_property.ProjectDir = C:\Users\Administrator\source\repos\pg\src\Shared\Win.Utils\
+build_property.ProjectDir = C:\Users\Administrator\Source\Repos\pg\src\Shared\Win.Utils\