1、修改文件结构

2、删除不使用的 using

Tools/CirculateTool/Attribute/CirculationTimeAttribute.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CirculateTool.Attribute;
+namespace CirculateTool.Attribute;
 
 /// <summary>
 /// 在指定时间执行的任务

Tools/CirculateTool/Entity/TimeTask.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CirculateTool.Entity;
+namespace CirculateTool.Entity;
 
 /// <summary>
 /// 按时执行的任务的定时类

Tools/LedSimple/LEDColor.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LedSimple;
+namespace LedSimple;
 
 public enum LEDColor
 {

Tools/PlcTool/Siemens/Entity/SemS7Result.cs

@@ -1,5 +1,4 @@
 using Newtonsoft.Json;
-using System.Text;
 
 namespace PlcTool.Siemens.Entity;
 

WcsMain/ApiClient/AGV/AGVBaseWebApi.cs

@@ -1,19 +1,19 @@
 using ApiTool;
-using WcsMain.Business.CommonAction;
+using WcsMain.ApiClient.General;
 using WcsMain.Common;
 using WcsMain.ExtendMethod;
-using WcsMain.WcsAttribute.AutoFacAttribute;
+using WcsMain.Constant.WcsAttribute.AutoFacAttribute;
 
-namespace WcsMain.Plugins;
+namespace WcsMain.ApiClient.AGV;
 
 
 /// <summary>
 /// AGV 接口工具
 /// </summary>
 [Component]
-public class AGVWebApiPost : WebApiPost
+public class AGVBaseWebApi : WebApiPost
 {
-    public AGVWebApiPost(ApiResponseAction apiResponseAction)
+    public AGVBaseWebApi(ApiResponseAction apiResponseAction)
     {
         SetResponseAction(apiResponseAction.ApiResponse);
         SetBaseUrl(CommonData.AppApiBaseInfos.GetAddress("AGVBaseApiAddress") ?? "");

WcsMain/ApiClient/AGV/AGVWebApiAction.cs

@@ -1,18 +1,17 @@
-using WcsMain.ApiClient.DataEntity.AGVEntity;
+using WcsMain.ApiClient.AGV.Dto;
 using WcsMain.Common;
 using WcsMain.Constant;
 using WcsMain.DataBase.TableEntity;
-using WcsMain.Plugins;
 using WcsMain.ExtendMethod;
-using WcsMain.WcsAttribute.AutoFacAttribute;
+using WcsMain.Constant.WcsAttribute.AutoFacAttribute;
 
-namespace WcsMain.Business.AGV;
+namespace WcsMain.ApiClient.AGV;
 
 /// <summary>
 /// AGV 动作
 /// </summary>
 [Component]
-public class AGVAction(AGVWebApiPost webApiPost)
+public class AGVWebApiAction(AGVBaseWebApi webApiPost)
 {
 
     /// <summary>

WcsMain/ApiClient/AGV/Dto/AGVBucketMove.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace WcsMain.ApiClient.DataEntity.AGVEntity;
+namespace WcsMain.ApiClient.AGV.Dto;
 
 /// <summary>
 /// AGV 点对点货架搬运
@@ -65,13 +65,13 @@ public class AGVBucketMove
     /// 实操反馈后是否需要返库
     /// </summary>
     [JsonProperty("needReset")]
-    public bool? NeedReset {  get; set; }
+    public bool? NeedReset { get; set; }
 
     /// <summary>
     /// 是否需要货架出厂
     /// </summary>
     [JsonProperty("needOut")]
-    public int? NeedOut {  get; set; }
+    public int? NeedOut { get; set; }
 
     /// <summary>
     /// 是否AGV接力模式

WcsMain/ApiClient/AGV/Dto/AGVRequestLayout.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace WcsMain.ApiClient.DataEntity.AGVEntity;
+namespace WcsMain.ApiClient.AGV.Dto;
 
 /// <summary>
 /// AGV 接口请求数据格式
@@ -32,7 +32,7 @@ public class AGVRequestHeader
     /// 快仓唯一标识
     /// </summary>
     [JsonProperty("appKey")]
-    public string? AppKey {  get; set; }
+    public string? AppKey { get; set; }
 
     /// <summary>
     /// 应用密钥

WcsMain/ApiClient/AGV/Dto/AGVResponseLayout.cs

@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
 using Newtonsoft.Json;
 
-namespace WcsMain.ApiClient.DataEntity.AGVEntity;
+namespace WcsMain.ApiClient.AGV.Dto;
 
 /// <summary>
 /// AGV 接口响应数据模板类
@@ -89,7 +89,7 @@ public class AGVResponseBody<T> where T : class, new()
     /// 响应数据
     /// </summary>
     [JsonProperty("data")]
-    [JsonPropertyName ("data")]
+    [JsonPropertyName("data")]
     public T? Data { get; set; }
 
 

WcsMain/ApiClient/AGV/Dto/AGVTaskRequest.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace WcsMain.ApiClient.DataEntity.AGVEntity;
+namespace WcsMain.ApiClient.AGV.Dto;
 
 /// <summary>
 /// 向 AGV 发送任务模板数据
@@ -29,7 +29,7 @@ public class AGVTaskRequest<T> where T : class, new()
     /// 任务组序号
     /// </summary>
     [JsonProperty("sequence")]
-    public int? Sequence {  get; set; }
+    public int? Sequence { get; set; }
 
     /// <summary>
     /// 任务组数量
@@ -65,7 +65,7 @@ public class AGVTaskRequest<T> where T : class, new()
     /// AGV 放下对象后移动的地点
     /// </summary>
     [JsonProperty("agvEndPoint")]
-    public string? AGVEndPoint {  get; set; }
+    public string? AGVEndPoint { get; set; }
 
     /// <summary>
     /// 是否需要实操

WcsMain/ApiClient/AGV/Dto/AGVTaskResponse.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace WcsMain.ApiClient.DataEntity.AGVEntity;
+namespace WcsMain.ApiClient.AGV.Dto;
 
 /// <summary>
 /// 给AGV发送任务的返回类

WcsMain/ApiClient/General/ApiResponseAction.cs

@@ -1,11 +1,11 @@
 using ApiTool.Dto;
 using LogTool;
+using WcsMain.Common.DataService;
 using WcsMain.DataBase.Dao;
 using WcsMain.DataBase.TableEntity;
-using WcsMain.DataService;
-using WcsMain.WcsAttribute.AutoFacAttribute;
+using WcsMain.Constant.WcsAttribute.AutoFacAttribute;
 
-namespace WcsMain.Business.CommonAction;
+namespace WcsMain.ApiClient.General;
 
 /// <summary>
 /// 接口响应触发事件

WcsMain/ApiClient/Shuttle/Dto/ContainerTaskResponse.cs

@@ -1,4 +1,4 @@
-namespace WcsMain.ApiClient.DataEntity.ContainerEntity;
+namespace WcsMain.ApiClient.Shuttle.Dto;
 
 /// <summary>
 /// 四向车库的响应

WcsMain/ApiClient/Shuttle/Dto/ContainerTaskResqust.cs

@@ -1,4 +1,4 @@
-namespace WcsMain.ApiClient.DataEntity.ContainerEntity;
+namespace WcsMain.ApiClient.Shuttle.Dto;
 
 /// <summary>
 /// 四向车库出库移库请求
@@ -8,7 +8,7 @@ public class ContainerTaskResqust
     /// <summary>
     /// 请求ID
     /// </summary>
-    public string? RequestId {  get; set; }
+    public string? RequestId { get; set; }
 
     /// <summary>
     /// 密钥
@@ -33,7 +33,7 @@ public class ContainerTaskResqust
     /// <summary>
     /// 目标位置
     /// </summary>
-    public string? ToCell {  get; set; }
+    public string? ToCell { get; set; }
 
     /// <summary>
     /// 任务类型

WcsMain/ApiClient/Shuttle/ShuttleBaseWebApi.cs

@@ -1,18 +1,18 @@
 using ApiTool;
-using WcsMain.Business.CommonAction;
+using WcsMain.ApiClient.General;
 using WcsMain.Common;
 using WcsMain.ExtendMethod;
-using WcsMain.WcsAttribute.AutoFacAttribute;
+using WcsMain.Constant.WcsAttribute.AutoFacAttribute;
 
-namespace WcsMain.Plugins;
+namespace WcsMain.ApiClient.Shuttle;
 
 /// <summary>
 /// 四向车库接口请求
 /// </summary>
 [Component]
-public class ContainerWebApiPost : WebApiPost
+public class ShuttleBaseWebApi : WebApiPost
 {
-    public ContainerWebApiPost(ApiResponseAction apiResponseAction)
+    public ShuttleBaseWebApi(ApiResponseAction apiResponseAction)
     {
         SetResponseAction(apiResponseAction.ApiResponse);
         SetBaseUrl(CommonData.AppApiBaseInfos.GetAddress("ContainerBaseApiAddress") ?? "");

WcsMain/ApiClient/Shuttle/ShuttleWebApiAction.cs

@@ -1,17 +1,16 @@
-using WcsMain.ApiClient.DataEntity.ContainerEntity;
-using WcsMain.Common;
+using WcsMain.Common;
 using WcsMain.DataBase.TableEntity;
-using WcsMain.Plugins;
 using WcsMain.ExtendMethod;
-using WcsMain.WcsAttribute.AutoFacAttribute;
+using WcsMain.Constant.WcsAttribute.AutoFacAttribute;
+using WcsMain.ApiClient.Shuttle.Dto;
 
-namespace WcsMain.Business.Container;
+namespace WcsMain.ApiClient.Shuttle;
 
 /// <summary>
 /// 四向车库
 /// </summary>
 [Component]
-public class ContainerAction(ContainerWebApiPost webApiPost)
+public class ShuttleWebApiAction(ShuttleBaseWebApi webApiPost)
 {
     /// <summary>
     /// 四向车库执行移库任务
@@ -32,11 +31,11 @@ public class ContainerAction(ContainerWebApiPost webApiPost)
         };
         var response = webApiPost.HttpPost<ContainerTaskResqust, ContainerTaskResponse>(containerTaskResqust, CommonData.AppApiBaseInfos.GetAddress("ContainerOutMoveApiAddress") ?? "");
         var responseData = response.ResponseEntity;
-        if(!response.IsSend || responseData == null)
+        if (!response.IsSend || responseData == null)
         {
             return "请求失败，网络故障";
         }
-        if(responseData.Code == "200")
+        if (responseData.Code == "200")
         {
             return string.Empty;
         }

WcsMain/ApiClient/WMS/Dto/ApplyInRequest.cs

@@ -1,7 +1,6 @@
 using Newtonsoft.Json;
-using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiClient.DataEntity.WmsEntity;
+namespace WcsMain.ApiClient.WMS.Dto;
 
 /// <summary>
 /// 申请入库

WcsMain/ApiClient/WMS/Dto/ConveyButtonClickRequest.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace WcsMain.ApiClient.DataEntity.WmsEntity;
+namespace WcsMain.ApiClient.WMS.Dto;
 
 
 /// <summary>

WcsMain/ApiClient/WMS/Dto/ElTagComfirmButtonClickRequest.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace WcsMain.ApiClient.DataEntity.WmsEntity;
+namespace WcsMain.ApiClient.WMS.Dto;
 
 /// <summary>
 /// 电子标签确认按钮按下请求数据

WcsMain/ApiClient/WMS/Dto/RequestBackRequest.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace WcsMain.ApiClient.DataEntity.WmsEntity;
+namespace WcsMain.ApiClient.WMS.Dto;
 
 public class RequestBackRequest
 {

WcsMain/ApiClient/WMS/Dto/SendWmsTaskStatusRequest.cs

@@ -1,7 +1,6 @@
 using Newtonsoft.Json;
-using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiClient.DataEntity.WmsEntity;
+namespace WcsMain.ApiClient.WMS.Dto;
 
 /// <summary>
 /// 发送WMS任务状态请求实体

WcsMain/ApiClient/WMS/Dto/UploadPickStandRequest.cs

@@ -1,7 +1,6 @@
 using Newtonsoft.Json;
-using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiClient.DataEntity.WmsEntity;
+namespace WcsMain.ApiClient.WMS.Dto;
 
 /// <summary>
 /// 上传箱子到达拣选口的请求类

WcsMain/ApiClient/WMS/Dto/UploadStackerStatusRequest.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace WcsMain.ApiClient.DataEntity.WmsEntity;
+namespace WcsMain.ApiClient.WMS.Dto;
 
 /// <summary>
 /// 上传堆垛机是否报错的请求实体
@@ -11,7 +11,7 @@ public class UploadStackerStatusRequest
     /// 设备号
     /// </summary>
     [JsonProperty("equipment")]
-    public int? Equipment {  get; set; }
+    public int? Equipment { get; set; }
 
     /// <summary>
     /// 是否报错 --- 0：不报错；1：不可用

WcsMain/ApiClient/WMS/Dto/WmsResponse.cs

@@ -1,7 +1,6 @@
 using Newtonsoft.Json;
-using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiClient.DataEntity.WmsEntity;
+namespace WcsMain.ApiClient.WMS.Dto;
 
 public class WmsResponse
 {

WcsMain/ApiClient/WMS/SendWmsTaskStatus.cs

@@ -1,19 +1,18 @@
-using WcsMain.ApiClient.DataEntity.WmsEntity;
+using WcsMain.ApiClient.WMS.Dto;
 using WcsMain.Common;
+using WcsMain.Constant.Enum;
 using WcsMain.DataBase.Dao;
 using WcsMain.DataBase.TableEntity;
-using WcsMain.Enum;
 using WcsMain.ExtendMethod;
-using WcsMain.Plugins;
-using WcsMain.WcsAttribute.AutoFacAttribute;
+using WcsMain.Constant.WcsAttribute.AutoFacAttribute;
 
-namespace WcsMain.Business.CommonAction;
+namespace WcsMain.ApiClient.WMS;
 
 /// <summary>
 /// 用于发送WMS任务状态的类
 /// </summary>
 [Component]
-public class SendWmsTaskStatus(AppWmsTaskDao wmsTaskDao, WmsWebApiPost wmsWebApiPost)
+public class SendWmsTaskStatus(AppWmsTaskDao wmsTaskDao, WmsBaseWebApi wmsWebApiPost)
 {
 
     /// <summary>
@@ -24,7 +23,8 @@ public class SendWmsTaskStatus(AppWmsTaskDao wmsTaskDao, WmsWebApiPost wmsWebApi
     /// <param name="count"></param>
     public void SendTaskErr(string? taskId, string? errMsg, ushort count = 5)
     {
-        Task.Factory.StartNew(() => {
+        Task.Factory.StartNew(() =>
+        {
             AppWmsTask? wmsTask = default;
             for (int i = 0; i < count; i++)
             {
@@ -82,7 +82,8 @@ public class SendWmsTaskStatus(AppWmsTaskDao wmsTaskDao, WmsWebApiPost wmsWebApi
     /// <param name="count"></param>
     public void SendTaskEmptyOut(string? taskId, ushort count = 5)
     {
-        Task.Factory.StartNew(() => {
+        Task.Factory.StartNew(() =>
+        {
             AppWmsTask? wmsTask = default;
             for (int i = 0; i < count; i++)
             {
@@ -140,7 +141,8 @@ public class SendWmsTaskStatus(AppWmsTaskDao wmsTaskDao, WmsWebApiPost wmsWebApi
     /// <param name="count"></param>
     public void SendTaskDoubleIn(string? taskId, ushort count = 5)
     {
-        Task.Factory.StartNew(() => {
+        Task.Factory.StartNew(() =>
+        {
             AppWmsTask? wmsTask = default;
             for (int i = 0; i < count; i++)
             {
@@ -199,7 +201,8 @@ public class SendWmsTaskStatus(AppWmsTaskDao wmsTaskDao, WmsWebApiPost wmsWebApi
     /// <param name="count"></param>
     public void SendTaskStart(string? taskId, ushort count = 5)
     {
-        Task.Factory.StartNew(() => {
+        Task.Factory.StartNew(() =>
+        {
             AppWmsTask? wmsTask = default;
             for (int i = 0; i < count; i++)
             {
@@ -258,7 +261,8 @@ public class SendWmsTaskStatus(AppWmsTaskDao wmsTaskDao, WmsWebApiPost wmsWebApi
     /// <param name="destination"></param>
     public void SendTaskComplete(string? taskId, ushort count = 5, string? destination = default)
     {
-        Task.Factory.StartNew(() => {
+        Task.Factory.StartNew(() =>
+        {
             AppWmsTask? wmsTask = default;
             for (int i = 0; i < count; i++)
             {
@@ -316,7 +320,8 @@ public class SendWmsTaskStatus(AppWmsTaskDao wmsTaskDao, WmsWebApiPost wmsWebApi
     /// <param name="count"></param>
     public void SendTaskLeaveStart(AppWmsTask wmsTask, int count = 5)
     {
-        Task.Factory.StartNew(() => {
+        Task.Factory.StartNew(() =>
+        {
             if (wmsTask == default) { return; }
             SendWmsTaskStatusRequest request = new()
             {

WcsMain/ApiClient/WMS/WmsBaseWebApi.cs

@@ -1,20 +1,18 @@
 using ApiTool;
-using WcsMain.Business.CommonAction;
+using WcsMain.ApiClient.General;
 using WcsMain.Common;
-using WcsMain.DataBase.Dao;
-using WcsMain.DataBase.TableEntity;
 using WcsMain.ExtendMethod;
-using WcsMain.WcsAttribute.AutoFacAttribute;
+using WcsMain.Constant.WcsAttribute.AutoFacAttribute;
 
-namespace WcsMain.Plugins;
+namespace WcsMain.ApiClient.WMS;
 
 /// <summary>
 /// Wms 的API工具
 /// </summary>
 [Component]
-public class WmsWebApiPost : WebApiPost
+public class WmsBaseWebApi : WebApiPost
 {
-    public WmsWebApiPost(ApiResponseAction wmsApiResponseAction)
+    public WmsBaseWebApi(ApiResponseAction wmsApiResponseAction)
     {
         SetResponseAction(wmsApiResponseAction.ApiResponse);
         SetBaseUrl(CommonData.AppApiBaseInfos.GetAddress("WmsBaseApiAddress") ?? "");

WcsMain/ApiServe/ControllerFilter/ResponseFilterAttribute.cs

@@ -2,10 +2,10 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Newtonsoft.Json;
+using WcsMain.Common.DataService;
 using WcsMain.DataBase.Dao;
 using WcsMain.DataBase.TableEntity;
-using WcsMain.DataService;
-using WcsMain.WcsAttribute.AutoFacAttribute;
+using WcsMain.Constant.WcsAttribute.AutoFacAttribute;
 
 namespace WcsMain.ApiServe.ControllerFilter;
 

WcsMain/ApiServe/ControllerFilter/WcsAuthorizationAttribute.cs

@@ -1,5 +1,4 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Filters;
 
 namespace WcsMain.ApiServe.ControllerFilter;
 

WcsMain/ApiServe/ControllerFilter/WmsApiExceptionFilterAttribute.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
-using WcsMain.ApiServe.Controllers.Dto.WMSEntity;
+using WcsMain.ApiServe.Dto.WMSEntity;
 
 namespace WcsMain.ApiServe.ControllerFilter;
 

WcsMain/ApiServe/Controllers/AGVController/AGVController.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
-using WcsMain.ApiClient.DataEntity.AGVEntity;
+using WcsMain.ApiClient.AGV.Dto;
 using WcsMain.ApiServe.ControllerFilter;
-using WcsMain.ApiServe.Controllers.Dto.AGV;
+using WcsMain.ApiServe.Dto.AGV;
 using WcsMain.ApiServe.Service.AGVService;
 
 namespace WcsMain.ApiServe.Controllers.AGVController;
@@ -20,7 +20,7 @@ public class AGVController(AGVService agvService) : ControllerBase
     /// <param name="request"></param>
     /// <returns></returns>
     [HttpPost("taskCallBack")]
-    public AGVResponseLayout<AGVResponseLayout<object>> TaskCallBack(Dto.AGV.AGVRequestLayout<AGVRequestBodyLayout<AGVNoVeBuckMoveRequest>> request) => agvService.TaskCallBack(request);
+    public AGVResponseLayout<AGVResponseLayout<object>> TaskCallBack(ApiServe.Dto.AGV.AGVRequestLayout<AGVRequestBodyLayout<AGVNoVeBuckMoveRequest>> request) => agvService.TaskCallBack(request);
 
 
 

WcsMain/ApiServe/Controllers/ContainerController/ContainerController.cs

@@ -1,7 +1,6 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter;
-using WcsMain.ApiServe.Controllers.Dto.Container;
+using WcsMain.ApiServe.Dto.Container;
 using WcsMain.ApiServe.Service.ContainerService;
 
 namespace WcsMain.ApiServe.Controllers.ContainerController;

WcsMain/ApiServe/Controllers/ThreeDController/TaskController.cs

@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
-using WcsMain.ApiServe.Controllers.Dto;
+using WcsMain.ApiServe.Dto;
 using WcsMain.ApiServe.Service.TreeDService;
 using WcsMain.DataBase.TableEntity;
 

WcsMain/ApiServe/Controllers/WcsController/ApiAcceptController.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter;
 using WcsMain.ApiServe.ControllerFilter.ExceptionFilter;
-using WcsMain.ApiServe.Controllers.Dto;
-using WcsMain.ApiServe.Controllers.Dto.WcsDto.ApiAccept;
+using WcsMain.ApiServe.Dto;
+using WcsMain.ApiServe.Dto.WcsDto.ApiAccept;
 using WcsMain.ApiServe.Service.WcsService;
 using WcsMain.DataBase.TableEntity;
 

WcsMain/ApiServe/Controllers/WcsController/ApiRequestController.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter;
 using WcsMain.ApiServe.ControllerFilter.ExceptionFilter;
-using WcsMain.ApiServe.Controllers.Dto;
-using WcsMain.ApiServe.Controllers.Dto.WcsDto.ApiRequest;
+using WcsMain.ApiServe.Dto;
+using WcsMain.ApiServe.Dto.WcsDto.ApiRequest;
 using WcsMain.ApiServe.Service.WcsService;
 using WcsMain.DataBase.TableEntity;
 

WcsMain/ApiServe/Controllers/WcsController/ConfigController.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter;
 using WcsMain.ApiServe.ControllerFilter.ExceptionFilter;
-using WcsMain.ApiServe.Controllers.Dto;
-using WcsMain.ApiServe.Controllers.Dto.WcsDto.Config;
+using WcsMain.ApiServe.Dto;
+using WcsMain.ApiServe.Dto.WcsDto.Config;
 using WcsMain.ApiServe.Service.WcsService;
 using WcsMain.DataBase.TableEntity;
 

WcsMain/ApiServe/Controllers/WcsController/ConveyTaskController.cs

@@ -1,10 +1,8 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter;
 using WcsMain.ApiServe.ControllerFilter.ExceptionFilter;
-using WcsMain.ApiServe.Controllers.Dto;
-using WcsMain.ApiServe.Controllers.Dto.WcsDto.Convey;
-using WcsMain.ApiServe.Factory;
+using WcsMain.ApiServe.Dto;
+using WcsMain.ApiServe.Dto.WcsDto.Convey;
 using WcsMain.ApiServe.Service.WcsService;
 using WcsMain.DataBase.TableEntity;
 

WcsMain/ApiServe/Controllers/WcsController/ElTagController.cs

@@ -1,9 +1,8 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter;
 using WcsMain.ApiServe.ControllerFilter.ExceptionFilter;
-using WcsMain.ApiServe.Controllers.Dto;
-using WcsMain.ApiServe.Controllers.Dto.WcsDto.ElTag;
+using WcsMain.ApiServe.Dto;
+using WcsMain.ApiServe.Dto.WcsDto.ElTag;
 using WcsMain.ApiServe.Service.WcsService;
 using WcsMain.DataBase.TableEntity;
 

WcsMain/ApiServe/Controllers/WcsController/EquipmentController.cs

@@ -1,9 +1,9 @@
 using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter;
 using WcsMain.ApiServe.ControllerFilter.ExceptionFilter;
-using WcsMain.ApiServe.Controllers.Dto;
-using WcsMain.ApiServe.Controllers.Dto.Equipment;
-using WcsMain.ApiServe.Controllers.Dto.WcsDto.Equipment;
+using WcsMain.ApiServe.Dto;
+using WcsMain.ApiServe.Dto.Equipment;
+using WcsMain.ApiServe.Dto.WcsDto.Equipment;
 using WcsMain.ApiServe.Service.WcsService;
 
 namespace WcsMain.ApiServe.Controllers.WcsController;

WcsMain/ApiServe/Controllers/WcsController/LocationController.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter;
 using WcsMain.ApiServe.ControllerFilter.ExceptionFilter;
-using WcsMain.ApiServe.Controllers.Dto;
-using WcsMain.ApiServe.Controllers.Dto.WcsDto.Location;
+using WcsMain.ApiServe.Dto;
+using WcsMain.ApiServe.Dto.WcsDto.Location;
 using WcsMain.ApiServe.Service.WcsService;
 using WcsMain.DataBase.TableEntity;
 

WcsMain/ApiServe/Controllers/WcsController/MenuController.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter;
 using WcsMain.ApiServe.ControllerFilter.ExceptionFilter;
-using WcsMain.ApiServe.Controllers.Dto;
-using WcsMain.ApiServe.Controllers.Dto.WcsDto.Menu;
+using WcsMain.ApiServe.Dto;
+using WcsMain.ApiServe.Dto.WcsDto.Menu;
 using WcsMain.ApiServe.Service.WcsService;
 using WcsMain.DataBase.TableEntity;
 

WcsMain/ApiServe/Controllers/WcsController/PlcController.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter;
 using WcsMain.ApiServe.ControllerFilter.ExceptionFilter;
-using WcsMain.ApiServe.Controllers.Dto;
-using WcsMain.ApiServe.Controllers.Dto.WcsDto.PLC;
+using WcsMain.ApiServe.Dto;
+using WcsMain.ApiServe.Dto.WcsDto.PLC;
 using WcsMain.ApiServe.Service.WcsService;
 using WcsMain.DataBase.TableEntity;
 

WcsMain/ApiServe/Controllers/WcsController/PlcDbController.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter;
 using WcsMain.ApiServe.ControllerFilter.ExceptionFilter;
-using WcsMain.ApiServe.Controllers.Dto;
-using WcsMain.ApiServe.Controllers.Dto.WcsDto.DB;
+using WcsMain.ApiServe.Dto;
+using WcsMain.ApiServe.Dto.WcsDto.DB;
 using WcsMain.ApiServe.Service.WcsService;
 using WcsMain.DataBase.TableEntity;
 

WcsMain/ApiServe/Controllers/WcsController/RunningInfoController.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter;
 using WcsMain.ApiServe.ControllerFilter.ExceptionFilter;
-using WcsMain.ApiServe.Controllers.Dto;
-using WcsMain.ApiServe.Controllers.Dto.WcsDto.SystemController;
+using WcsMain.ApiServe.Dto;
+using WcsMain.ApiServe.Dto.WcsDto.SystemController;
 using WcsMain.ApiServe.Service.WcsService;
 
 namespace WcsMain.ApiServe.Controllers.WcsController;

WcsMain/ApiServe/Controllers/WcsController/ScanController.cs

@@ -1,9 +1,8 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter;
 using WcsMain.ApiServe.ControllerFilter.ExceptionFilter;
-using WcsMain.ApiServe.Controllers.Dto;
-using WcsMain.ApiServe.Controllers.Dto.WcsDto.Scan;
+using WcsMain.ApiServe.Dto;
+using WcsMain.ApiServe.Dto.WcsDto.Scan;
 using WcsMain.ApiServe.Service.WcsService;
 using WcsMain.DataBase.TableEntity;
 

WcsMain/ApiServe/Controllers/WcsController/SettingController.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter;
 using WcsMain.ApiServe.ControllerFilter.ExceptionFilter;
-using WcsMain.ApiServe.Controllers.Dto;
-using WcsMain.ApiServe.Controllers.Dto.WcsDto.Settings;
+using WcsMain.ApiServe.Dto;
+using WcsMain.ApiServe.Dto.WcsDto.Settings;
 using WcsMain.ApiServe.Service.WcsService;
 using WcsMain.DataBase.TableEntity;
 

WcsMain/ApiServe/Controllers/WcsController/SocketController.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter;
 using WcsMain.ApiServe.ControllerFilter.ExceptionFilter;
-using WcsMain.ApiServe.Controllers.Dto;
-using WcsMain.ApiServe.Controllers.Dto.WcsDto.Socket;
+using WcsMain.ApiServe.Dto;
+using WcsMain.ApiServe.Dto.WcsDto.Socket;
 using WcsMain.ApiServe.Service.WcsService;
 using WcsMain.DataBase.TableEntity;
 

WcsMain/ApiServe/Controllers/WcsController/StackerController.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter;
 using WcsMain.ApiServe.ControllerFilter.ExceptionFilter;
-using WcsMain.ApiServe.Controllers.Dto;
-using WcsMain.ApiServe.Controllers.Dto.WcsDto.Stacker;
+using WcsMain.ApiServe.Dto;
+using WcsMain.ApiServe.Dto.WcsDto.Stacker;
 using WcsMain.ApiServe.Service.WcsService;
 using WcsMain.DataBase.TableEntity;
 

WcsMain/ApiServe/Controllers/WcsController/StackerConveyController.cs

@@ -1,11 +1,10 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter.ExceptionFilter;
 using WcsMain.ApiServe.ControllerFilter;
 using WcsMain.ApiServe.Service.WcsService;
-using WcsMain.ApiServe.Controllers.Dto;
 using WcsMain.DataBase.TableEntity;
-using WcsMain.ApiServe.Controllers.Dto.WcsDto.StackerConvey;
+using WcsMain.ApiServe.Dto;
+using WcsMain.ApiServe.Dto.WcsDto.StackerConvey;
 
 namespace WcsMain.ApiServe.Controllers.WcsController;
 

WcsMain/ApiServe/Controllers/WcsController/UserController.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter;
 using WcsMain.ApiServe.ControllerFilter.ExceptionFilter;
-using WcsMain.ApiServe.Controllers.Dto;
-using WcsMain.ApiServe.Controllers.Dto.WcsDto.User;
+using WcsMain.ApiServe.Dto;
+using WcsMain.ApiServe.Dto.WcsDto.User;
 using WcsMain.ApiServe.Service.WcsService;
 using WcsMain.DataBase.TableEntity;
 

WcsMain/ApiServe/Controllers/WcsController/UserGroupController.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter;
 using WcsMain.ApiServe.ControllerFilter.ExceptionFilter;
-using WcsMain.ApiServe.Controllers.Dto;
-using WcsMain.ApiServe.Controllers.Dto.WcsDto.UserGroup;
+using WcsMain.ApiServe.Dto;
+using WcsMain.ApiServe.Dto.WcsDto.UserGroup;
 using WcsMain.ApiServe.Service.WcsService;
 using WcsMain.DataBase.TableEntity;
 

WcsMain/ApiServe/Controllers/WcsController/UserRuleController.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter;
 using WcsMain.ApiServe.ControllerFilter.ExceptionFilter;
-using WcsMain.ApiServe.Controllers.Dto;
-using WcsMain.ApiServe.Controllers.Dto.WcsDto.UserRule;
+using WcsMain.ApiServe.Dto;
+using WcsMain.ApiServe.Dto.WcsDto.UserRule;
 using WcsMain.ApiServe.Service.WcsService;
 using WcsMain.DataBase.TableEntity;
 

WcsMain/ApiServe/Controllers/WcsController/WcsTaskController.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter;
 using WcsMain.ApiServe.ControllerFilter.ExceptionFilter;
-using WcsMain.ApiServe.Controllers.Dto;
-using WcsMain.ApiServe.Controllers.Dto.WcsDto.WcsTask;
+using WcsMain.ApiServe.Dto;
+using WcsMain.ApiServe.Dto.WcsDto.WcsTask;
 using WcsMain.ApiServe.Service.WcsService;
 using WcsMain.DataBase.TableEntity;
 

WcsMain/ApiServe/Controllers/WcsController/WmsTaskController.cs

@@ -1,9 +1,9 @@
 using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter;
 using WcsMain.ApiServe.ControllerFilter.ExceptionFilter;
-using WcsMain.ApiServe.Controllers.Dto;
-using WcsMain.ApiServe.Controllers.Dto.WcsDto.WmsTask;
-using WcsMain.ApiServe.Controllers.Dto.WMSEntity.WmsTask;
+using WcsMain.ApiServe.Dto;
+using WcsMain.ApiServe.Dto.WcsDto.WmsTask;
+using WcsMain.ApiServe.Dto.WMSEntity.WmsTask;
 using WcsMain.ApiServe.Service.WcsService;
 using WcsMain.DataBase.TableEntity;
 

WcsMain/ApiServe/Controllers/WmsController/ConveyController.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter;
-using WcsMain.ApiServe.Controllers.Dto.WMSEntity;
-using WcsMain.ApiServe.Controllers.Dto.WMSEntity.Convey;
+using WcsMain.ApiServe.Dto.WMSEntity;
+using WcsMain.ApiServe.Dto.WMSEntity.Convey;
 using WcsMain.ApiServe.Service.WmsService;
 
 namespace WcsMain.ApiServe.Controllers.WmsController;

WcsMain/ApiServe/Controllers/WmsController/ElTagController.cs

@@ -1,8 +1,7 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter;
-using WcsMain.ApiServe.Controllers.Dto.WMSEntity;
-using WcsMain.ApiServe.Controllers.Dto.WMSEntity.ElTag;
+using WcsMain.ApiServe.Dto.WMSEntity;
+using WcsMain.ApiServe.Dto.WMSEntity.ElTag;
 using WcsMain.ApiServe.Service.WmsService;
 
 namespace WcsMain.ApiServe.Controllers.WmsController;

WcsMain/ApiServe/Controllers/WmsController/EquipmentController.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
-using WcsMain.ApiServe.Controllers.Dto.WMSEntity;
-using WcsMain.ApiServe.Controllers.Dto.WMSEntity.Equipment;
 using WcsMain.ApiServe.Service.WmsService;
 using WcsMain.ApiServe.ControllerFilter;
+using WcsMain.ApiServe.Dto.WMSEntity;
+using WcsMain.ApiServe.Dto.WMSEntity.Equipment;
 
 namespace WcsMain.ApiServe.Controllers.WmsController
 {

WcsMain/ApiServe/Controllers/WmsController/WmsTaskController.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using WcsMain.ApiServe.ControllerFilter;
-using WcsMain.ApiServe.Controllers.Dto.WcsDto.ElTag;
-using WcsMain.ApiServe.Controllers.Dto.WMSEntity;
-using WcsMain.ApiServe.Controllers.Dto.WMSEntity.WmsTask;
+using WcsMain.ApiServe.Dto.WcsDto.ElTag;
+using WcsMain.ApiServe.Dto.WMSEntity;
+using WcsMain.ApiServe.Dto.WMSEntity.WmsTask;
 using WcsMain.ApiServe.Service.WmsService;
 
 namespace WcsMain.ApiServe.Controllers.WmsController;

WcsMain/ApiServe/Dto/AGV/AGVNoVeBuckMoveRequest.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.AGV;
+namespace WcsMain.ApiServe.Dto.AGV;
 
 public class AGVNoVeBuckMoveRequest
 {
@@ -38,7 +38,7 @@ public class AGVNoVeBuckMoveRequest
     /// 目标点简码
     /// </summary>
     [JsonPropertyName("endPointName")]
-    public string? EndPointName { get; set;}
+    public string? EndPointName { get; set; }
 
     /// <summary>
     /// 货架作业面

WcsMain/ApiServe/Dto/AGV/AGVRequestBodyLayout.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.AGV;
+namespace WcsMain.ApiServe.Dto.AGV;
 
 /// <summary>
 /// AGV 回告任务状态的模板

WcsMain/ApiServe/Dto/AGV/AGVRequestLayout.cs

@@ -1,7 +1,6 @@
-using Newtonsoft.Json;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.AGV;
+namespace WcsMain.ApiServe.Dto.AGV;
 
 /// <summary>
 /// 接收AGV请求的实体

WcsMain/ApiServe/Dto/Container/CreateInstoreTaskRequest.cs

@@ -1,7 +1,6 @@
-using Newtonsoft.Json;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.Container;
+namespace WcsMain.ApiServe.Dto.Container;
 
 /// <summary>
 /// 四向车请求入库任务的请求类
@@ -12,7 +11,7 @@ public class CreateInstoreTaskRequest
     /// 请求ID
     /// </summary>
     [JsonPropertyName("requestId")]
-    public string? RequestId {  get; set; }
+    public string? RequestId { get; set; }
 
     /// <summary>
     /// 密钥

WcsMain/ApiServe/Dto/Container/CreateInstoreTaskResoponse.cs

@@ -1,7 +1,6 @@
-using Newtonsoft.Json;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.Container;
+namespace WcsMain.ApiServe.Dto.Container;
 
 /// <summary>
 /// 四向车请求任务的返回类
@@ -12,7 +11,7 @@ public class CreateInstoreTaskResoponse
     /// 响应码
     /// </summary>
     [JsonPropertyName("code")]
-    public string? Code {  get; set; }
+    public string? Code { get; set; }
 
     /// <summary>
     /// 任务号
@@ -36,7 +35,7 @@ public class CreateInstoreTaskResoponse
     /// 终点位置
     /// </summary>
     [JsonPropertyName("tocellno")]
-    public string? ToCellNo { get;set; }
+    public string? ToCellNo { get; set; }
 
     /// <summary>
     /// 响应信息

WcsMain/ApiServe/Dto/Container/TaskStateNoticeRequest.cs

@@ -1,7 +1,6 @@
-using Newtonsoft.Json;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.Container;
+namespace WcsMain.ApiServe.Dto.Container;
 
 /// <summary>
 /// 四向车任务回告请求类

WcsMain/ApiServe/Dto/Container/TaskStateNoticeResponse.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.Container;
+namespace WcsMain.ApiServe.Dto.Container;
 
 /// <summary>
 /// 四向车反馈任务状态的响应类

WcsMain/ApiServe/Dto/Equipment/ConveyStatusResponse.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.Equipment;
+namespace WcsMain.ApiServe.Dto.Equipment;
 
 /// <summary>
 /// 输送设备信息 ---- 卡特专用

WcsMain/ApiServe/Dto/Equipment/PickStandInfoResponse.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.Equipment;
+namespace WcsMain.ApiServe.Dto.Equipment;
 
 /// <summary>
 /// 拣选站台信息

WcsMain/ApiServe/Dto/Equipment/StackerStatusResponse.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.Equipment;
+namespace WcsMain.ApiServe.Dto.Equipment;
 
 /// <summary>
 /// 堆垛机状态返回实体类

WcsMain/ApiServe/Dto/WMSEntity/Convey/DisposeVehicleRequest.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WMSEntity.Convey;
+namespace WcsMain.ApiServe.Dto.WMSEntity.Convey;
 
 public class DisposeVehicleRequest
 {
@@ -8,6 +8,6 @@ public class DisposeVehicleRequest
     /// 点位
     /// </summary>
     [JsonPropertyName("location")]
-    public string? Location { get; set;}
+    public string? Location { get; set; }
 
 }

WcsMain/ApiServe/Dto/WMSEntity/Convey/GetConveyTaskRequest.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WMSEntity.Convey;
+namespace WcsMain.ApiServe.Dto.WMSEntity.Convey;
 
 public class GetConveyTaskRequest
 {

WcsMain/ApiServe/Dto/WMSEntity/ElTag/GetElTagTaskRequest.cs

@@ -1,7 +1,7 @@
 using DataCheck;
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WMSEntity.ElTag;
+namespace WcsMain.ApiServe.Dto.WMSEntity.ElTag;
 
 public class GetElTagTaskRequest
 {

WcsMain/ApiServe/Dto/WMSEntity/Equipment/QueryStandStatusRequest.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WMSEntity.Equipment
+namespace WcsMain.ApiServe.Dto.WMSEntity.Equipment
 {
     public class QueryStandStatusRequest
     {

WcsMain/ApiServe/Dto/WMSEntity/Equipment/QueryStandStatusResponse.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WMSEntity.Equipment
+namespace WcsMain.ApiServe.Dto.WMSEntity.Equipment
 {
     public class QueryStandStatusResponse
     {

WcsMain/ApiServe/Dto/WMSEntity/WmsApiResponse.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WMSEntity;
+namespace WcsMain.ApiServe.Dto.WMSEntity;
 
 /// <summary>
 /// WMS的固定返回类

WcsMain/ApiServe/Dto/WMSEntity/WmsTask/DisposeStandRequest.cs

@@ -1,7 +1,7 @@
 using DataCheck;
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WMSEntity.WmsTask;
+namespace WcsMain.ApiServe.Dto.WMSEntity.WmsTask;
 
 /// <summary>
 /// wms 推送站台拣选完成

WcsMain/ApiServe/Dto/WMSEntity/WmsTask/GetStackerRequest.cs

@@ -1,7 +1,7 @@
 using DataCheck;
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WMSEntity.WmsTask;
+namespace WcsMain.ApiServe.Dto.WMSEntity.WmsTask;
 
 /// <summary>
 /// SetStackerTask 接口的请求类

WcsMain/ApiServe/Dto/WMSEntity/WmsTask/SetPickTaskRequest.cs

@@ -1,7 +1,7 @@
 using DataCheck;
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WMSEntity.WmsTask;
+namespace WcsMain.ApiServe.Dto.WMSEntity.WmsTask;
 
 /// <summary>
 /// SetPickTask 接口的请求实体类

WcsMain/ApiServe/Dto/WMSEntity/WmsTask/UpdateStackerTaskStatusRequest.cs

@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
 using DataCheck;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WMSEntity.WmsTask;
+namespace WcsMain.ApiServe.Dto.WMSEntity.WmsTask;
 
 /// <summary>
 /// UpdateStackerTaskStatus 接口的请求类

WcsMain/ApiServe/Dto/WcsApiResponse.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto;
+namespace WcsMain.ApiServe.Dto;
 
 /// <summary>
 /// Api统一回复类

WcsMain/ApiServe/Dto/WcsDto/ApiAccept/GetApiAcceptWithPageRequest.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.ApiAccept;
+namespace WcsMain.ApiServe.Dto.WcsDto.ApiAccept;
 
 public class GetApiAcceptWithPageRequest
 {

WcsMain/ApiServe/Dto/WcsDto/ApiRequest/GetApiRequestWithPageRequest.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.ApiRequest;
+namespace WcsMain.ApiServe.Dto.WcsDto.ApiRequest;
 
 public class GetApiRequestWithPageRequest
 {

WcsMain/ApiServe/Dto/WcsDto/Config/EditeConfigRequest.cs

@@ -1,7 +1,7 @@
 using DataCheck;
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.Config;
+namespace WcsMain.ApiServe.Dto.WcsDto.Config;
 
 public class EditeConfigRequest
 {

WcsMain/ApiServe/Dto/WcsDto/Config/GetConfigWithPageRequest.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.Config;
+namespace WcsMain.ApiServe.Dto.WcsDto.Config;
 
 
 /// <summary>
@@ -12,7 +12,7 @@ public class GetConfigWithPageRequest
     /// 查询字符串
     /// </summary>
     [JsonPropertyName("searchStr")]
-    public string? SearchString {  get; set; }
+    public string? SearchString { get; set; }
 
     /// <summary>
     /// 页面大小

WcsMain/ApiServe/Dto/WcsDto/Convey/QueryConveyTaskWithPageRequest.cs

@@ -1,7 +1,6 @@
 using System.Text.Json.Serialization;
-using WcsMain.ApiServe.Controllers.Dto.WcsDto.ElTag;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.Convey;
+namespace WcsMain.ApiServe.Dto.WcsDto.Convey;
 
 public class QueryConveyTaskWithPageRequest
 {

WcsMain/ApiServe/Dto/WcsDto/CusPickTask/UpdatePickTaskRequest.cs

@@ -1,7 +1,7 @@
 using DataCheck;
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.CusPickTask;
+namespace WcsMain.ApiServe.Dto.WcsDto.CusPickTask;
 
 public class UpdatePickTaskRequest
 {

WcsMain/ApiServe/Dto/WcsDto/DB/EditeDBRequest.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.DB;
+namespace WcsMain.ApiServe.Dto.WcsDto.DB;
 
 public class EditeDBRequest
 {

WcsMain/ApiServe/Dto/WcsDto/DB/GetDBWithPlcNameRequest.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.DB;
+namespace WcsMain.ApiServe.Dto.WcsDto.DB;
 
 
 /// <summary>

WcsMain/ApiServe/Dto/WcsDto/DB/GetDBWithPlcNameResponse.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.DB;
+namespace WcsMain.ApiServe.Dto.WcsDto.DB;
 
 /// <summary>
 /// 返回PLCDB块同时返回 PLC名称的响应实体
@@ -17,7 +17,7 @@ public class GetDBWithPlcNameResponse
     /// plc 名称
     /// </summary>
     [JsonPropertyName("plcName")]
-    public string? PlcName { get; set;}
+    public string? PlcName { get; set; }
 
     /// <summary>
     /// db的名称
@@ -35,7 +35,7 @@ public class GetDBWithPlcNameResponse
     /// 是否系统级别
     /// </summary>
     [JsonPropertyName("isSystem")]
-    public int? IsSystem { get; set;}
+    public int? IsSystem { get; set; }
 
     /// <summary>
     /// 备注

WcsMain/ApiServe/Dto/WcsDto/ElTag/AddTaskInfoRequest.cs

@@ -1,7 +1,7 @@
 using DataCheck;
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.ElTag;
+namespace WcsMain.ApiServe.Dto.WcsDto.ElTag;
 
 public class AddTaskInfoRequest
 {

WcsMain/ApiServe/Dto/WcsDto/ElTag/EditTaskInfoRequest.cs

@@ -1,8 +1,7 @@
 using DataCheck;
-using SqlSugar;
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.ElTag;
+namespace WcsMain.ApiServe.Dto.WcsDto.ElTag;
 
 public class EditTaskInfoRequest
 {

WcsMain/ApiServe/Dto/WcsDto/ElTag/GetStackerTaskNewDestinationRequest.cs

@@ -1,7 +1,7 @@
 using DataCheck;
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.ElTag;
+namespace WcsMain.ApiServe.Dto.WcsDto.ElTag;
 
 public class GetStackerTaskNewDestinationRequest
 {
@@ -18,7 +18,7 @@ public class GetStackerTaskNewDestinationRequest
     /// </summary>
     [DataRules]
     [JsonPropertyName("destination")]
-    public string? Destination {  get; set; }
+    public string? Destination { get; set; }
 
     /// <summary>
     /// 载具号

WcsMain/ApiServe/Dto/WcsDto/ElTag/QueryLocationWithPageRequest.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.ElTag;
+namespace WcsMain.ApiServe.Dto.WcsDto.ElTag;
 
 public class QueryLocationWithPageRequest
 {

WcsMain/ApiServe/Dto/WcsDto/ElTag/QueryTaskRequest.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.ElTag;
+namespace WcsMain.ApiServe.Dto.WcsDto.ElTag;
 
 public class QueryTaskRequest
 {

WcsMain/ApiServe/Dto/WcsDto/ElTag/ShowNumRequest.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.ElTag;
+namespace WcsMain.ApiServe.Dto.WcsDto.ElTag;
 
 public class ShowNumRequest
 {

WcsMain/ApiServe/Dto/WcsDto/Equipment/ResetStackerRequest.cs

@@ -1,7 +1,7 @@
 using DataCheck;
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.Equipment;
+namespace WcsMain.ApiServe.Dto.WcsDto.Equipment;
 
 public class ResetStackerRequest
 {

WcsMain/ApiServe/Dto/WcsDto/Equipment/StackerContinueRequest.cs

@@ -1,7 +1,7 @@
 using DataCheck;
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.Equipment;
+namespace WcsMain.ApiServe.Dto.WcsDto.Equipment;
 
 public class StackerContinueRequest
 {

WcsMain/ApiServe/Dto/WcsDto/Location/GetLocationWithPageRequest.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.Location;
+namespace WcsMain.ApiServe.Dto.WcsDto.Location;
 
 /// <summary>
 /// GetLocationWithPage 接口请求类

WcsMain/ApiServe/Dto/WcsDto/Location/UpdateLocationRequest.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.Location;
+namespace WcsMain.ApiServe.Dto.WcsDto.Location;
 
 public class UpdateLocationRequest
 {

WcsMain/ApiServe/Dto/WcsDto/Menu/AddMenuRequest.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.Menu;
+namespace WcsMain.ApiServe.Dto.WcsDto.Menu;
 
 public class AddMenuRequest
 {

WcsMain/ApiServe/Dto/WcsDto/Menu/GetMenuWithPageRequest.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.Menu;
+namespace WcsMain.ApiServe.Dto.WcsDto.Menu;
 
 public class GetMenuWithPageRequest
 {

WcsMain/ApiServe/Dto/WcsDto/Menu/UpdateMenuRequest.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.Menu;
+namespace WcsMain.ApiServe.Dto.WcsDto.Menu;
 
 public class UpdateMenuRequest
 {