From e61bb0e26530b2aa9055737fade9e77ccb1feebf Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期二, 07 一月 2025 10:06:16 +0800
Subject: [PATCH] 更新多个文件,优化逻辑与配置

---
 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json                                                      |    6 
 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs                            |    2 
 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/SqlSugarHelper.cs                                                   |   17 +++
 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs                                      |   54 +++++++++-
 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs                                               |   14 ++
 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.MvcApplicationPartsAssemblyInfo.cs |    7 
 Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/Staticlibrary.vue                                   |    2 
 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs                               |   10 +
 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs                                 |    6 
 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/Const/CateGoryConst.cs                                                |    5 +
 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/HostedService/SeedDataHostedService.cs                                     |    2 
 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs                               |   26 +---
 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/Const/SysConfigKeyConst.cs                                            |    9 +
 Code Management/WMS/WIDESEA_WMSClient/Dt_BillGroupStock.jsx                                                                   |    0 
 Code Management/WMS/WIDESEA_WMSClient/src/api/http.js                                                                         |    4 
 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs                            |    4 
 Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/Dt_BillGroupStock.jsx                                   |   55 ++++++++--
 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs                         |    3 
 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/ProcessApply/ProcessApplyService.cs               |    2 
 Code Management/WCS/WIDESEAWCS_Client/src/api/http.js                                                                         |    2 
 Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_BillGroupStock.vue                                       |   14 +-
 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/MainDb.cs                                                               |    1 
 22 files changed, 175 insertions(+), 70 deletions(-)

diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/api/http.js b/Code Management/WCS/WIDESEAWCS_Client/src/api/http.js
index e256aed..77e3a74 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/api/http.js
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/api/http.js
@@ -20,7 +20,7 @@
 }
 
 else if (process.env.NODE_ENV == 'production') {
-    axios.defaults.baseURL = 'http://192.168.20.251:9291/';
+    axios.defaults.baseURL = 'http://192.168.5.251:9291/';
 }
 if (!axios.defaults.baseURL.endsWith('/')) {
     axios.defaults.baseURL+="/";
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/Staticlibrary.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/Staticlibrary.vue
index 61d0435..96bc5cc 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/Staticlibrary.vue
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/Staticlibrary.vue
@@ -53,7 +53,7 @@
     }
   });
   eventBus.on('stackerData', eventData => {
-    if (eventData.deviceName == "闈欑疆1鍙峰爢鍨涙満") {
+    if (eventData.deviceName.indexOf("闈欑疆") != -1) {
       if (Stackers.length == 0) {
         Stackers.push({ deviceName: eventData.deviceName, data: eventData.data });
       }
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/Const/CateGoryConst.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/Const/CateGoryConst.cs
index 97e05b7..e7badf4 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/Const/CateGoryConst.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/Const/CateGoryConst.cs
@@ -15,5 +15,10 @@
         /// IP鎺ュ彛鍦板潃
         /// </summary>
         public const string CONFIG_SYS_IPAddress = "SYS_IPAddress";
+
+        /// <summary>
+        /// 鍏ュ簱绔欏彴
+        /// </summary>
+        public const string CONFIG_SYS_InStation = "SYS_InStation";
     }
 }
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/Const/SysConfigKeyConst.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/Const/SysConfigKeyConst.cs
index 6840c2e..7cffc7a 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/Const/SysConfigKeyConst.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/Const/SysConfigKeyConst.cs
@@ -48,9 +48,7 @@
         /// </summary>
         public const string RequestTrayOutTask = "RequestTrayOutTask";
 
-
         public const string RequestInTask = "RequestInTask";
-
 
         public const string RequestFlow = "RequestFlow";
 
@@ -73,5 +71,10 @@
         /// 闈欑疆NG鍏ュ簱
         /// </summary>
         public const string RequestInBoundTaskNG = "RequestInBoundTaskNG";
+
+        /// <summary>
+        /// 闈欑疆NG鍏ュ簱绔欏彴
+        /// </summary>
+        public const string JZNGInBoundStation = "JZNGInBoundStation";
     }
-}
+}
\ No newline at end of file
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
index 0bcc2a8..5e0dbe1 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -139,8 +139,11 @@
                     // 鍒ゆ柇浠诲姟绫诲瀷鏄惁涓哄叆搴撲换鍔�
                     else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
                     {
+                        var value = _sys_ConfigService.GetByConfigKey(CateGoryConst.CONFIG_SYS_InStation, SysConfigKeyConst.JZNGInBoundStation).ConfigValue;
+                        var valueList = value.Split(',').ToList();
                         // 鍒ゆ柇婧愬湴鍧�鏄惁涓嶇瓑浜�"1359-4"
-                        if (task.SourceAddress != "1359-4")
+                        //if (task.SourceAddress != "1359-4" && task.SourceAddress != "1357-4")
+                        if (!valueList.Contains(task.SourceAddress))
                         {
                             // 鏌ヨ浠庢簮鍦板潃鍒扮洰鏍囧湴鍧�鐨勮矾鐢�
                             List<Dt_Router> routers = _routerService.QueryNextRoutes(item.SourceAddress, item.TargetAddress);
@@ -156,8 +159,13 @@
                         }
                         else
                         {
-                            // 璁剧疆褰撳墠鍦板潃涓�"002-021-001"
-                            task.CurrentAddress = "002-021-001";
+                            task.CurrentAddress = string.Empty;
+                            if (task.SourceAddress == "1325-6")
+                                // 璁剧疆褰撳墠鍦板潃涓�"001-021-001"
+                                task.CurrentAddress = "001-021-001";
+                            else
+                                // 璁剧疆褰撳墠鍦板潃涓�"002-021-001"
+                                task.CurrentAddress = "002-021-001";
                             // 璁剧疆涓嬩竴涓湴鍧�涓虹洰鏍囧湴鍧�
                             task.NextAddress = item.TargetAddress;
                         }
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
index 45ce138..5470af5 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
@@ -51,8 +51,7 @@
         private static List<string>? userTokenIds;
         private static List<int>? userIds;
 
-
-        public CommonConveyorLineJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, ITaskRepository taskRepository, IPlatFormRepository platFormRepository, ISys_ConfigService sys_ConfigService, IDt_StationManagerService stationManagerService, IDt_StationManagerRepository stationManagerRepository, ICacheService cacheService, INoticeService noticeService, IDeviceInfoRepository deviceInfoRepository,ITask_HtyRepository task_HtyRepository)
+        public CommonConveyorLineJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, ITaskRepository taskRepository, IPlatFormRepository platFormRepository, ISys_ConfigService sys_ConfigService, IDt_StationManagerService stationManagerService, IDt_StationManagerRepository stationManagerRepository, ICacheService cacheService, INoticeService noticeService, IDeviceInfoRepository deviceInfoRepository, ITask_HtyRepository task_HtyRepository)
         {
             _taskService = taskService;
             _taskExecuteDetailService = taskExecuteDetailService;
@@ -84,7 +83,6 @@
                     // 骞惰澶勭悊姣忎釜瀛愯澶�
                     var tasks = childDeviceCodes.Select(childDeviceCode => ProcessDeviceAsync(conveyorLine, childDeviceCode)).ToList();
                     await Task.WhenAll(tasks);
-
 
                     // 鑾峰彇鎵�鏈夌珯鐐圭鐞嗗櫒
                     List<Dt_StationManager> stationManagers = _stationManagerService.GetAllStationByDeviceCode(conveyorLine.DeviceCode);
@@ -156,7 +154,6 @@
         {
             try
             {
-
                 // 璇诲彇浠诲姟鍛戒护鍜岃澶囧懡浠�
                 ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(childDeviceCode);
                 ConveyorLineTaskCommandWrite commandWrite = conveyorLine.ReadCustomer<ConveyorLineTaskCommandWrite>(childDeviceCode, "DeviceCommand");
@@ -245,7 +242,6 @@
             }
             catch (Exception ex)
             {
-
             }
             return Task.CompletedTask;
         }
@@ -365,7 +361,6 @@
         {
             try
             {
-
                 ConsoleHelper.WriteWarningLine($"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉$爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎鍏ュ簱瀹屾垚");
                 var task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
                 if (task != null && task.TaskState != (int)TaskInStatusEnum.Line_InFinish)
@@ -401,7 +396,6 @@
             }
             catch (Exception ex)
             {
-
             }
         }
 
@@ -420,7 +414,6 @@
         {
             try
             {
-
                 // 鏌ヨ杈撻�佺嚎浠诲姟锛屾牴鎹緭閫佺嚎璁惧鍜屽瓙璁惧浠g爜鑾峰彇浠诲姟淇℃伅
                 var task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
 
@@ -460,7 +453,6 @@
             }
             catch (Exception ex)
             {
-
             }
         }
 
@@ -522,7 +514,6 @@
         {
             try
             {
-
                 // 鎵撳嵃鎴愬姛淇℃伅锛岃〃绀烘墭鐩樺凡鍒拌揪鎸囧畾杈撻�佺嚎骞跺畬鎴愬嚭搴�
                 ConsoleHelper.WriteSuccessLine($"銆恵conveyorLine.DeviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉$爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎鍑哄簱瀹屾垚");
 
@@ -585,7 +576,6 @@
             }
             catch (Exception ex)
             {
-
             }
         }
 
@@ -731,7 +721,7 @@
                 EquipmentCode = stationManager.stationEquipMOM,
                 SessionId = Guid.NewGuid().ToString(),
                 EmployeeNo = "MITest",
-                SceneType = "2",
+                SceneType = "4",
                 RequestTime = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now).ToString("yyyy-MM-ddTHH:mm:ss.fffZ")
             };
 
@@ -762,34 +752,32 @@
                         ConsoleHelper.WriteWarningLine("1000");
                         conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTaskNum, 5, stationManager.stationChildCode);
                         conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, 1000, stationManager.stationChildCode);
-
-                        ConveyorLineSendFinish(conveyorLine, stationManager.stationChildCode, ProtocalDetailValue, true);
                     }
                     else
                     {
                         ConsoleHelper.WriteWarningLine("2");
                         ConsoleHelper.WriteWarningLine(stationManager.stationLocation);
+                        conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTaskNum, 5, stationManager.stationChildCode);
                         conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, stationManager.stationLocation, stationManager.stationChildCode);
                     }
+                    ConveyorLineSendFinish(conveyorLine, stationManager.stationChildCode, ProtocalDetailValue, true);
                 }
                 else
                 {
                     if (result1.SerialNos.Count <= 0)
                     {
-
                         ConsoleHelper.WriteWarningLine("2");
                         ConsoleHelper.WriteWarningLine(stationManager.stationLocation);
+                        conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTaskNum, 5, stationManager.stationChildCode);
                         conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, stationManager.stationLocation, stationManager.stationChildCode);
-
                     }
                     else
                     {
                         ConsoleHelper.WriteWarningLine("1000");
                         conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTaskNum, 5, stationManager.stationChildCode);
                         conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, 1000, stationManager.stationChildCode);
-
-                        ConveyorLineSendFinish(conveyorLine, stationManager.stationChildCode, ProtocalDetailValue, true);
                     }
+                    ConveyorLineSendFinish(conveyorLine, stationManager.stationChildCode, ProtocalDetailValue, true);
                 }
             }
             else
@@ -798,6 +786,6 @@
             }
         }
 
-        #endregion 鍖栨垚NG鍙e叆搴�
+        #endregion 璁惧NG鍙e叆搴�
     }
 }
\ No newline at end of file
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
index 6c709ad..683b42b 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
@@ -209,14 +209,16 @@
                 var task = _taskService.QueryBarCodeConveyorLineTask(command.Barcode, childDeviceCode);
                 if (task != null)
                 {
-                    if (task.SourceAddress == "1059-4")
+                    var value = _sys_ConfigService.GetByConfigKey(CateGoryConst.CONFIG_SYS_InStation, SysConfigKeyConst.JZNGInBoundStation).ConfigValue;
+                    var valueList = value.Split(',').ToList();
+                    if (valueList.Contains(task.SourceAddress))
                     {
                         conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, "1000", childDeviceCode);
 
                         ConsoleHelper.WriteWarningLine($"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵task.TaskNum}銆�,鎵樼洏鏉$爜锛氥�恵task.PalletCode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�(瀹炵洏),涓嬩竴鐩爣鍦板潃銆恵1000}銆�");
                         ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
                     }
-                    else if(task.TargetAddress == "1020-1")
+                    else if (task.TargetAddress == "1020-1")
                     {
                         var next = task.NextAddress;
                         var taskCommand = MapTaskCommand(task, command);
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs
index 208374c..64ffdc4 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs
@@ -140,7 +140,8 @@
                                     MethodInfo? method = GetType().GetMethod(platform.ExecutionMethod);
                                     if (method != null)
                                     {
-                                        int count = string.IsNullOrEmpty(platform.Location) ? 0 + 1 : platform.Location.Split(',').Count() + 1;
+                                        //var strings = platform.Location.Split(',').ToList();
+                                        int count = 1;
                                         method.Invoke(this, new object[] { conveyorLine, command, childDeviceCode, count, platform });
                                     }
                                 }
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
index 88deaee..a99a5d4 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
@@ -61,7 +61,7 @@
                 case 9:
                 case 11:
                 case 12:
-                    var task = _taskService.QueryExecutingConveyorLineTask(command.ConveyorLineTaskNum, childDeviceCode);
+                    var task = _taskService.QueryExecutingTaskByBarcode(command.ConveyorLineBarcode, childDeviceCode);
                     if (task != null)
                     {
                         ExecuteStationAction(stationManager, conveyorLine, command, childDeviceCode);
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
index c2bb440..f8c0b78 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
@@ -4,11 +4,13 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using WIDESEAWCS_BasicInfoRepository;
+using WIDESEAWCS_Common;
 using WIDESEAWCS_Common.TaskEnum;
 using WIDESEAWCS_Core.Caches;
 using WIDESEAWCS_Core.Helper;
 using WIDESEAWCS_Core.HttpContextUser;
 using WIDESEAWCS_IProcessRepository;
+using WIDESEAWCS_ISystemServices;
 using WIDESEAWCS_ITaskInfo_HtyRepository;
 using WIDESEAWCS_ITaskInfoRepository;
 using WIDESEAWCS_ITaskInfoService;
@@ -36,8 +38,9 @@
         private readonly INoticeService _noticeService;
         private readonly IDt_StationManagerRepository _stationManagerRepository;
         private readonly ITask_HtyRepository _htyRepository;
+        private readonly ISys_ConfigService _sys_ConfigService;
 
-        public CommonStackerCraneJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IRouterService routerService, IProcessRepository processRepository, ICacheService cacheService, INoticeService noticeService, IDt_StationManagerRepository stationManagerRepository, ITask_HtyRepository htyRepository)
+        public CommonStackerCraneJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IRouterService routerService, IProcessRepository processRepository, ICacheService cacheService, INoticeService noticeService, IDt_StationManagerRepository stationManagerRepository, ITask_HtyRepository htyRepository, ISys_ConfigService sys_ConfigService)
         {
             _taskService = taskService;
             _taskExecuteDetailService = taskExecuteDetailService;
@@ -48,6 +51,7 @@
             _noticeService = noticeService;
             _stationManagerRepository = stationManagerRepository;
             _htyRepository = htyRepository;
+            _sys_ConfigService = sys_ConfigService;
         }
 
         public Task Execute(IJobExecutionContext context)
@@ -381,7 +385,9 @@
             stackerCraneTaskCommand.StartCommand = 1;
             if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)//鍒ゆ柇鏄惁鏄叆搴撲换鍔�
             {
-                if (task.SourceAddress == "1359-4" && task.Roadway.Contains("JZ"))
+                var value = _sys_ConfigService.GetByConfigKey(CateGoryConst.CONFIG_SYS_InStation, SysConfigKeyConst.JZNGInBoundStation).ConfigValue;
+                var valueList = value.Split(',').ToList();
+                if ((valueList.Contains(task.SourceAddress)) && task.Roadway.Contains("JZ"))
                 {
                     string[] souredCodes = task.CurrentAddress.Split("-");
                     if (souredCodes.Length == 3)
diff --git a/Code Management/WMS/WIDESEA_WMSClient/Dt_BillGroupStock.jsx b/Code Management/WMS/WIDESEA_WMSClient/Dt_BillGroupStock.jsx
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Code Management/WMS/WIDESEA_WMSClient/Dt_BillGroupStock.jsx
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/api/http.js b/Code Management/WMS/WIDESEA_WMSClient/src/api/http.js
index fac0a61..78d16dc 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/api/http.js
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/api/http.js
@@ -12,14 +12,14 @@
 let loadingStatus = false
 if (process.env.NODE_ENV == 'development') {
    axios.defaults.baseURL = 'http://localhost:5000/';
-  //axios.defaults.baseURL = 'http://192.168.5.251:5000/';
+  // axios.defaults.baseURL = 'http://192.168.5.251:5000/';
 }
 else if (process.env.NODE_ENV == 'debug') {
   axios.defaults.baseURL = 'http://127.0.0.1:9991/';
 }
 else if (process.env.NODE_ENV == 'production') {
   // axios.defaults.baseURL = 'http://127.0.0.1:5000/';
-  axios.defaults.baseURL = 'http://192.168.20.251:5000/';
+  axios.defaults.baseURL = 'http://192.168.5.251:5000/';
 }
 
 //axios.defaults.baseURL = 'http://api.volcore.xyz/';
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/Dt_BillGroupStock.jsx b/Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/Dt_BillGroupStock.jsx
index b38cc68..af1d470 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/Dt_BillGroupStock.jsx
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/Dt_BillGroupStock.jsx
@@ -26,9 +26,9 @@
     //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
     onInit() {
       //妗嗘灦鍒濆鍖栭厤缃墠锛�
-      let OutBoundBtn=this.buttons.find(x=>x.value=='OutBound');
-      if(OutBoundBtn){
-        OutBoundBtn.onClick=function(){
+      let OutBoundBtn = this.buttons.find((x) => x.value == 'OutBound')
+      if (OutBoundBtn) {
+        OutBoundBtn.onClick = function () {
           this.$Message.success('鐐瑰嚮浜嗘寜閽�')
           let row = this.$refs.table.getSelected() //鑾峰彇閫変腑鐨勮
           if (row <= 0) {
@@ -38,14 +38,20 @@
           }
           let locationCode = row[0].locationCode
           let palletCode = row[0].palletCode
-          this.http.get(`/api/Task/CreateAndSendOutboundTask?locationCode=${locationCode}&palletCode=${palletCode}`, {}, "姝e湪鍒涘缓浠诲姟").then((res) => {
-            //绀轰緥锛氳皟鐢ㄥ悗鍙版帴鍙�
-            if (res.status) {
-              this.$Message.success('鍒涘缓浠诲姟鎴愬姛')
-            } else {
-              this.$Message.error(res.message) //閿欒鎻愮ず
-            }
-          })
+          this.http
+            .get(
+              `/api/Task/CreateAndSendOutboundTask?locationCode=${locationCode}&palletCode=${palletCode}`,
+              {},
+              '姝e湪鍒涘缓浠诲姟'
+            )
+            .then((res) => {
+              //绀轰緥锛氳皟鐢ㄥ悗鍙版帴鍙�
+              if (res.status) {
+                this.$Message.success('鍒涘缓浠诲姟鎴愬姛')
+              } else {
+                this.$Message.error(res.message) //閿欒鎻愮ず
+              }
+            })
         }
       }
       //绀轰緥锛氬湪鎸夐挳鐨勬渶鍓嶉潰娣诲姞涓�涓寜閽�
@@ -100,6 +106,33 @@
       //     );
       //   },
       // });
+
+      this.columns.forEach((column) => {
+        //淇敼棰滆壊
+        if (column.field == 'roadwayNo') {
+          column.formatter = (row) => {
+            return '<span style="color: #2d8cf0;">' + row.locationInfo.roadwayNo + '</span>'
+          }
+        }
+        //鏍煎紡鍖栨棩鏈�
+        // 妫�鏌ュ綋鍓嶅垪鐨勫瓧娈垫槸鍚︿负 'locationStatus'
+        if (column.field == 'locationStatus') {
+          // 浣跨敤瀵硅薄瀛楅潰閲忔潵鏄犲皠 'locationStatus' 鐨勫�煎拰瀵瑰簲鐨勬枃鏈�
+          const statusMap = {
+            '-1': '鍏ㄩ儴',
+            '0': '绌洪棽',
+            '1': '閿佸畾',
+            '2': '鏈夎揣',
+            '3': '鏈夎揣绂佺敤',
+            '4': '鏃犺揣绂佺敤'
+          };
+          // 瀹氫箟涓�涓牸寮忓寲鍑芥暟锛屾牴鎹� 'locationStatus' 鐨勫�艰繑鍥炵浉搴旂殑鏂囨湰
+          column.formatter = (row) => {
+            // 浣跨敤 statusMap 瀵硅薄鏉ヨ幏鍙栧搴旂殑鏂囨湰锛屽鏋滄病鏈夊尮閰嶅垯杩斿洖 '鏈煡鐘舵��'
+            return statusMap[row.locationInfo.locationStatus] || '鏈煡鐘舵��';
+          }
+        }
+      })
     },
     onInited() {
       //妗嗘灦鍒濆鍖栭厤缃悗
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_BillGroupStock.vue b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_BillGroupStock.vue
index e558cd1..8344262 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_BillGroupStock.vue
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_BillGroupStock.vue
@@ -51,15 +51,17 @@
         ]);
         const columns = ref(
             [{ field: 'id', title: '搴撳瓨ID', type: 'int', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
-            { field: 'locationCode', title: '搴撲綅', type: 'string', width: 110, align: 'left',  },
+            { field: 'locationCode', title: '搴撲綅', type: 'string', width: 100, align: 'left',  },
             { field: 'palletCode', title: '鎵樼洏鏉$爜', type: 'string', width: 110, align: 'left', },
-            { field: 'isFull', title: '搴撳瓨绫诲瀷', type: 'bool', width: 110, align: 'left', bind: { key: "isFull", data: [{ key: false, value: '绌虹洏'},{ key: true, value: '瀹炵洏'}] }, },
+            { field: 'isFull', title: '搴撳瓨绫诲瀷', type: 'bool', width: 80, align: 'left', bind: { key: "isFull", data: [{ key: false, value: '绌虹洏'},{ key: true, value: '瀹炵洏'}] }, },
             { field: 'linedProcessFeedbackTime', title: '宸ヨ壓寮�濮嬫椂闂�', type: 'string', width: 110, align: 'left',},
-            { field: 'specialParameterDuration', title: '宸ヨ壓鏃堕暱', type: 'string', width: 110, align: 'left', sort: true },
+            { field: 'roadwayNo', title: '宸烽亾', type: 'string', width: 60, align: 'left', sort: true  },
+            { field: 'locationStatus', title: '璐т綅鐘舵��', type: 'int', width: 60, align: 'left', bind: { key: "LocationState", data: [] } },
+            { field: 'specialParameterDuration', title: '宸ヨ壓鏃堕暱', type: 'string', width: 60, align: 'left', sort: true },
             { field: 'outboundTime', title: '搴斿嚭搴撴椂闂�', type: 'string', width: 110, align: 'left', sort: true  },
-            { field: 'productionLine', title: '鐢熶骇浜х嚎', type: 'string', width: 110, align: 'left',  },
-            { field: 'areaCode', title: '搴撳尯', type: 'string', width: 110, align: 'left', bind: { key: "AreaType", data: [] } },
-            { field: 'remark', title: '鐢佃姱鏁伴噺', type: 'string', width: 120, align: 'left',  },
+            { field: 'productionLine', title: '鐢熶骇浜х嚎', type: 'string', width: 60, align: 'left',  },
+            { field: 'areaCode', title: '搴撳尯', type: 'string', width: 60, align: 'left', bind: { key: "AreaType", data: [] } },
+            { field: 'remark', title: '鐢佃姱鏁伴噺', type: 'string', width: 60, align: 'left',  },
             { field: 'creater', title: '鍒涘缓浜�', type: 'string', sort: true, width: 110, align: 'left', hidden: true },
             { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left',  },
             { field: 'modifier', title: '鏈�鍚庝慨鏀逛汉', type: 'string', sort: true, width: 100, hidden: true, align: 'left' },
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/MainDb.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/MainDb.cs
index 1ff34f4..41c56a5 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/MainDb.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/MainDb.cs
@@ -11,6 +11,7 @@
     {
         public const string CurrentDbConnId = "WIDESEA";
         public const string ConnectionString = "ConnectionString";
+        public const string ConnectionStringWCS = "ConnectionStringWCS";
         public const string TenantTableName = "Sys_Tenant";
         public const string TenantStatus = "Status";
         public const string TenantId = "TenantId";
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/SqlSugarHelper.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/SqlSugarHelper.cs
index 7ab5c6c..5d304cd 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/SqlSugarHelper.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/SqlSugarHelper.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using WIDESEA_Core.DB;
 using WIDESEA_Core.Seed;
 
 namespace WIDESEA_Core.Helper
@@ -14,14 +15,26 @@
         //濡傛灉鏄浐瀹氬搴撳彲浠ヤ紶 new SqlSugarScope(List<ConnectionConfig>,db=>{}) 鏂囨。锛氬绉熸埛
         //濡傛灉鏄笉鍥哄畾澶氬簱 鍙互鐪嬫枃妗aas鍒嗗簱
         //鐢ㄥ崟渚嬫ā寮�
-        public static SqlSugarScope Db = new SqlSugarScope(new ConnectionConfig()
+        public static SqlSugarScope DbWCS = new SqlSugarScope(new ConnectionConfig()
         {
-            ConnectionString = DBContext.GetMainConnectionDb().Connection,
+            //ConnectionString = DBContext.GetMainConnectionDb().Connection,
+            ConnectionString = AppSettings.app(MainDb.ConnectionStringWCS),
             DbType = DbType.SqlServer,//鏁版嵁搴撶被鍨�
             IsAutoCloseConnection = true //涓嶈鎴恡rue瑕佹墜鍔╟lose
         },
       db =>
           { 
           });
+
+        public static SqlSugarScope DbWMS = new SqlSugarScope(new ConnectionConfig()
+        {
+            ConnectionString = DBContext.GetMainConnectionDb().Connection,
+            //ConnectionString = AppSettings.app(MainDb.ConnectionStringWCS),
+            DbType = DbType.SqlServer,//鏁版嵁搴撶被鍨�
+            IsAutoCloseConnection = true //涓嶈鎴恡rue瑕佹墜鍔╟lose
+        },
+      db =>
+      {
+      });
     }
 }
\ No newline at end of file
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/HostedService/SeedDataHostedService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/HostedService/SeedDataHostedService.cs
index fe41350..21bbef2 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/HostedService/SeedDataHostedService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/HostedService/SeedDataHostedService.cs
@@ -49,7 +49,7 @@
                 {
                     // 浣跨敤 myScopedService 鎵ц浠诲姟
 
-                    await DBSeed.SeedAsync(_dbContext, _webRootPath);
+                    //await DBSeed.SeedAsync(_dbContext, _webRootPath);
 
                     //澶氱鎴� 鍚屾
                     //await DBSeed.TenantSeedAsync(_dbContext);
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/ProcessApply/ProcessApplyService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/ProcessApply/ProcessApplyService.cs
index 142e609..a06a7b0 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/ProcessApply/ProcessApplyService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/ProcessApply/ProcessApplyService.cs
@@ -100,7 +100,7 @@
             var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
             if (result.SerialNos.Count > 0)
             {
-                var stockHty = await SqlSugarHelper.Db.Queryable<DtStockInfo>().IncludesAllFirstLayer().FirstAsync();
+                var stockHty = await SqlSugarHelper.DbWMS.Queryable<DtStockInfo>().IncludesAllFirstLayer().FirstAsync();
                 if (stockHty != null)
                 {
                     var parameterInfo = JsonConvert.DeserializeObject<List<ParameterInfo>>(stockHty.ParameterInfos).FirstOrDefault(y => y.Description.Contains("鏃堕棿"));
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs
index d737843..32c25c8 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs
@@ -400,7 +400,7 @@
 
     private async Task AddStockInfoHtyAsync(DtStockInfo_Hty dtStock)
     {
-        var isStockAdd = await SqlSugarHelper.Db.InsertNav(dtStock).IncludesAllFirstLayer().ExecuteCommandAsync();
+        var isStockAdd = await SqlSugarHelper.DbWMS.InsertNav(dtStock).IncludesAllFirstLayer().ExecuteCommandAsync();
         if (!isStockAdd)
         {
             throw new Exception("搴撳瓨鍘嗗彶淇℃伅娣诲姞澶辫触");
@@ -419,7 +419,7 @@
     private void AddStockInfoDetailHty(List<DtStockInfoDetail_Hty> details)
     {
 
-        var isStockAdd = SqlSugarHelper.Db.Insertable(details).ExecuteCommand();
+        var isStockAdd = SqlSugarHelper.DbWMS.Insertable(details).ExecuteCommand();
         if (isStockAdd==0)
         {
             throw new Exception("搴撳瓨鏄庣粏鍘嗗彶淇℃伅娣诲姞澶辫触");
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
index 3b6a326..931a2e7 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
@@ -14,6 +14,7 @@
 using WIDESEA_StorageBasicRepository;
 using WIDESEA_StoragIntegrationServices;
 using WIDESEAWCS_BasicInfoRepository;
+using WIDESEAWCS_QuartzJob.Models;
 
 namespace WIDESEA_StorageTaskServices;
 
@@ -300,7 +301,7 @@
 
     private async Task AddStockInfoHtyAsync(DtStockInfo_Hty dtStock)
     {
-        var isStockAdd = await SqlSugarHelper.Db.InsertNav(dtStock).IncludesAllFirstLayer().ExecuteCommandAsync();
+        var isStockAdd = await SqlSugarHelper.DbWMS.InsertNav(dtStock).IncludesAllFirstLayer().ExecuteCommandAsync();
         if (!isStockAdd)
         {
             throw new Exception("搴撳瓨鍘嗗彶淇℃伅娣诲姞澶辫触");
@@ -1229,14 +1230,19 @@
     /// </summary>
     private async Task<DtStockInfo> QueryStockInfoForRealTrayCWAsync(List<string> areaCodes, string productionLine)
     {
-        var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == "CWSC1");
+        var areaId = (await _areaInfoRepository.QueryDataAsync(x => areaCodes.Contains(x.AreaCode))).Select(x => x.AreaID).ToList();
+        if (areaId.Count == 0)
+        {
+            ConsoleHelper.WriteErrorLine($"鏌ヨ甯告俯瀹炵洏搴撳瓨淇℃伅鏃�,鏈壘鍒板尯鍩熶唬鐮佷负{JsonConvert.SerializeObject(areaCodes)}鐨勬暟鎹�");
+            return null;
+        }
 
         var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
             .Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo
             .Includes(x => x.StockInfoDetails) // 棰勫姞杞絊tockInfoDetails
             .Where(x => areaCodes.Contains(x.AreaCode) && x.OutboundTime < DateTime.Now && x.IsFull == true) // 杩囨护鏉′欢
             .WhereIF(!productionLine.IsNullOrEmpty(), x => x.ProductionLine == productionLine)
-            .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
+            .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && areaId.Contains(x.LocationInfo.AreaId) && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
             .OrderBy(x => x.OutboundTime) // 鎺掑簭
             .FirstAsync(); // 鑾峰彇绗竴涓厓绱�
 
@@ -1669,7 +1675,39 @@
                     content.OK(data: taskDTO);
                 }
                 else
-                    content.Error(result.MOMMessage);
+                {
+                    var location = await GetLocationDistributeAsync(station.Roadway);
+                    var task = new Dt_Task
+                    {
+                        CurrentAddress = station.stationLocation,
+                        Grade = 1,
+                        Roadway = station.Roadway,
+                        TargetAddress = location.LocationCode,
+                        Dispatchertime = DateTime.Now,
+                        MaterialNo = "",
+                        NextAddress = location.LocationCode,
+                        OrderNo = null,
+                        PalletCode = palletCode,
+                        SourceAddress = position,
+                        TaskState = (int)TaskInStatusEnum.Line_InFinish,
+                        TaskType = (int)TaskInboundTypeEnum.InTray,
+                        TaskNum = await BaseDal.GetTaskNo(),
+                        Creater = "Systeam"
+                    };
+                    // 鍒涘缓WMS浠诲姟
+                    WMSTaskDTO taskDTO = CreateWMSTaskDTO(task);
+
+                    await _unitOfWorkManage.UseTranAsync(async () =>
+                    {
+                        // 娣诲姞浠诲姟鍒版暟鎹簱
+                        await BaseDal.AddDataAsync(task);
+                        // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
+                        location.LocationStatus = (int)LocationEnum.Lock;
+                        await _locationRepository.UpdateDataAsync(location);
+                    });
+
+                    content.OK(data: taskDTO);
+                }
             }
             else
             {
@@ -1697,7 +1735,7 @@
                 Grade = 1,
                 PalletCode = taskOld.PalletCode,
                 RoadWay = taskOld.Roadway,
-                SourceAddress = taskOld.CurrentAddress,
+                SourceAddress = taskOld.SourceAddress,
                 TargetAddress = taskOld.TargetAddress,
                 TaskState = taskOld.TaskState.Value,
                 Id = 0,
@@ -2259,7 +2297,11 @@
     /// <returns></returns>
     public async Task<string> GetRoadWayAsync(List<string> process)
     {
-        var minGroup = _locationRepository.QueryData(x => process.Contains(x.RoadwayNo) && x.LocationStatus == (int)LocationEnum.Free)
+        var deviceCode = await SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
+             .Where(x => x.DeviceStatus == 1.ToString() && process.Contains(x.DeviceCode))
+             .Select(x => x.DeviceCode).ToListAsync();
+
+        var minGroup = _locationRepository.QueryData(x => deviceCode.Contains(x.RoadwayNo) && x.LocationStatus == (int)LocationEnum.Free)
              .GroupBy(x => x.RoadwayNo)
              .OrderByDescending(g => g.Count()) // 鏍规嵁姣忎釜缁勭殑鍏冪礌鏁伴噺鎺掑簭
              .ToList(); // 鍙栧嚭鏁伴噺鏈�澶氱殑缁�
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json
index 6a31190..1e92aab 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json
@@ -10,11 +10,11 @@
   "MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue
   //杩炴帴瀛楃涓�
   //"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
-  //"ConnectionString": "Data Source=192.168.5.251;Initial Catalog=WIDESEA_WMSDB_BBMain;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+  "ConnectionString": "Data Source=192.168.5.251;Initial Catalog=WIDESEA_WMSDB_BBMain;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
   //"ConnectionString": "Data Source=127.0.0.1;Initial Catalog=WIDESEA_WMS2F08;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
-  "ConnectionString": "Data Source=.\\LIULEI;Initial Catalog=WIDESEA_WMSDB_BBMain;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+  //"ConnectionString": "Data Source=.\\LIULEI;Initial Catalog=WIDESEA_WMSDB_BBMain;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
   //"ConnectionString": "Data Source=192.168.20.251;Initial Catalog=WIDESEA_WMSDB;User ID=sa;Password=123456@gy;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
-
+  "ConnectionStringWCS": "Data Source=192.168.5.251;Initial Catalog=WIDESEAWCS_TEST;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
   //璺ㄥ煙
   "Cors": {
     "PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.MvcApplicationPartsAssemblyInfo.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.MvcApplicationPartsAssemblyInfo.cs
index 1cf4236..c85e30c 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.MvcApplicationPartsAssemblyInfo.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.MvcApplicationPartsAssemblyInfo.cs
@@ -1,9 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//     杩愯鏃剁増鏈�:4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
+//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
 // </auto-generated>
 //------------------------------------------------------------------------------
 

--
Gitblit v1.9.3