Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

ds-wms-service/DS.WMS.AdminApi/DS.WMS.AdminApi.csproj.user

@@ -2,7 +2,7 @@
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ActiveDebugProfile>http</ActiveDebugProfile>
-    <NameOfLastUsedPublishProfile>D:\Source\Repos\DS8\ds-wms-service\DS.WMS.AdminApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\Code\ds8-solution-pro\ds-wms-service\DS.WMS.AdminApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>

ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageService.cs

@@ -248,6 +248,7 @@ namespace DS.WMS.Core.TaskPlat.Method
         }
         #endregion
 
+        //private static object ImportLockObj = new object();
         /// <summary>
         /// 创建任务公共方法
         /// </summary>
@@ -258,9 +259,9 @@ namespace DS.WMS.Core.TaskPlat.Method
         public async Task<DataResult> InitTaskJob(TaskManageOrderMessageInfo info, IFormFile file = null, IFormFile modifyFile = null)
         {
             string batchNo = Guid.NewGuid().ToString();
-
             try
             {
+                //Monitor.Enter(ImportLockObj);
                 logger.LogInformation("批次={no} 接收到创建任务报文 报文={msg}", batchNo, JsonConvert.SerializeObject(info));
 
                 SqlSugarScopeProvider tenantDb = saasDbService.GetBizDbScopeById(user.TenantId);
@@ -465,7 +466,32 @@ namespace DS.WMS.Core.TaskPlat.Method
                                                .FirstAsync();
                     if (!string.IsNullOrEmpty(statusCodes?.CreatedBusinessStatusCode))
                     {
-                        await seaExportCommonService.Value.SetGoodsStatus(statusCodes.CreatedBusinessStatusCode, (long)info.Head.BSNO, tenantDb);
+                        try
+                        {
+                            // 1.设置相关订单的业务状态
+                            await seaExportCommonService.Value.SetGoodsStatus(statusCodes.CreatedBusinessStatusCode, (long)info.Head.BSNO, tenantDb);
+                        }
+                        catch (Exception ex)
+                        {
+                            logger.LogError(ex, "任务创建时，设置订单业务状态的过程中发生异常，orderId={0}，taskType={1}", (long)info.Head.BSNO, taskInfo.TASK_TYPE);
+                            throw;
+                        }
+
+                        try
+                        {
+                            // 2.设置货物状态为已完成
+                            await djyServiceStatusService.Value.SaveServiceStatus(new EmbedServiceProjectStatusDto()
+                            {
+                                businessId = info.Head.BSNO.ToString()!,
+                                SourceType = 1,
+                                StatusCodes = [new() { StatusCode = statusCodes.CreatedBusinessStatusCode }]
+                            });
+                        }
+                        catch (Exception ex)
+                        {
+                            logger.LogError(ex, "任务创建时，设置订单的货物状态时发生异常，orderId={0}，taskType={1}", (long)info.Head.BSNO, taskInfo.TASK_TYPE);
+                            throw;
+                        }
                     }
 
                     completedBusinessStatusCode = statusCodes?.CompletedBusinessStatusCode;
@@ -1732,6 +1758,10 @@ namespace DS.WMS.Core.TaskPlat.Method
                 logger.LogError(ex, "任务台：初始化任务的过程中发生未知异常，批次号={no}", batchNo);
                 return DataResult.Failed(ex.Message);
             }
+            //finally
+            //{
+            //    Monitor.Exit(ImportLockObj);
+            //}
         }
 
 

ds-wms-service/DS.WMS.Test/SaasDBUpdateTest.cs

@@ -23,6 +23,7 @@ using Org.BouncyCastle.Ocsp;
 using SqlSugar;
 using SqlSugar.IOC;
 using Xunit;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
 
 namespace Ds.WMS.Test;
 
@@ -92,9 +93,11 @@ public class SaasDBUpdateTest
             //tenantDb.CodeFirst.InitTables(typeof(TaskBaseAllocation));
 
             // SQL更新
-            string sql = @"UPDATE `task_flow_module` SET `CompletedBusinessStatusCode` = 'YSDAN' WHERE `Id` = 30001";
-            // DROP TRIGGER `tr_task_no`;
+            string sql = @"UPDATE `task_flow_module` SET `CreatedBusinessStatusCode` = 'TIJIAO' WHERE `Id` = 30001";
             tenantDb.Ado.ExecuteCommand(sql);
+
+
+            // DROP TRIGGER `tr_task_no`;
         }
 
         Assert.True(true);