修改一部分文件结构

WcsMain/ApiClient/AGV/AGVBaseWebApi.cs

@@ -1,8 +1,8 @@
 using ApiTool;
 using WcsMain.ApiClient.General;
 using WcsMain.Common;
-using WcsMain.ExtendMethod;
 using WcsMain.Constant.WcsAttribute.AutoFacAttribute;
+using WcsMain.Constant.ExtendMethod;
 
 namespace WcsMain.ApiClient.AGV;
 

WcsMain/ApiClient/AGV/AGVWebApiAction.cs

@@ -2,8 +2,8 @@
 using WcsMain.Common;
 using WcsMain.Constant;
 using WcsMain.DataBase.TableEntity;
-using WcsMain.ExtendMethod;
 using WcsMain.Constant.WcsAttribute.AutoFacAttribute;
+using WcsMain.Constant.ExtendMethod;
 
 namespace WcsMain.ApiClient.AGV;
 

WcsMain/ApiClient/Shuttle/ShuttleBaseWebApi.cs

@@ -1,8 +1,8 @@
 using ApiTool;
 using WcsMain.ApiClient.General;
 using WcsMain.Common;
-using WcsMain.ExtendMethod;
 using WcsMain.Constant.WcsAttribute.AutoFacAttribute;
+using WcsMain.Constant.ExtendMethod;
 
 namespace WcsMain.ApiClient.Shuttle;
 

WcsMain/ApiClient/Shuttle/ShuttleWebApiAction.cs

@@ -1,8 +1,8 @@
 using WcsMain.Common;
 using WcsMain.DataBase.TableEntity;
-using WcsMain.ExtendMethod;
 using WcsMain.Constant.WcsAttribute.AutoFacAttribute;
 using WcsMain.ApiClient.Shuttle.Dto;
+using WcsMain.Constant.ExtendMethod;
 
 namespace WcsMain.ApiClient.Shuttle;
 

WcsMain/ApiClient/WMS/SendWmsTaskStatus.cs

@@ -3,8 +3,8 @@ using WcsMain.Common;
 using WcsMain.Constant.Enum;
 using WcsMain.DataBase.Dao;
 using WcsMain.DataBase.TableEntity;
-using WcsMain.ExtendMethod;
 using WcsMain.Constant.WcsAttribute.AutoFacAttribute;
+using WcsMain.Constant.ExtendMethod;
 
 namespace WcsMain.ApiClient.WMS;
 

WcsMain/ApiClient/WMS/WmsBaseWebApi.cs

@@ -1,8 +1,8 @@
 using ApiTool;
 using WcsMain.ApiClient.General;
 using WcsMain.Common;
-using WcsMain.ExtendMethod;
 using WcsMain.Constant.WcsAttribute.AutoFacAttribute;
+using WcsMain.Constant.ExtendMethod;
 
 namespace WcsMain.ApiClient.WMS;
 

WcsMain/ApiServe/Service/WmsService/WmsTaskService.cs

@@ -8,10 +8,10 @@ using WcsMain.Common;
 using WcsMain.Constant.Enum.Stacker;
 using WcsMain.DataBase.Dao;
 using WcsMain.DataBase.TableEntity;
-using WcsMain.ExtendMethod;
 using WcsMain.StaticData;
 using WcsMain.Utils.Plugins;
 using WcsMain.Constant.WcsAttribute.AutoFacAttribute;
+using WcsMain.Constant.ExtendMethod;
 
 namespace WcsMain.ApiServe.Service.WmsService;
 

WcsMain/Business/CommonAction/WCSTaskExecuteEvent.cs

@@ -1,5 +1,4 @@
-using WcsMain.ExtendMethod;
+using WcsMain.DataBase.Dao;
-using WcsMain.DataBase.Dao;
 using WcsMain.DataBase.TableEntity;
 using WcsMain.DataBase.MixDao;
 using WcsMain.Constant.WcsAttribute.AutoFacAttribute;
@@ -7,6 +6,7 @@ using WcsMain.StaticData;
 using WcsMain.ApiClient.WMS;
 using WcsMain.Constant.Enum.Stacker;
 using WcsMain.Constant.Enum.TaskEnum;
+using WcsMain.Constant.ExtendMethod;
 
 namespace WcsMain.Business.CommonAction;
 

WcsMain/Business/Convey/HistoryDataHandler/HisGetData/LoginGetData.cs

@@ -2,8 +2,8 @@
 using WcsMain.ApiClient.WMS.Dto;
 using WcsMain.Business.Convey.HistoryDataHandler.HisGetData.I;
 using WcsMain.Common;
+using WcsMain.Constant.ExtendMethod;
 using WcsMain.DataBase.TableEntity;
-using WcsMain.ExtendMethod;
 
 namespace WcsMain.Business.Convey.HistoryDataHandler.HisGetData;
 

WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick1StandOutC3.cs

@@ -4,11 +4,11 @@ using WcsMain.Business.Convey.HistoryDataHandler.HisGetData.I;
 using WcsMain.Common;
 using WcsMain.Common.DataService;
 using WcsMain.Constant.Enum.Convey;
+using WcsMain.Constant.ExtendMethod;
 using WcsMain.DataBase.Dao;
 using WcsMain.DataBase.TableEntity;
 using WcsMain.EquipOperation.Convey;
 using WcsMain.EquipOperation.Entity;
-using WcsMain.ExtendMethod;
 
 namespace WcsMain.Business.Convey.HistoryDataHandler.HisGetData;
 

WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick2StandOutC4.cs

@@ -4,11 +4,11 @@ using WcsMain.Business.Convey.HistoryDataHandler.HisGetData.I;
 using WcsMain.Common;
 using WcsMain.Common.DataService;
 using WcsMain.Constant.Enum.Convey;
+using WcsMain.Constant.ExtendMethod;
 using WcsMain.DataBase.Dao;
 using WcsMain.DataBase.TableEntity;
 using WcsMain.EquipOperation.Convey;
 using WcsMain.EquipOperation.Entity;
-using WcsMain.ExtendMethod;
 
 namespace WcsMain.Business.Convey.HistoryDataHandler.HisGetData;
 

WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInErr.cs

@@ -3,11 +3,11 @@ using WcsMain.Common;
 using WcsMain.Common.DataService;
 using WcsMain.Constant.Enum.Convey;
 using WcsMain.Constant.Enum.Stacker;
+using WcsMain.Constant.ExtendMethod;
 using WcsMain.DataBase.Dao;
 using WcsMain.DataBase.TableEntity;
 using WcsMain.EquipOperation.Convey;
 using WcsMain.EquipOperation.Entity;
-using WcsMain.ExtendMethod;
 
 namespace WcsMain.Business.Convey.HistoryDataHandler.HisGetData;
 

WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInSpliter.cs

@@ -3,11 +3,11 @@ using WcsMain.Common;
 using WcsMain.Common.DataService;
 using WcsMain.Constant.Enum.Convey;
 using WcsMain.Constant.Enum.Stacker;
+using WcsMain.Constant.ExtendMethod;
 using WcsMain.DataBase.Dao;
 using WcsMain.DataBase.TableEntity;
 using WcsMain.EquipOperation.Convey;
 using WcsMain.EquipOperation.Entity;
-using WcsMain.ExtendMethod;
 
 namespace WcsMain.Business.Convey.HistoryDataHandler.HisGetData;
 

WcsMain/Business/ElTag/Atop/BaseOprDataHandler.cs

@@ -10,6 +10,7 @@ using WcsMain.DataBase.TableEntity;
 using WcsMain.EquipOperation.ElTag;
 using WcsMain.ExtendMethod;
 using WcsMain.Constant.WcsAttribute.AutoFacAttribute;
+using WcsMain.Constant.ExtendMethod;
 
 namespace WcsMain.Business.ElTag.Atop;
 

WcsMain/CirculationJob/Convey/PickStandButton.cs

@@ -3,10 +3,10 @@ using WcsMain.ApiClient.WMS;
 using WcsMain.ApiClient.WMS.Dto;
 using WcsMain.Common;
 using WcsMain.Constant.Enum.Convey;
+using WcsMain.Constant.ExtendMethod;
 using WcsMain.DataBase.Dao;
 using WcsMain.DataBase.TableEntity;
 using WcsMain.EquipOperation.Convey;
-using WcsMain.ExtendMethod;
 
 namespace WcsMain.CirculationJob.Convey;
 

WcsMain/CirculationJob/Convey/UploadBoxArrive.cs

@@ -4,10 +4,10 @@ using WcsMain.ApiClient.WMS;
 using WcsMain.ApiClient.WMS.Dto;
 using WcsMain.Common;
 using WcsMain.Constant.Enum.Convey;
+using WcsMain.Constant.ExtendMethod;
 using WcsMain.DataBase.Dao;
 using WcsMain.DataBase.TableEntity;
 using WcsMain.EquipOperation.Convey;
-using WcsMain.ExtendMethod;
 
 namespace WcsMain.CirculationJob.Convey;
 

WcsMain/CirculationJob/Stacker/CheckAccount.cs

@@ -2,11 +2,11 @@
 using WcsMain.Business.CommonAction;
 using WcsMain.Common;
 using WcsMain.Constant.Enum;
+using WcsMain.Constant.ExtendMethod;
 using WcsMain.DataBase.Dao;
 using WcsMain.DataBase.TableEntity;
 using WcsMain.EquipOperation.Entity;
 using WcsMain.EquipOperation.Stacker;
-using WcsMain.ExtendMethod;
 
 namespace WcsMain.CirculationJob.Stacker;
 

WcsMain/CirculationJob/Stacker/ExeTaskDoubleFork.cs

@@ -3,6 +3,7 @@ using WcsMain.Business.CommonAction;
 using WcsMain.Common;
 using WcsMain.Common.DataService;
 using WcsMain.Constant.Enum.Stacker;
+using WcsMain.Constant.ExtendMethod;
 using WcsMain.DataBase.Dao;
 using WcsMain.DataBase.TableEntity;
 using WcsMain.EquipOperation.Convey;

WcsMain/CirculationJob/Stacker/ExecuteWcsTask.cs

@@ -3,6 +3,7 @@ using WcsMain.Business.CommonAction;
 using WcsMain.Common;
 using WcsMain.Constant.Enum.Stacker;
 using WcsMain.Constant.Enum.TaskEnum;
+using WcsMain.Constant.ExtendMethod;
 using WcsMain.DataBase.Dao;
 using WcsMain.DataBase.TableEntity;
 using WcsMain.EquipOperation.Entity.Stacker;

WcsMain/CirculationJob/Stacker/RecordErr.cs

@@ -1,10 +1,10 @@
 using CirculateTool.Attribute;
 using WcsMain.Common;
 using WcsMain.Common.DataService;
+using WcsMain.Constant.ExtendMethod;
 using WcsMain.DataBase.Dao;
 using WcsMain.DataBase.TableEntity;
 using WcsMain.EquipOperation.Stacker;
-using WcsMain.ExtendMethod;
 
 namespace WcsMain.CirculationJob.Stacker;
 

WcsMain/CirculationJob/Stacker/UploadStackerStatus.cs

@@ -3,8 +3,8 @@ using WcsMain.ApiClient.WMS;
 using WcsMain.ApiClient.WMS.Dto;
 using WcsMain.Common;
 using WcsMain.Constant.Enum.Stacker;
+using WcsMain.Constant.ExtendMethod;
 using WcsMain.EquipOperation.Stacker;
-using WcsMain.ExtendMethod;
 
 namespace WcsMain.CirculationJob.Stacker;
 

WcsMain/CirculationJob/TaskData/ResolveWmsTask.cs

@@ -9,6 +9,7 @@ using WcsMain.ApiClient.WMS;
 using WcsMain.Common.DataService;
 using WcsMain.Constant.Enum.Stacker;
 using WcsMain.Constant.Enum.TaskEnum;
+using WcsMain.Constant.ExtendMethod;
 
 namespace WcsMain.CirculationJob.TaskData;
 

WcsMain/Constant/ExtendMethod/AppApiBaseInfoExtendMethod.cs

@@ -1,6 +1,6 @@
 using WcsMain.DataBase.TableEntity;
 
-namespace WcsMain.ExtendMethod;
+namespace WcsMain.Constant.ExtendMethod;
 
 public static class AppApiBaseInfoExtendMethod
 {
@@ -15,5 +15,5 @@ public static class AppApiBaseInfoExtendMethod
         var baseInfo = baseData?.Find(f => f.ApiKey == apiKey);
         return baseInfo?.Address;
     }
-    
+
 }

WcsMain/Constant/ExtendMethod/AppLocationExtendMethod.cs

@@ -1,6 +1,6 @@
 using WcsMain.DataBase.TableEntity;
 
-namespace WcsMain.ExtendMethod;
+namespace WcsMain.Constant.ExtendMethod;
 
 /// <summary>
 /// 库位的扩展方法
@@ -15,10 +15,10 @@ public static class AppLocationExtendMethod
     /// <returns></returns>
     public static bool ExistWmsLocation(this List<AppLocation>? value, params string?[] wmsLocations)
     {
-        if(value == default || wmsLocations == default || wmsLocations.Length < 1) return false;
+        if (value == default || wmsLocations == default || wmsLocations.Length < 1) return false;
         foreach (var wmsLocation in wmsLocations)
         {
-            if(!value.Exists(e => e.WmsLocation == wmsLocation)) return false;
+            if (!value.Exists(e => e.WmsLocation == wmsLocation)) return false;
         }
         return true;
     }
@@ -31,7 +31,7 @@ public static class AppLocationExtendMethod
     /// <returns></returns>
     public static AppLocation? DetailWithWmsLocation(this List<AppLocation>? value, string? wmsLocation)
     {
-        if(value == default || wmsLocation == default) return default;
+        if (value == default || wmsLocation == default) return default;
         return value.Find(f => f.WmsLocation == wmsLocation);
     }
 

WcsMain/Constant/ExtendMethod/AppStackerExtendMethod.cs

@@ -1,6 +1,6 @@
 using WcsMain.DataBase.TableEntity;
 
-namespace WcsMain.ExtendMethod;
+namespace WcsMain.Constant.ExtendMethod;
 
 /// <summary>
 ///  堆垛机操作扩展方法
@@ -14,7 +14,7 @@ public static class AppStackerExtendMethod
     /// <returns></returns>
     public static List<AppStacker> Open(this List<AppStacker>? value)
     {
-        if(value == default) return [];
+        if (value == default) return [];
         return value.FindAll(f => f.StackerStatus == 1);
     }
 

WcsMain/Constant/ExtendMethod/AppWcsTaskExtendMethod.cs

@@ -2,7 +2,7 @@
 using WcsMain.DataBase.TableEntity;
 using WcsMain.EquipOperation.Entity.Stacker;
 
-namespace WcsMain.ExtendMethod;
+namespace WcsMain.Constant.ExtendMethod;
 
 /// <summary>
 /// wcs 任务表的扩展方法
@@ -141,5 +141,5 @@ public static class AppWcsTaskExtendMethod
     }
 
 
-    
+
 }

WcsMain/Constant/ExtendMethod/StackerExtendMethod.cs

@@ -1,6 +1,6 @@
 using WcsMain.Constant.Enum.Stacker;
 
-namespace WcsMain.ExtendMethod;
+namespace WcsMain.Constant.ExtendMethod;
 
 public static class StackerExtendMethod
 {

WcsMain/Constant/ExtendMethod/TaskExtendMethod.cs

@@ -1,4 +1,4 @@
-namespace WcsMain.ExtendMethod;
+namespace WcsMain.Constant.ExtendMethod;
 
 /// <summary>
 /// 任务扩展方法

WcsMain/DataBase/MixDao/TaskDao.cs

@@ -1,8 +1,8 @@
 using WcsMain.Common;
 using WcsMain.Constant.Enum.Stacker;
 using WcsMain.DataBase.TableEntity;
-using WcsMain.ExtendMethod;
 using WcsMain.Constant.WcsAttribute.AutoFacAttribute;
+using WcsMain.Constant.ExtendMethod;
 
 namespace WcsMain.DataBase.MixDao;
 

WcsMain/appsettings.json

@@ -8,13 +8,13 @@
   "AllowedHosts": "*",
   "Settings": {
     "DBMysql": "server=10.90.36.71;port=3306;user=developer;password=developer;database=wcs_kate_suzhou;",
-    "DBMysqlLocal": "server=192.168.234.134;port=3306;user=developer;password=developer;database=app_wcs_shangqi;",
+    "DBMysqlLocal": "server=192.168.234.128;port=3306;user=developer;password=developer;database=app_wcs_shangqi;",
 
     "DBMssql": "Data Source=192.168.142.131;Initial Catalog=wcs;User Id=sa;Password=Sa123;",
     "DBMssqlLocal": "Data Source=192.168.142.131;Initial Catalog=wcs_stacker;User Id=sa;Password=Sa123;",
 
     "ApplicationConfig": {
-      "ApiOnly": false,
+      "ApiOnly": true,
       "Language": "zh-CN"
     },
     "UseUrls": [ "http://*:18990" ]