diff --git a/Tools/CirculateTool/Attribute/CirculationTimeAttribute.cs b/Tools/CirculateTool/Attribute/CirculationTimeAttribute.cs index 3acf175..5ddc731 100644 --- a/Tools/CirculateTool/Attribute/CirculationTimeAttribute.cs +++ b/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; /// /// 在指定时间执行的任务 diff --git a/Tools/CirculateTool/Entity/TimeTask.cs b/Tools/CirculateTool/Entity/TimeTask.cs index 9e7818a..5095bc7 100644 --- a/Tools/CirculateTool/Entity/TimeTask.cs +++ b/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; /// /// 按时执行的任务的定时类 diff --git a/Tools/LedSimple/LEDColor.cs b/Tools/LedSimple/LEDColor.cs index 1d94a8c..5ca49e2 100644 --- a/Tools/LedSimple/LEDColor.cs +++ b/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 { diff --git a/Tools/PlcTool/Siemens/Entity/SemS7Result.cs b/Tools/PlcTool/Siemens/Entity/SemS7Result.cs index 65cd207..879eac1 100644 --- a/Tools/PlcTool/Siemens/Entity/SemS7Result.cs +++ b/Tools/PlcTool/Siemens/Entity/SemS7Result.cs @@ -1,5 +1,4 @@ using Newtonsoft.Json; -using System.Text; namespace PlcTool.Siemens.Entity; diff --git a/WcsMain/Plugins/AGVWebApiPost.cs b/WcsMain/ApiClient/AGV/AGVBaseWebApi.cs similarity index 56% rename from WcsMain/Plugins/AGVWebApiPost.cs rename to WcsMain/ApiClient/AGV/AGVBaseWebApi.cs index 935774a..47ae21a 100644 --- a/WcsMain/Plugins/AGVWebApiPost.cs +++ b/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; /// /// AGV 接口工具 /// [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") ?? ""); diff --git a/WcsMain/Business/AGV/AGVAction.cs b/WcsMain/ApiClient/AGV/AGVWebApiAction.cs similarity index 95% rename from WcsMain/Business/AGV/AGVAction.cs rename to WcsMain/ApiClient/AGV/AGVWebApiAction.cs index 7622c31..5d72e48 100644 --- a/WcsMain/Business/AGV/AGVAction.cs +++ b/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; /// /// AGV 动作 /// [Component] -public class AGVAction(AGVWebApiPost webApiPost) +public class AGVWebApiAction(AGVBaseWebApi webApiPost) { /// @@ -61,7 +60,7 @@ public class AGVAction(AGVWebApiPost webApiPost) { return "请求失败，网络故障"; } - + if (responseData.Body!.Success == true && responseData.Body!.Code?.ToLower() == "success") { // 发送成功 diff --git a/WcsMain/ApiClient/DataEntity/AGVEntity/AGVBucketMove.cs b/WcsMain/ApiClient/AGV/Dto/AGVBucketMove.cs similarity index 92% rename from WcsMain/ApiClient/DataEntity/AGVEntity/AGVBucketMove.cs rename to WcsMain/ApiClient/AGV/Dto/AGVBucketMove.cs index bfe7d0a..98a81eb 100644 --- a/WcsMain/ApiClient/DataEntity/AGVEntity/AGVBucketMove.cs +++ b/WcsMain/ApiClient/AGV/Dto/AGVBucketMove.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace WcsMain.ApiClient.DataEntity.AGVEntity; +namespace WcsMain.ApiClient.AGV.Dto; /// /// AGV 点对点货架搬运 @@ -65,13 +65,13 @@ public class AGVBucketMove /// 实操反馈后是否需要返库 /// [JsonProperty("needReset")] - public bool? NeedReset { get; set; } + public bool? NeedReset { get; set; } /// /// 是否需要货架出厂 /// [JsonProperty("needOut")] - public int? NeedOut { get; set; } + public int? NeedOut { get; set; } /// /// 是否AGV接力模式 diff --git a/WcsMain/ApiClient/DataEntity/AGVEntity/AGVRequestLayout.cs b/WcsMain/ApiClient/AGV/Dto/AGVRequestLayout.cs similarity index 92% rename from WcsMain/ApiClient/DataEntity/AGVEntity/AGVRequestLayout.cs rename to WcsMain/ApiClient/AGV/Dto/AGVRequestLayout.cs index d73ee3c..d166067 100644 --- a/WcsMain/ApiClient/DataEntity/AGVEntity/AGVRequestLayout.cs +++ b/WcsMain/ApiClient/AGV/Dto/AGVRequestLayout.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace WcsMain.ApiClient.DataEntity.AGVEntity; +namespace WcsMain.ApiClient.AGV.Dto; /// /// AGV 接口请求数据格式 @@ -32,7 +32,7 @@ public class AGVRequestHeader /// 快仓唯一标识 /// [JsonProperty("appKey")] - public string? AppKey { get; set; } + public string? AppKey { get; set; } /// /// 应用密钥 diff --git a/WcsMain/ApiClient/DataEntity/AGVEntity/AGVResponseLayout.cs b/WcsMain/ApiClient/AGV/Dto/AGVResponseLayout.cs similarity index 95% rename from WcsMain/ApiClient/DataEntity/AGVEntity/AGVResponseLayout.cs rename to WcsMain/ApiClient/AGV/Dto/AGVResponseLayout.cs index 0d4d673..262a43b 100644 --- a/WcsMain/ApiClient/DataEntity/AGVEntity/AGVResponseLayout.cs +++ b/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; /// /// AGV 接口响应数据模板类 @@ -89,7 +89,7 @@ public class AGVResponseBody where T : class, new() /// 响应数据 /// [JsonProperty("data")] - [JsonPropertyName ("data")] + [JsonPropertyName("data")] public T? Data { get; set; } diff --git a/WcsMain/ApiClient/DataEntity/AGVEntity/AGVTaskRequest.cs b/WcsMain/ApiClient/AGV/Dto/AGVTaskRequest.cs similarity index 94% rename from WcsMain/ApiClient/DataEntity/AGVEntity/AGVTaskRequest.cs rename to WcsMain/ApiClient/AGV/Dto/AGVTaskRequest.cs index 1db12be..986364d 100644 --- a/WcsMain/ApiClient/DataEntity/AGVEntity/AGVTaskRequest.cs +++ b/WcsMain/ApiClient/AGV/Dto/AGVTaskRequest.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace WcsMain.ApiClient.DataEntity.AGVEntity; +namespace WcsMain.ApiClient.AGV.Dto; /// /// 向 AGV 发送任务模板数据 @@ -29,7 +29,7 @@ public class AGVTaskRequest where T : class, new() /// 任务组序号 /// [JsonProperty("sequence")] - public int? Sequence { get; set; } + public int? Sequence { get; set; } /// /// 任务组数量 @@ -65,7 +65,7 @@ public class AGVTaskRequest where T : class, new() /// AGV 放下对象后移动的地点 /// [JsonProperty("agvEndPoint")] - public string? AGVEndPoint { get; set; } + public string? AGVEndPoint { get; set; } /// /// 是否需要实操 diff --git a/WcsMain/ApiClient/DataEntity/AGVEntity/AGVTaskResponse.cs b/WcsMain/ApiClient/AGV/Dto/AGVTaskResponse.cs similarity index 91% rename from WcsMain/ApiClient/DataEntity/AGVEntity/AGVTaskResponse.cs rename to WcsMain/ApiClient/AGV/Dto/AGVTaskResponse.cs index 4955f57..4d7789c 100644 --- a/WcsMain/ApiClient/DataEntity/AGVEntity/AGVTaskResponse.cs +++ b/WcsMain/ApiClient/AGV/Dto/AGVTaskResponse.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace WcsMain.ApiClient.DataEntity.AGVEntity; +namespace WcsMain.ApiClient.AGV.Dto; /// /// 给AGV发送任务的返回类 diff --git a/WcsMain/Business/CommonAction/ApiResponseAction.cs b/WcsMain/ApiClient/General/ApiResponseAction.cs similarity index 92% rename from WcsMain/Business/CommonAction/ApiResponseAction.cs rename to WcsMain/ApiClient/General/ApiResponseAction.cs index 96e8ee4..a5c09c2 100644 --- a/WcsMain/Business/CommonAction/ApiResponseAction.cs +++ b/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; /// /// 接口响应触发事件 diff --git a/WcsMain/ApiClient/DataEntity/ContainerEntity/ContainerTaskResponse.cs b/WcsMain/ApiClient/Shuttle/Dto/ContainerTaskResponse.cs similarity index 86% rename from WcsMain/ApiClient/DataEntity/ContainerEntity/ContainerTaskResponse.cs rename to WcsMain/ApiClient/Shuttle/Dto/ContainerTaskResponse.cs index 2dcd439..1318222 100644 --- a/WcsMain/ApiClient/DataEntity/ContainerEntity/ContainerTaskResponse.cs +++ b/WcsMain/ApiClient/Shuttle/Dto/ContainerTaskResponse.cs @@ -1,4 +1,4 @@ -namespace WcsMain.ApiClient.DataEntity.ContainerEntity; +namespace WcsMain.ApiClient.Shuttle.Dto; /// /// 四向车库的响应 diff --git a/WcsMain/ApiClient/DataEntity/ContainerEntity/ContainerTaskResqust.cs b/WcsMain/ApiClient/Shuttle/Dto/ContainerTaskResqust.cs similarity index 84% rename from WcsMain/ApiClient/DataEntity/ContainerEntity/ContainerTaskResqust.cs rename to WcsMain/ApiClient/Shuttle/Dto/ContainerTaskResqust.cs index 2c41a25..9e6515a 100644 --- a/WcsMain/ApiClient/DataEntity/ContainerEntity/ContainerTaskResqust.cs +++ b/WcsMain/ApiClient/Shuttle/Dto/ContainerTaskResqust.cs @@ -1,4 +1,4 @@ -namespace WcsMain.ApiClient.DataEntity.ContainerEntity; +namespace WcsMain.ApiClient.Shuttle.Dto; /// /// 四向车库出库移库请求 @@ -8,7 +8,7 @@ public class ContainerTaskResqust /// /// 请求ID /// - public string? RequestId { get; set; } + public string? RequestId { get; set; } /// /// 密钥 @@ -33,7 +33,7 @@ public class ContainerTaskResqust /// /// 目标位置 /// - public string? ToCell { get; set; } + public string? ToCell { get; set; } /// /// 任务类型 diff --git a/WcsMain/Plugins/ContainerWebApiPost.cs b/WcsMain/ApiClient/Shuttle/ShuttleBaseWebApi.cs similarity index 56% rename from WcsMain/Plugins/ContainerWebApiPost.cs rename to WcsMain/ApiClient/Shuttle/ShuttleBaseWebApi.cs index bb8c639..f6fb2a9 100644 --- a/WcsMain/Plugins/ContainerWebApiPost.cs +++ b/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; /// /// 四向车库接口请求 /// [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") ?? ""); diff --git a/WcsMain/Business/Container/ContainerAction.cs b/WcsMain/ApiClient/Shuttle/ShuttleWebApiAction.cs similarity index 87% rename from WcsMain/Business/Container/ContainerAction.cs rename to WcsMain/ApiClient/Shuttle/ShuttleWebApiAction.cs index 0292e86..4b31e72 100644 --- a/WcsMain/Business/Container/ContainerAction.cs +++ b/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; /// /// 四向车库 /// [Component] -public class ContainerAction(ContainerWebApiPost webApiPost) +public class ShuttleWebApiAction(ShuttleBaseWebApi webApiPost) { /// /// 四向车库执行移库任务 @@ -32,11 +31,11 @@ public class ContainerAction(ContainerWebApiPost webApiPost) }; var response = webApiPost.HttpPost(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; } diff --git a/WcsMain/ApiClient/DataEntity/WmsEntity/ApplyInRequest.cs b/WcsMain/ApiClient/WMS/Dto/ApplyInRequest.cs similarity index 85% rename from WcsMain/ApiClient/DataEntity/WmsEntity/ApplyInRequest.cs rename to WcsMain/ApiClient/WMS/Dto/ApplyInRequest.cs index 189b4df..bd4f0c8 100644 --- a/WcsMain/ApiClient/DataEntity/WmsEntity/ApplyInRequest.cs +++ b/WcsMain/ApiClient/WMS/Dto/ApplyInRequest.cs @@ -1,15 +1,14 @@ using Newtonsoft.Json; -using System.Text.Json.Serialization; -namespace WcsMain.ApiClient.DataEntity.WmsEntity; +namespace WcsMain.ApiClient.WMS.Dto; /// /// 申请入库 /// public class ApplyInRequest { - public ApplyInRequest(string? point, string? vehicleNo, string? codeMessage = "", string? remark = "") - { + public ApplyInRequest(string? point, string? vehicleNo, string? codeMessage = "", string? remark = "") + { Point = point; VehicleNo = vehicleNo; CodeMessage = codeMessage; diff --git a/WcsMain/ApiClient/DataEntity/WmsEntity/ConveyButtonClickRequest.cs b/WcsMain/ApiClient/WMS/Dto/ConveyButtonClickRequest.cs similarity index 91% rename from WcsMain/ApiClient/DataEntity/WmsEntity/ConveyButtonClickRequest.cs rename to WcsMain/ApiClient/WMS/Dto/ConveyButtonClickRequest.cs index 3ac5091..4b7def3 100644 --- a/WcsMain/ApiClient/DataEntity/WmsEntity/ConveyButtonClickRequest.cs +++ b/WcsMain/ApiClient/WMS/Dto/ConveyButtonClickRequest.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace WcsMain.ApiClient.DataEntity.WmsEntity; +namespace WcsMain.ApiClient.WMS.Dto; /// diff --git a/WcsMain/ApiClient/DataEntity/WmsEntity/ElTagComfirmButtonClickRequest.cs b/WcsMain/ApiClient/WMS/Dto/ElTagComfirmButtonClickRequest.cs similarity index 96% rename from WcsMain/ApiClient/DataEntity/WmsEntity/ElTagComfirmButtonClickRequest.cs rename to WcsMain/ApiClient/WMS/Dto/ElTagComfirmButtonClickRequest.cs index dcdf959..54e2f89 100644 --- a/WcsMain/ApiClient/DataEntity/WmsEntity/ElTagComfirmButtonClickRequest.cs +++ b/WcsMain/ApiClient/WMS/Dto/ElTagComfirmButtonClickRequest.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace WcsMain.ApiClient.DataEntity.WmsEntity; +namespace WcsMain.ApiClient.WMS.Dto; /// /// 电子标签确认按钮按下请求数据 diff --git a/WcsMain/ApiClient/DataEntity/WmsEntity/RequestBackRequest.cs b/WcsMain/ApiClient/WMS/Dto/RequestBackRequest.cs similarity index 84% rename from WcsMain/ApiClient/DataEntity/WmsEntity/RequestBackRequest.cs rename to WcsMain/ApiClient/WMS/Dto/RequestBackRequest.cs index a83b5e7..4160e09 100644 --- a/WcsMain/ApiClient/DataEntity/WmsEntity/RequestBackRequest.cs +++ b/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 { diff --git a/WcsMain/ApiClient/DataEntity/WmsEntity/SendWmsTaskStatusRequest.cs b/WcsMain/ApiClient/WMS/Dto/SendWmsTaskStatusRequest.cs similarity index 89% rename from WcsMain/ApiClient/DataEntity/WmsEntity/SendWmsTaskStatusRequest.cs rename to WcsMain/ApiClient/WMS/Dto/SendWmsTaskStatusRequest.cs index b2b2080..21c69d4 100644 --- a/WcsMain/ApiClient/DataEntity/WmsEntity/SendWmsTaskStatusRequest.cs +++ b/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; /// /// 发送WMS任务状态请求实体 diff --git a/WcsMain/ApiClient/DataEntity/WmsEntity/UploadPickStandRequest.cs b/WcsMain/ApiClient/WMS/Dto/UploadPickStandRequest.cs similarity index 88% rename from WcsMain/ApiClient/DataEntity/WmsEntity/UploadPickStandRequest.cs rename to WcsMain/ApiClient/WMS/Dto/UploadPickStandRequest.cs index 5c5562b..de5a31a 100644 --- a/WcsMain/ApiClient/DataEntity/WmsEntity/UploadPickStandRequest.cs +++ b/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; /// /// 上传箱子到达拣选口的请求类 diff --git a/WcsMain/ApiClient/DataEntity/WmsEntity/UploadStackerStatusRequest.cs b/WcsMain/ApiClient/WMS/Dto/UploadStackerStatusRequest.cs similarity index 86% rename from WcsMain/ApiClient/DataEntity/WmsEntity/UploadStackerStatusRequest.cs rename to WcsMain/ApiClient/WMS/Dto/UploadStackerStatusRequest.cs index 101ad66..54cb344 100644 --- a/WcsMain/ApiClient/DataEntity/WmsEntity/UploadStackerStatusRequest.cs +++ b/WcsMain/ApiClient/WMS/Dto/UploadStackerStatusRequest.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace WcsMain.ApiClient.DataEntity.WmsEntity; +namespace WcsMain.ApiClient.WMS.Dto; /// /// 上传堆垛机是否报错的请求实体 @@ -11,7 +11,7 @@ public class UploadStackerStatusRequest /// 设备号 /// [JsonProperty("equipment")] - public int? Equipment { get; set; } + public int? Equipment { get; set; } /// /// 是否报错 --- 0：不报错；1：不可用 diff --git a/WcsMain/ApiClient/DataEntity/WmsEntity/WmsResponse.cs b/WcsMain/ApiClient/WMS/Dto/WmsResponse.cs similarity index 76% rename from WcsMain/ApiClient/DataEntity/WmsEntity/WmsResponse.cs rename to WcsMain/ApiClient/WMS/Dto/WmsResponse.cs index 464c132..b6c6f9e 100644 --- a/WcsMain/ApiClient/DataEntity/WmsEntity/WmsResponse.cs +++ b/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 { diff --git a/WcsMain/Business/CommonAction/SendWmsTaskStatus.cs b/WcsMain/ApiClient/WMS/SendWmsTaskStatus.cs similarity index 96% rename from WcsMain/Business/CommonAction/SendWmsTaskStatus.cs rename to WcsMain/ApiClient/WMS/SendWmsTaskStatus.cs index 4cbbac9..6b5349f 100644 --- a/WcsMain/Business/CommonAction/SendWmsTaskStatus.cs +++ b/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; /// /// 用于发送WMS任务状态的类 /// [Component] -public class SendWmsTaskStatus(AppWmsTaskDao wmsTaskDao, WmsWebApiPost wmsWebApiPost) +public class SendWmsTaskStatus(AppWmsTaskDao wmsTaskDao, WmsBaseWebApi wmsWebApiPost) { /// @@ -24,7 +23,8 @@ public class SendWmsTaskStatus(AppWmsTaskDao wmsTaskDao, WmsWebApiPost wmsWebApi /// 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 /// 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 /// 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 /// 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 /// 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 /// public void SendTaskLeaveStart(AppWmsTask wmsTask, int count = 5) { - Task.Factory.StartNew(() => { + Task.Factory.StartNew(() => + { if (wmsTask == default) { return; } SendWmsTaskStatusRequest request = new() { diff --git a/WcsMain/Plugins/WmsWebApiPost.cs b/WcsMain/ApiClient/WMS/WmsBaseWebApi.cs similarity index 51% rename from WcsMain/Plugins/WmsWebApiPost.cs rename to WcsMain/ApiClient/WMS/WmsBaseWebApi.cs index 41a2ac2..695c6b5 100644 --- a/WcsMain/Plugins/WmsWebApiPost.cs +++ b/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; /// /// Wms 的API工具 /// [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") ?? ""); diff --git a/WcsMain/ApiServe/ControllerFilter/ResponseFilterAttribute.cs b/WcsMain/ApiServe/ControllerFilter/ResponseFilterAttribute.cs index d9819c8..69f179b 100644 --- a/WcsMain/ApiServe/ControllerFilter/ResponseFilterAttribute.cs +++ b/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; diff --git a/WcsMain/ApiServe/ControllerFilter/WcsAuthorizationAttribute.cs b/WcsMain/ApiServe/ControllerFilter/WcsAuthorizationAttribute.cs index a048b54..46b845b 100644 --- a/WcsMain/ApiServe/ControllerFilter/WcsAuthorizationAttribute.cs +++ b/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; diff --git a/WcsMain/ApiServe/ControllerFilter/WmsApiExceptionFilterAttribute.cs b/WcsMain/ApiServe/ControllerFilter/WmsApiExceptionFilterAttribute.cs index 38fafbc..f3b3461 100644 --- a/WcsMain/ApiServe/ControllerFilter/WmsApiExceptionFilterAttribute.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/AGVController/AGVController.cs b/WcsMain/ApiServe/Controllers/AGVController/AGVController.cs index c853d60..5a4b962 100644 --- a/WcsMain/ApiServe/Controllers/AGVController/AGVController.cs +++ b/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 /// /// [HttpPost("taskCallBack")] - public AGVResponseLayout> TaskCallBack(Dto.AGV.AGVRequestLayout> request) => agvService.TaskCallBack(request); + public AGVResponseLayout> TaskCallBack(ApiServe.Dto.AGV.AGVRequestLayout> request) => agvService.TaskCallBack(request); diff --git a/WcsMain/ApiServe/Controllers/ContainerController/ContainerController.cs b/WcsMain/ApiServe/Controllers/ContainerController/ContainerController.cs index cf46017..a529193 100644 --- a/WcsMain/ApiServe/Controllers/ContainerController/ContainerController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/ThreeDController/TaskController.cs b/WcsMain/ApiServe/Controllers/ThreeDController/TaskController.cs index 54f8d44..b0d2087 100644 --- a/WcsMain/ApiServe/Controllers/ThreeDController/TaskController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/WcsController/ApiAcceptController.cs b/WcsMain/ApiServe/Controllers/WcsController/ApiAcceptController.cs index 8afc5b5..b51b128 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/ApiAcceptController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/WcsController/ApiRequestController.cs b/WcsMain/ApiServe/Controllers/WcsController/ApiRequestController.cs index cf6de94..0618763 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/ApiRequestController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/WcsController/ConfigController.cs b/WcsMain/ApiServe/Controllers/WcsController/ConfigController.cs index 1825614..8d5cbdb 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/ConfigController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/WcsController/ConveyTaskController.cs b/WcsMain/ApiServe/Controllers/WcsController/ConveyTaskController.cs index 87a99bf..3b077a2 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/ConveyTaskController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/WcsController/ElTagController.cs b/WcsMain/ApiServe/Controllers/WcsController/ElTagController.cs index d0c71ac..1ca48c9 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/ElTagController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/WcsController/EquipmentController.cs b/WcsMain/ApiServe/Controllers/WcsController/EquipmentController.cs index 8ef4d53..d60d671 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/EquipmentController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/WcsController/LocationController.cs b/WcsMain/ApiServe/Controllers/WcsController/LocationController.cs index 8bfb71a..e052bab 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/LocationController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/WcsController/MenuController.cs b/WcsMain/ApiServe/Controllers/WcsController/MenuController.cs index 288dc40..d8828d5 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/MenuController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/WcsController/PlcController.cs b/WcsMain/ApiServe/Controllers/WcsController/PlcController.cs index e549927..b67081f 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/PlcController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/WcsController/PlcDbController.cs b/WcsMain/ApiServe/Controllers/WcsController/PlcDbController.cs index e5b1128..d98b7b9 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/PlcDbController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/WcsController/RunningInfoController.cs b/WcsMain/ApiServe/Controllers/WcsController/RunningInfoController.cs index 408edb2..8373e58 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/RunningInfoController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/WcsController/ScanController.cs b/WcsMain/ApiServe/Controllers/WcsController/ScanController.cs index b36ee6e..861c7b9 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/ScanController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/WcsController/SettingController.cs b/WcsMain/ApiServe/Controllers/WcsController/SettingController.cs index e3b176f..191993d 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/SettingController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/WcsController/SocketController.cs b/WcsMain/ApiServe/Controllers/WcsController/SocketController.cs index d37c6e8..8f8350f 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/SocketController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/WcsController/StackerController.cs b/WcsMain/ApiServe/Controllers/WcsController/StackerController.cs index 6ef1bbc..209dadd 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/StackerController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/WcsController/StackerConveyController.cs b/WcsMain/ApiServe/Controllers/WcsController/StackerConveyController.cs index f701f56..62a59d8 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/StackerConveyController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/WcsController/UserController.cs b/WcsMain/ApiServe/Controllers/WcsController/UserController.cs index bb67cc7..7b6e572 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/UserController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/WcsController/UserGroupController.cs b/WcsMain/ApiServe/Controllers/WcsController/UserGroupController.cs index d60082c..98289b1 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/UserGroupController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/WcsController/UserRuleController.cs b/WcsMain/ApiServe/Controllers/WcsController/UserRuleController.cs index 8822f72..243d464 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/UserRuleController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/WcsController/WcsTaskController.cs b/WcsMain/ApiServe/Controllers/WcsController/WcsTaskController.cs index 14574a6..c61afed 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/WcsTaskController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/WcsController/WmsTaskController.cs b/WcsMain/ApiServe/Controllers/WcsController/WmsTaskController.cs index f6485f9..916a064 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/WmsTaskController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/WmsController/ConveyController.cs b/WcsMain/ApiServe/Controllers/WmsController/ConveyController.cs index 2129922..2a9708c 100644 --- a/WcsMain/ApiServe/Controllers/WmsController/ConveyController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/WmsController/ElTagController.cs b/WcsMain/ApiServe/Controllers/WmsController/ElTagController.cs index 716f65e..2492c7a 100644 --- a/WcsMain/ApiServe/Controllers/WmsController/ElTagController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/WmsController/EquipmentController.cs b/WcsMain/ApiServe/Controllers/WmsController/EquipmentController.cs index 15abce2..ca29129 100644 --- a/WcsMain/ApiServe/Controllers/WmsController/EquipmentController.cs +++ b/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 { diff --git a/WcsMain/ApiServe/Controllers/WmsController/WmsTaskController.cs b/WcsMain/ApiServe/Controllers/WmsController/WmsTaskController.cs index aee7a4f..3d53ef1 100644 --- a/WcsMain/ApiServe/Controllers/WmsController/WmsTaskController.cs +++ b/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; diff --git a/WcsMain/ApiServe/Controllers/Dto/AGV/AGVNoVeBuckMoveRequest.cs b/WcsMain/ApiServe/Dto/AGV/AGVNoVeBuckMoveRequest.cs similarity index 93% rename from WcsMain/ApiServe/Controllers/Dto/AGV/AGVNoVeBuckMoveRequest.cs rename to WcsMain/ApiServe/Dto/AGV/AGVNoVeBuckMoveRequest.cs index 267ffec..e14e941 100644 --- a/WcsMain/ApiServe/Controllers/Dto/AGV/AGVNoVeBuckMoveRequest.cs +++ b/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 /// 目标点简码 /// [JsonPropertyName("endPointName")] - public string? EndPointName { get; set;} + public string? EndPointName { get; set; } /// /// 货架作业面 diff --git a/WcsMain/ApiServe/Controllers/Dto/AGV/AGVRequestBodyLayout.cs b/WcsMain/ApiServe/Dto/AGV/AGVRequestBodyLayout.cs similarity index 95% rename from WcsMain/ApiServe/Controllers/Dto/AGV/AGVRequestBodyLayout.cs rename to WcsMain/ApiServe/Dto/AGV/AGVRequestBodyLayout.cs index eda1212..e0343be 100644 --- a/WcsMain/ApiServe/Controllers/Dto/AGV/AGVRequestBodyLayout.cs +++ b/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; /// /// AGV 回告任务状态的模板 diff --git a/WcsMain/ApiServe/Controllers/Dto/AGV/AGVRequestLayout.cs b/WcsMain/ApiServe/Dto/AGV/AGVRequestLayout.cs similarity index 90% rename from WcsMain/ApiServe/Controllers/Dto/AGV/AGVRequestLayout.cs rename to WcsMain/ApiServe/Dto/AGV/AGVRequestLayout.cs index ca0726b..b71b2bf 100644 --- a/WcsMain/ApiServe/Controllers/Dto/AGV/AGVRequestLayout.cs +++ b/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; /// /// 接收AGV请求的实体 diff --git a/WcsMain/ApiServe/Controllers/Dto/Container/CreateInstoreTaskRequest.cs b/WcsMain/ApiServe/Dto/Container/CreateInstoreTaskRequest.cs similarity index 78% rename from WcsMain/ApiServe/Controllers/Dto/Container/CreateInstoreTaskRequest.cs rename to WcsMain/ApiServe/Dto/Container/CreateInstoreTaskRequest.cs index 10292df..bdac887 100644 --- a/WcsMain/ApiServe/Controllers/Dto/Container/CreateInstoreTaskRequest.cs +++ b/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; /// /// 四向车请求入库任务的请求类 @@ -12,7 +11,7 @@ public class CreateInstoreTaskRequest /// 请求ID /// [JsonPropertyName("requestId")] - public string? RequestId { get; set; } + public string? RequestId { get; set; } /// /// 密钥 diff --git a/WcsMain/ApiServe/Controllers/Dto/Container/CreateInstoreTaskResoponse.cs b/WcsMain/ApiServe/Dto/Container/CreateInstoreTaskResoponse.cs similarity index 80% rename from WcsMain/ApiServe/Controllers/Dto/Container/CreateInstoreTaskResoponse.cs rename to WcsMain/ApiServe/Dto/Container/CreateInstoreTaskResoponse.cs index 19b954a..c960472 100644 --- a/WcsMain/ApiServe/Controllers/Dto/Container/CreateInstoreTaskResoponse.cs +++ b/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; /// /// 四向车请求任务的返回类 @@ -12,7 +11,7 @@ public class CreateInstoreTaskResoponse /// 响应码 /// [JsonPropertyName("code")] - public string? Code { get; set; } + public string? Code { get; set; } /// /// 任务号 @@ -36,7 +35,7 @@ public class CreateInstoreTaskResoponse /// 终点位置 /// [JsonPropertyName("tocellno")] - public string? ToCellNo { get;set; } + public string? ToCellNo { get; set; } /// /// 响应信息 diff --git a/WcsMain/ApiServe/Controllers/Dto/Container/TaskStateNoticeRequest.cs b/WcsMain/ApiServe/Dto/Container/TaskStateNoticeRequest.cs similarity index 88% rename from WcsMain/ApiServe/Controllers/Dto/Container/TaskStateNoticeRequest.cs rename to WcsMain/ApiServe/Dto/Container/TaskStateNoticeRequest.cs index bec2d22..9bbcc5b 100644 --- a/WcsMain/ApiServe/Controllers/Dto/Container/TaskStateNoticeRequest.cs +++ b/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; /// /// 四向车任务回告请求类 diff --git a/WcsMain/ApiServe/Controllers/Dto/Container/TaskStateNoticeResponse.cs b/WcsMain/ApiServe/Dto/Container/TaskStateNoticeResponse.cs similarity index 91% rename from WcsMain/ApiServe/Controllers/Dto/Container/TaskStateNoticeResponse.cs rename to WcsMain/ApiServe/Dto/Container/TaskStateNoticeResponse.cs index f2f4d75..524b5b8 100644 --- a/WcsMain/ApiServe/Controllers/Dto/Container/TaskStateNoticeResponse.cs +++ b/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; /// /// 四向车反馈任务状态的响应类 diff --git a/WcsMain/ApiServe/Controllers/Dto/Equipment/ConveyStatusResponse.cs b/WcsMain/ApiServe/Dto/Equipment/ConveyStatusResponse.cs similarity index 91% rename from WcsMain/ApiServe/Controllers/Dto/Equipment/ConveyStatusResponse.cs rename to WcsMain/ApiServe/Dto/Equipment/ConveyStatusResponse.cs index b598241..ee5ac93 100644 --- a/WcsMain/ApiServe/Controllers/Dto/Equipment/ConveyStatusResponse.cs +++ b/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; /// /// 输送设备信息 ---- 卡特专用 diff --git a/WcsMain/ApiServe/Controllers/Dto/Equipment/PickStandInfoResponse.cs b/WcsMain/ApiServe/Dto/Equipment/PickStandInfoResponse.cs similarity index 88% rename from WcsMain/ApiServe/Controllers/Dto/Equipment/PickStandInfoResponse.cs rename to WcsMain/ApiServe/Dto/Equipment/PickStandInfoResponse.cs index 8ef8c8e..d9ba7c8 100644 --- a/WcsMain/ApiServe/Controllers/Dto/Equipment/PickStandInfoResponse.cs +++ b/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; /// /// 拣选站台信息 diff --git a/WcsMain/ApiServe/Controllers/Dto/Equipment/StackerStatusResponse.cs b/WcsMain/ApiServe/Dto/Equipment/StackerStatusResponse.cs similarity index 94% rename from WcsMain/ApiServe/Controllers/Dto/Equipment/StackerStatusResponse.cs rename to WcsMain/ApiServe/Dto/Equipment/StackerStatusResponse.cs index d0b6316..4f7ef55 100644 --- a/WcsMain/ApiServe/Controllers/Dto/Equipment/StackerStatusResponse.cs +++ b/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; /// /// 堆垛机状态返回实体类 diff --git a/WcsMain/ApiServe/Controllers/Dto/WMSEntity/Convey/DisposeVehicleRequest.cs b/WcsMain/ApiServe/Dto/WMSEntity/Convey/DisposeVehicleRequest.cs similarity index 62% rename from WcsMain/ApiServe/Controllers/Dto/WMSEntity/Convey/DisposeVehicleRequest.cs rename to WcsMain/ApiServe/Dto/WMSEntity/Convey/DisposeVehicleRequest.cs index 16d1158..cdf6e30 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WMSEntity/Convey/DisposeVehicleRequest.cs +++ b/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 /// 点位 /// [JsonPropertyName("location")] - public string? Location { get; set;} + public string? Location { get; set; } } diff --git a/WcsMain/ApiServe/Controllers/Dto/WMSEntity/Convey/GetConveyTaskRequest.cs b/WcsMain/ApiServe/Dto/WMSEntity/Convey/GetConveyTaskRequest.cs similarity index 92% rename from WcsMain/ApiServe/Controllers/Dto/WMSEntity/Convey/GetConveyTaskRequest.cs rename to WcsMain/ApiServe/Dto/WMSEntity/Convey/GetConveyTaskRequest.cs index e5bb912..8f9efb0 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WMSEntity/Convey/GetConveyTaskRequest.cs +++ b/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 { diff --git a/WcsMain/ApiServe/Controllers/Dto/WMSEntity/ElTag/GetElTagTaskRequest.cs b/WcsMain/ApiServe/Dto/WMSEntity/ElTag/GetElTagTaskRequest.cs similarity index 96% rename from WcsMain/ApiServe/Controllers/Dto/WMSEntity/ElTag/GetElTagTaskRequest.cs rename to WcsMain/ApiServe/Dto/WMSEntity/ElTag/GetElTagTaskRequest.cs index 03c7de4..6d6ad00 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WMSEntity/ElTag/GetElTagTaskRequest.cs +++ b/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 { diff --git a/WcsMain/ApiServe/Controllers/Dto/WMSEntity/Equipment/QueryStandStatusRequest.cs b/WcsMain/ApiServe/Dto/WMSEntity/Equipment/QueryStandStatusRequest.cs similarity index 80% rename from WcsMain/ApiServe/Controllers/Dto/WMSEntity/Equipment/QueryStandStatusRequest.cs rename to WcsMain/ApiServe/Dto/WMSEntity/Equipment/QueryStandStatusRequest.cs index 7f2ed7e..d5d27f7 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WMSEntity/Equipment/QueryStandStatusRequest.cs +++ b/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 { diff --git a/WcsMain/ApiServe/Controllers/Dto/WMSEntity/Equipment/QueryStandStatusResponse.cs b/WcsMain/ApiServe/Dto/WMSEntity/Equipment/QueryStandStatusResponse.cs similarity index 89% rename from WcsMain/ApiServe/Controllers/Dto/WMSEntity/Equipment/QueryStandStatusResponse.cs rename to WcsMain/ApiServe/Dto/WMSEntity/Equipment/QueryStandStatusResponse.cs index a26ceaa..8e6d92e 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WMSEntity/Equipment/QueryStandStatusResponse.cs +++ b/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 { diff --git a/WcsMain/ApiServe/Controllers/Dto/WMSEntity/WmsApiResponse.cs b/WcsMain/ApiServe/Dto/WMSEntity/WmsApiResponse.cs similarity index 92% rename from WcsMain/ApiServe/Controllers/Dto/WMSEntity/WmsApiResponse.cs rename to WcsMain/ApiServe/Dto/WMSEntity/WmsApiResponse.cs index b566169..5f66223 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WMSEntity/WmsApiResponse.cs +++ b/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; /// /// WMS的固定返回类 diff --git a/WcsMain/ApiServe/Controllers/Dto/WMSEntity/WmsTask/DisposeStandRequest.cs b/WcsMain/ApiServe/Dto/WMSEntity/WmsTask/DisposeStandRequest.cs similarity index 90% rename from WcsMain/ApiServe/Controllers/Dto/WMSEntity/WmsTask/DisposeStandRequest.cs rename to WcsMain/ApiServe/Dto/WMSEntity/WmsTask/DisposeStandRequest.cs index afb56cd..644c029 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WMSEntity/WmsTask/DisposeStandRequest.cs +++ b/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; /// /// wms 推送站台拣选完成 diff --git a/WcsMain/ApiServe/Controllers/Dto/WMSEntity/WmsTask/GetStackerRequest.cs b/WcsMain/ApiServe/Dto/WMSEntity/WmsTask/GetStackerRequest.cs similarity index 96% rename from WcsMain/ApiServe/Controllers/Dto/WMSEntity/WmsTask/GetStackerRequest.cs rename to WcsMain/ApiServe/Dto/WMSEntity/WmsTask/GetStackerRequest.cs index b4b191f..a11348e 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WMSEntity/WmsTask/GetStackerRequest.cs +++ b/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; /// /// SetStackerTask 接口的请求类 diff --git a/WcsMain/ApiServe/Controllers/Dto/WMSEntity/WmsTask/SetPickTaskRequest.cs b/WcsMain/ApiServe/Dto/WMSEntity/WmsTask/SetPickTaskRequest.cs similarity index 90% rename from WcsMain/ApiServe/Controllers/Dto/WMSEntity/WmsTask/SetPickTaskRequest.cs rename to WcsMain/ApiServe/Dto/WMSEntity/WmsTask/SetPickTaskRequest.cs index dcd7502..1558879 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WMSEntity/WmsTask/SetPickTaskRequest.cs +++ b/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; /// /// SetPickTask 接口的请求实体类 diff --git a/WcsMain/ApiServe/Controllers/Dto/WMSEntity/WmsTask/UpdateStackerTaskStatusRequest.cs b/WcsMain/ApiServe/Dto/WMSEntity/WmsTask/UpdateStackerTaskStatusRequest.cs similarity index 92% rename from WcsMain/ApiServe/Controllers/Dto/WMSEntity/WmsTask/UpdateStackerTaskStatusRequest.cs rename to WcsMain/ApiServe/Dto/WMSEntity/WmsTask/UpdateStackerTaskStatusRequest.cs index 4b7d8d1..0e47b0a 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WMSEntity/WmsTask/UpdateStackerTaskStatusRequest.cs +++ b/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; /// /// UpdateStackerTaskStatus 接口的请求类 diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsApiResponse.cs b/WcsMain/ApiServe/Dto/WcsApiResponse.cs similarity index 96% rename from WcsMain/ApiServe/Controllers/Dto/WcsApiResponse.cs rename to WcsMain/ApiServe/Dto/WcsApiResponse.cs index c1c77da..6cfb9a2 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsApiResponse.cs +++ b/WcsMain/ApiServe/Dto/WcsApiResponse.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace WcsMain.ApiServe.Controllers.Dto; +namespace WcsMain.ApiServe.Dto; /// /// Api统一回复类 diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/ApiAccept/GetApiAcceptWithPageRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/ApiAccept/GetApiAcceptWithPageRequest.cs similarity index 93% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/ApiAccept/GetApiAcceptWithPageRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/ApiAccept/GetApiAcceptWithPageRequest.cs index ac0f62f..03a262f 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/ApiAccept/GetApiAcceptWithPageRequest.cs +++ b/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 { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/ApiRequest/GetApiRequestWithPageRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/ApiRequest/GetApiRequestWithPageRequest.cs similarity index 92% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/ApiRequest/GetApiRequestWithPageRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/ApiRequest/GetApiRequestWithPageRequest.cs index 37b8f8c..1563888 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/ApiRequest/GetApiRequestWithPageRequest.cs +++ b/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 { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Config/EditeConfigRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/Config/EditeConfigRequest.cs similarity index 94% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/Config/EditeConfigRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/Config/EditeConfigRequest.cs index 2fb2347..601bf34 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Config/EditeConfigRequest.cs +++ b/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 { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Config/GetConfigWithPageRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/Config/GetConfigWithPageRequest.cs similarity index 83% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/Config/GetConfigWithPageRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/Config/GetConfigWithPageRequest.cs index 2e92006..710febc 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Config/GetConfigWithPageRequest.cs +++ b/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; /// @@ -12,7 +12,7 @@ public class GetConfigWithPageRequest /// 查询字符串 /// [JsonPropertyName("searchStr")] - public string? SearchString { get; set; } + public string? SearchString { get; set; } /// /// 页面大小 diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Convey/QueryConveyTaskWithPageRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/Convey/QueryConveyTaskWithPageRequest.cs similarity index 90% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/Convey/QueryConveyTaskWithPageRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/Convey/QueryConveyTaskWithPageRequest.cs index 46d5c31..002abb5 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Convey/QueryConveyTaskWithPageRequest.cs +++ b/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 { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/CusPickTask/UpdatePickTaskRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/CusPickTask/UpdatePickTaskRequest.cs similarity index 91% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/CusPickTask/UpdatePickTaskRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/CusPickTask/UpdatePickTaskRequest.cs index 61d18ab..5bccfd0 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/CusPickTask/UpdatePickTaskRequest.cs +++ b/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 { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/DB/EditeDBRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/DB/EditeDBRequest.cs similarity index 93% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/DB/EditeDBRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/DB/EditeDBRequest.cs index 791e749..d73b1cb 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/DB/EditeDBRequest.cs +++ b/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 { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/DB/GetDBWithPlcNameRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/DB/GetDBWithPlcNameRequest.cs similarity index 88% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/DB/GetDBWithPlcNameRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/DB/GetDBWithPlcNameRequest.cs index 131cd9f..affca10 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/DB/GetDBWithPlcNameRequest.cs +++ b/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; /// diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/DB/GetDBWithPlcNameResponse.cs b/WcsMain/ApiServe/Dto/WcsDto/DB/GetDBWithPlcNameResponse.cs similarity index 86% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/DB/GetDBWithPlcNameResponse.cs rename to WcsMain/ApiServe/Dto/WcsDto/DB/GetDBWithPlcNameResponse.cs index 482e137..cade1a0 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/DB/GetDBWithPlcNameResponse.cs +++ b/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; /// /// 返回PLCDB块同时返回 PLC名称的响应实体 @@ -17,7 +17,7 @@ public class GetDBWithPlcNameResponse /// plc 名称 /// [JsonPropertyName("plcName")] - public string? PlcName { get; set;} + public string? PlcName { get; set; } /// /// db的名称 @@ -35,7 +35,7 @@ public class GetDBWithPlcNameResponse /// 是否系统级别 /// [JsonPropertyName("isSystem")] - public int? IsSystem { get; set;} + public int? IsSystem { get; set; } /// /// 备注 diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/ElTag/AddTaskInfoRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/ElTag/AddTaskInfoRequest.cs similarity index 96% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/ElTag/AddTaskInfoRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/ElTag/AddTaskInfoRequest.cs index 73ec728..98b6847 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/ElTag/AddTaskInfoRequest.cs +++ b/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 { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/ElTag/EditTaskInfoRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/ElTag/EditTaskInfoRequest.cs similarity index 95% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/ElTag/EditTaskInfoRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/ElTag/EditTaskInfoRequest.cs index 4efd811..4a4f4d1 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/ElTag/EditTaskInfoRequest.cs +++ b/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 { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/ElTag/GetStackerTaskNewDestinationRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/ElTag/GetStackerTaskNewDestinationRequest.cs similarity index 83% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/ElTag/GetStackerTaskNewDestinationRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/ElTag/GetStackerTaskNewDestinationRequest.cs index 972bac3..76f3673 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/ElTag/GetStackerTaskNewDestinationRequest.cs +++ b/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 /// [DataRules] [JsonPropertyName("destination")] - public string? Destination { get; set; } + public string? Destination { get; set; } /// /// 载具号 diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/ElTag/QueryLocationWithPageRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/ElTag/QueryLocationWithPageRequest.cs similarity index 92% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/ElTag/QueryLocationWithPageRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/ElTag/QueryLocationWithPageRequest.cs index ba57b80..8b50b92 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/ElTag/QueryLocationWithPageRequest.cs +++ b/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 { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/ElTag/QueryTaskRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/ElTag/QueryTaskRequest.cs similarity index 95% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/ElTag/QueryTaskRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/ElTag/QueryTaskRequest.cs index 1f52c31..f7a1fd1 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/ElTag/QueryTaskRequest.cs +++ b/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 { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/ElTag/ShowNumRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/ElTag/ShowNumRequest.cs similarity index 85% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/ElTag/ShowNumRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/ElTag/ShowNumRequest.cs index f4e23b5..685ee85 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/ElTag/ShowNumRequest.cs +++ b/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 { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Equipment/ResetStackerRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/Equipment/ResetStackerRequest.cs similarity index 80% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/Equipment/ResetStackerRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/Equipment/ResetStackerRequest.cs index 20623b9..fd916e2 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Equipment/ResetStackerRequest.cs +++ b/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 { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Equipment/StackerContinueRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/Equipment/StackerContinueRequest.cs similarity index 80% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/Equipment/StackerContinueRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/Equipment/StackerContinueRequest.cs index 702d7e7..e0bf1ab 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Equipment/StackerContinueRequest.cs +++ b/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 { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Location/GetLocationWithPageRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/Location/GetLocationWithPageRequest.cs similarity index 94% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/Location/GetLocationWithPageRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/Location/GetLocationWithPageRequest.cs index 8a39603..c8e8336 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Location/GetLocationWithPageRequest.cs +++ b/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; /// /// GetLocationWithPage 接口请求类 diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Location/UpdateLocationRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/Location/UpdateLocationRequest.cs similarity index 97% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/Location/UpdateLocationRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/Location/UpdateLocationRequest.cs index 7570b83..09bfddc 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Location/UpdateLocationRequest.cs +++ b/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 { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Menu/AddMenuRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/Menu/AddMenuRequest.cs similarity index 96% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/Menu/AddMenuRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/Menu/AddMenuRequest.cs index 52e48f1..2eedc15 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Menu/AddMenuRequest.cs +++ b/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 { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Menu/GetMenuWithPageRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/Menu/GetMenuWithPageRequest.cs similarity index 90% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/Menu/GetMenuWithPageRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/Menu/GetMenuWithPageRequest.cs index 1b070bb..d71154a 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Menu/GetMenuWithPageRequest.cs +++ b/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 { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Menu/UpdateMenuRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/Menu/UpdateMenuRequest.cs similarity index 96% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/Menu/UpdateMenuRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/Menu/UpdateMenuRequest.cs index 2bc0c62..d848a7c 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Menu/UpdateMenuRequest.cs +++ b/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 { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/PLC/EditePLCRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/PLC/EditePLCRequest.cs similarity index 95% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/PLC/EditePLCRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/PLC/EditePLCRequest.cs index cee2cb9..e42fb12 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/PLC/EditePLCRequest.cs +++ b/WcsMain/ApiServe/Dto/WcsDto/PLC/EditePLCRequest.cs @@ -1,7 +1,7 @@ using DataCheck; using System.Text.Json.Serialization; -namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.PLC; +namespace WcsMain.ApiServe.Dto.WcsDto.PLC; /// /// 修改 PLC 请求实体类 diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Scan/QueryScanRecordWithPageRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/Scan/QueryScanRecordWithPageRequest.cs similarity index 93% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/Scan/QueryScanRecordWithPageRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/Scan/QueryScanRecordWithPageRequest.cs index 7dd4520..910f4d5 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Scan/QueryScanRecordWithPageRequest.cs +++ b/WcsMain/ApiServe/Dto/WcsDto/Scan/QueryScanRecordWithPageRequest.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.Scan; +namespace WcsMain.ApiServe.Dto.WcsDto.Scan; public class QueryScanRecordWithPageRequest { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Settings/EditSettingsRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/Settings/EditSettingsRequest.cs similarity index 93% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/Settings/EditSettingsRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/Settings/EditSettingsRequest.cs index 328148a..608241c 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Settings/EditSettingsRequest.cs +++ b/WcsMain/ApiServe/Dto/WcsDto/Settings/EditSettingsRequest.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.Settings; +namespace WcsMain.ApiServe.Dto.WcsDto.Settings; /// /// 编辑设置项的请求类 diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Socket/EditSocketRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/Socket/EditSocketRequest.cs similarity index 94% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/Socket/EditSocketRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/Socket/EditSocketRequest.cs index e93fc04..7e62067 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Socket/EditSocketRequest.cs +++ b/WcsMain/ApiServe/Dto/WcsDto/Socket/EditSocketRequest.cs @@ -1,7 +1,7 @@ using DataCheck; using System.Text.Json.Serialization; -namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.Socket; +namespace WcsMain.ApiServe.Dto.WcsDto.Socket; /// /// 编辑 socket 的请求类 diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Stacker/EditStackerRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/Stacker/EditStackerRequest.cs similarity index 95% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/Stacker/EditStackerRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/Stacker/EditStackerRequest.cs index a4b5a3a..0fe4c5b 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Stacker/EditStackerRequest.cs +++ b/WcsMain/ApiServe/Dto/WcsDto/Stacker/EditStackerRequest.cs @@ -1,7 +1,7 @@ using DataCheck; using System.Text.Json.Serialization; -namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.Stacker; +namespace WcsMain.ApiServe.Dto.WcsDto.Stacker; public class EditStackerRequest diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Stacker/GetStackerStatusResponse.cs b/WcsMain/ApiServe/Dto/WcsDto/Stacker/GetStackerStatusResponse.cs similarity index 97% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/Stacker/GetStackerStatusResponse.cs rename to WcsMain/ApiServe/Dto/WcsDto/Stacker/GetStackerStatusResponse.cs index 2e36547..afe0227 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Stacker/GetStackerStatusResponse.cs +++ b/WcsMain/ApiServe/Dto/WcsDto/Stacker/GetStackerStatusResponse.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.Stacker; +namespace WcsMain.ApiServe.Dto.WcsDto.Stacker; /// /// 查询堆垛机状态的返回实体 diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Stacker/QueryErrInfoRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/Stacker/QueryErrInfoRequest.cs similarity index 74% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/Stacker/QueryErrInfoRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/Stacker/QueryErrInfoRequest.cs index 1aab11e..c775fab 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/Stacker/QueryErrInfoRequest.cs +++ b/WcsMain/ApiServe/Dto/WcsDto/Stacker/QueryErrInfoRequest.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.Stacker; +namespace WcsMain.ApiServe.Dto.WcsDto.Stacker; public class QueryErrInfoRequest @@ -9,7 +9,7 @@ public class QueryErrInfoRequest /// 区域 /// [JsonPropertyName("area")] - public string? Area { get; set; } + public string? Area { get; set; } /// /// 报警编号 diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/StackerConvey/StackerConveyStatusResponse.cs b/WcsMain/ApiServe/Dto/WcsDto/StackerConvey/StackerConveyStatusResponse.cs similarity index 96% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/StackerConvey/StackerConveyStatusResponse.cs rename to WcsMain/ApiServe/Dto/WcsDto/StackerConvey/StackerConveyStatusResponse.cs index a665467..ae10a2c 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/StackerConvey/StackerConveyStatusResponse.cs +++ b/WcsMain/ApiServe/Dto/WcsDto/StackerConvey/StackerConveyStatusResponse.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.StackerConvey; +namespace WcsMain.ApiServe.Dto.WcsDto.StackerConvey; public class StackerConveyStatusResponse { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/SystemController/GetSysMsgWithPageRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/SystemController/GetSysMsgWithPageRequest.cs similarity index 87% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/SystemController/GetSysMsgWithPageRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/SystemController/GetSysMsgWithPageRequest.cs index 1335e27..33163c3 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/SystemController/GetSysMsgWithPageRequest.cs +++ b/WcsMain/ApiServe/Dto/WcsDto/SystemController/GetSysMsgWithPageRequest.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.SystemController; +namespace WcsMain.ApiServe.Dto.WcsDto.SystemController; public class GetSysMsgWithPageRequest { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/SystemController/LogRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/SystemController/LogRequest.cs similarity index 85% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/SystemController/LogRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/SystemController/LogRequest.cs index 7891830..6b53bb7 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/SystemController/LogRequest.cs +++ b/WcsMain/ApiServe/Dto/WcsDto/SystemController/LogRequest.cs @@ -1,7 +1,7 @@ using System.Text.Json.Serialization; using DataCheck; -namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.SystemController; +namespace WcsMain.ApiServe.Dto.WcsDto.SystemController; public class LogRequest { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/User/GetUserWithPageRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/User/GetUserWithPageRequest.cs similarity index 94% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/User/GetUserWithPageRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/User/GetUserWithPageRequest.cs index 9c960e2..5de8c4f 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/User/GetUserWithPageRequest.cs +++ b/WcsMain/ApiServe/Dto/WcsDto/User/GetUserWithPageRequest.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.User; +namespace WcsMain.ApiServe.Dto.WcsDto.User; public class GetUserWithPageRequest { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/User/LoginRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/User/LoginRequest.cs similarity index 88% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/User/LoginRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/User/LoginRequest.cs index 759b850..db00624 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/User/LoginRequest.cs +++ b/WcsMain/ApiServe/Dto/WcsDto/User/LoginRequest.cs @@ -1,7 +1,7 @@ using DataCheck; using System.Text.Json.Serialization; -namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.User; +namespace WcsMain.ApiServe.Dto.WcsDto.User; /// /// 登录请求类 diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/User/LoginResponse.cs b/WcsMain/ApiServe/Dto/WcsDto/User/LoginResponse.cs similarity index 96% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/User/LoginResponse.cs rename to WcsMain/ApiServe/Dto/WcsDto/User/LoginResponse.cs index c314a65..4ad9f8d 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/User/LoginResponse.cs +++ b/WcsMain/ApiServe/Dto/WcsDto/User/LoginResponse.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.User; +namespace WcsMain.ApiServe.Dto.WcsDto.User; /// /// d登录接口响应类 diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/UserGroup/AddUserGroupRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/UserGroup/AddUserGroupRequest.cs similarity index 89% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/UserGroup/AddUserGroupRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/UserGroup/AddUserGroupRequest.cs index 30286c0..9bead59 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/UserGroup/AddUserGroupRequest.cs +++ b/WcsMain/ApiServe/Dto/WcsDto/UserGroup/AddUserGroupRequest.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.UserGroup; +namespace WcsMain.ApiServe.Dto.WcsDto.UserGroup; public class AddUserGroupRequest { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/UserRule/UpdateUserRuleRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/UserRule/UpdateUserRuleRequest.cs similarity index 87% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/UserRule/UpdateUserRuleRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/UserRule/UpdateUserRuleRequest.cs index 8fa7313..42e8f45 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/UserRule/UpdateUserRuleRequest.cs +++ b/WcsMain/ApiServe/Dto/WcsDto/UserRule/UpdateUserRuleRequest.cs @@ -1,7 +1,7 @@ using System.Text.Json.Serialization; using DataCheck; -namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.UserRule; +namespace WcsMain.ApiServe.Dto.WcsDto.UserRule; public class UpdateUserRuleRequest { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/WcsTask/GetWcsTaskWithPageRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/WcsTask/GetWcsTaskWithPageRequest.cs similarity index 94% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/WcsTask/GetWcsTaskWithPageRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/WcsTask/GetWcsTaskWithPageRequest.cs index 2d0c7f1..4519479 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/WcsTask/GetWcsTaskWithPageRequest.cs +++ b/WcsMain/ApiServe/Dto/WcsDto/WcsTask/GetWcsTaskWithPageRequest.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.WcsTask; +namespace WcsMain.ApiServe.Dto.WcsDto.WcsTask; public class GetWcsTaskWithPageRequest { diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/WcsTask/UpdateWcsTaskStatusRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/WcsTask/UpdateWcsTaskStatusRequest.cs similarity index 91% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/WcsTask/UpdateWcsTaskStatusRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/WcsTask/UpdateWcsTaskStatusRequest.cs index 4abd914..a005e89 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/WcsTask/UpdateWcsTaskStatusRequest.cs +++ b/WcsMain/ApiServe/Dto/WcsDto/WcsTask/UpdateWcsTaskStatusRequest.cs @@ -1,7 +1,7 @@ using System.Text.Json.Serialization; using DataCheck; -namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.WcsTask; +namespace WcsMain.ApiServe.Dto.WcsDto.WcsTask; /// /// 更新 wcs 任务状态请求类 diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/WmsTask/GetWmsTaskWithPageRequest.cs b/WcsMain/ApiServe/Dto/WcsDto/WmsTask/GetWmsTaskWithPageRequest.cs similarity index 95% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/WmsTask/GetWmsTaskWithPageRequest.cs rename to WcsMain/ApiServe/Dto/WcsDto/WmsTask/GetWmsTaskWithPageRequest.cs index e0ace1f..2977ebc 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/WmsTask/GetWmsTaskWithPageRequest.cs +++ b/WcsMain/ApiServe/Dto/WcsDto/WmsTask/GetWmsTaskWithPageRequest.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.WmsTask; +namespace WcsMain.ApiServe.Dto.WcsDto.WmsTask; /// /// 分页查询 WMS 任务的实体 diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/WmsTask/SetWmsTask.cs b/WcsMain/ApiServe/Dto/WcsDto/WmsTask/SetWmsTask.cs similarity index 96% rename from WcsMain/ApiServe/Controllers/Dto/WcsDto/WmsTask/SetWmsTask.cs rename to WcsMain/ApiServe/Dto/WcsDto/WmsTask/SetWmsTask.cs index d32c597..45985f0 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/WmsTask/SetWmsTask.cs +++ b/WcsMain/ApiServe/Dto/WcsDto/WmsTask/SetWmsTask.cs @@ -1,7 +1,7 @@ using System.Text.Json.Serialization; using DataCheck; -namespace WcsMain.ApiServe.Controllers.Dto.WcsDto.WmsTask; +namespace WcsMain.ApiServe.Dto.WcsDto.WmsTask; /// /// 创建任务的统一类 diff --git a/WcsMain/ApiServe/Factory/WcsApiResponseFactory.cs b/WcsMain/ApiServe/Factory/WcsApiResponseFactory.cs index e6f6fb8..9df6d62 100644 --- a/WcsMain/ApiServe/Factory/WcsApiResponseFactory.cs +++ b/WcsMain/ApiServe/Factory/WcsApiResponseFactory.cs @@ -1,5 +1,5 @@ -using WcsMain.ApiServe.Controllers.Dto; -using WcsMain.Enum.ApiServer; +using WcsMain.ApiServe.Dto; +using WcsMain.Constant.Enum.ApiServer; namespace WcsMain.ApiServe.Factory; diff --git a/WcsMain/ApiServe/Factory/WmsApiResponseFactory.cs b/WcsMain/ApiServe/Factory/WmsApiResponseFactory.cs index 84329ad..c8d9b35 100644 --- a/WcsMain/ApiServe/Factory/WmsApiResponseFactory.cs +++ b/WcsMain/ApiServe/Factory/WmsApiResponseFactory.cs @@ -1,5 +1,5 @@ -using WcsMain.ApiServe.Controllers.Dto.WMSEntity; -using WcsMain.Enum.ApiServer; +using WcsMain.ApiServe.Dto.WMSEntity; +using WcsMain.Constant.Enum.ApiServer; namespace WcsMain.ApiServe.Factory; diff --git a/WcsMain/ApiServe/Service/AGVService/AGVService.cs b/WcsMain/ApiServe/Service/AGVService/AGVService.cs index 28a41d6..7e2b7cd 100644 --- a/WcsMain/ApiServe/Service/AGVService/AGVService.cs +++ b/WcsMain/ApiServe/Service/AGVService/AGVService.cs @@ -1,11 +1,10 @@ -using Humanizer; -using WcsMain.ApiClient.DataEntity.AGVEntity; -using WcsMain.ApiServe.Controllers.Dto.AGV; +using WcsMain.ApiClient.AGV.Dto; +using WcsMain.ApiServe.Dto.AGV; using WcsMain.Business.CommonAction; +using WcsMain.Constant.Enum.Stacker; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.Enum.Stacker; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.AGVService; [Service] @@ -16,7 +15,7 @@ public class AGVService(AppWmsTaskDao wmsTaskDao, WCSTaskExecuteEvent taskExecut /// /// /// - public AGVResponseLayout> TaskCallBack(Controllers.Dto.AGV.AGVRequestLayout> request) + public AGVResponseLayout> TaskCallBack(Dto.AGV.AGVRequestLayout> request) { var bodyData = request.Body; if(bodyData == default) diff --git a/WcsMain/ApiServe/Service/ContainerService/ContainerService.cs b/WcsMain/ApiServe/Service/ContainerService/ContainerService.cs index a3c0c34..671ed77 100644 --- a/WcsMain/ApiServe/Service/ContainerService/ContainerService.cs +++ b/WcsMain/ApiServe/Service/ContainerService/ContainerService.cs @@ -1,13 +1,9 @@ -using WcsMain.ApiClient.DataEntity.WmsEntity; -using WcsMain.ApiServe.Controllers.Dto.Container; +using WcsMain.ApiServe.Dto.Container; using WcsMain.Business.CommonAction; -using WcsMain.Common; +using WcsMain.Constant.Enum.Stacker; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.Enum; -using WcsMain.Enum.Stacker; -using WcsMain.Plugins; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.ContainerService; diff --git a/WcsMain/ApiServe/Service/TreeDService/TaskService.cs b/WcsMain/ApiServe/Service/TreeDService/TaskService.cs index 71eeef8..e12510e 100644 --- a/WcsMain/ApiServe/Service/TreeDService/TaskService.cs +++ b/WcsMain/ApiServe/Service/TreeDService/TaskService.cs @@ -1,8 +1,8 @@ -using WcsMain.ApiServe.Controllers.Dto; +using WcsMain.ApiServe.Dto; using WcsMain.ApiServe.Factory; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.TreeDService; diff --git a/WcsMain/ApiServe/Service/WcsService/ApiAcceptService.cs b/WcsMain/ApiServe/Service/WcsService/ApiAcceptService.cs index e88ea9f..7f99cb9 100644 --- a/WcsMain/ApiServe/Service/WcsService/ApiAcceptService.cs +++ b/WcsMain/ApiServe/Service/WcsService/ApiAcceptService.cs @@ -1,9 +1,9 @@ -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.Factory; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.WcsService; diff --git a/WcsMain/ApiServe/Service/WcsService/ApiRequestService.cs b/WcsMain/ApiServe/Service/WcsService/ApiRequestService.cs index 5ed415c..05e6f18 100644 --- a/WcsMain/ApiServe/Service/WcsService/ApiRequestService.cs +++ b/WcsMain/ApiServe/Service/WcsService/ApiRequestService.cs @@ -1,9 +1,9 @@ -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.Factory; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.WcsService; diff --git a/WcsMain/ApiServe/Service/WcsService/ConfigService.cs b/WcsMain/ApiServe/Service/WcsService/ConfigService.cs index 691aef7..0702b7b 100644 --- a/WcsMain/ApiServe/Service/WcsService/ConfigService.cs +++ b/WcsMain/ApiServe/Service/WcsService/ConfigService.cs @@ -1,10 +1,10 @@ using DataCheck; -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.Factory; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.WcsService; diff --git a/WcsMain/ApiServe/Service/WcsService/ConveyService.cs b/WcsMain/ApiServe/Service/WcsService/ConveyService.cs index 75ac33f..4158910 100644 --- a/WcsMain/ApiServe/Service/WcsService/ConveyService.cs +++ b/WcsMain/ApiServe/Service/WcsService/ConveyService.cs @@ -1,9 +1,9 @@ -using WcsMain.ApiServe.Controllers.Dto; -using WcsMain.ApiServe.Controllers.Dto.WcsDto.Convey; +using WcsMain.ApiServe.Dto; +using WcsMain.ApiServe.Dto.WcsDto.Convey; using WcsMain.ApiServe.Factory; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.WcsService; diff --git a/WcsMain/ApiServe/Service/WcsService/ElTagService.cs b/WcsMain/ApiServe/Service/WcsService/ElTagService.cs index d4d9356..ad445ac 100644 --- a/WcsMain/ApiServe/Service/WcsService/ElTagService.cs +++ b/WcsMain/ApiServe/Service/WcsService/ElTagService.cs @@ -1,12 +1,12 @@ using DataCheck; -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.Factory; +using WcsMain.Common.DataService; +using WcsMain.Constant.Enum.ElTag; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.DataService; -using WcsMain.Enum.ElTag; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.WcsService; diff --git a/WcsMain/ApiServe/Service/WcsService/EquipmentService.cs b/WcsMain/ApiServe/Service/WcsService/EquipmentService.cs index 973bb75..669b879 100644 --- a/WcsMain/ApiServe/Service/WcsService/EquipmentService.cs +++ b/WcsMain/ApiServe/Service/WcsService/EquipmentService.cs @@ -1,9 +1,9 @@ -using WcsMain.ApiServe.Controllers.Dto; -using WcsMain.WcsAttribute.AutoFacAttribute; -using WcsMain.ApiServe.Controllers.Dto.Equipment; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; using WcsMain.ApiServe.Factory; using WcsMain.DataBase.Dao; -using WcsMain.ApiServe.Controllers.Dto.WcsDto.Equipment; +using WcsMain.ApiServe.Dto; +using WcsMain.ApiServe.Dto.Equipment; +using WcsMain.ApiServe.Dto.WcsDto.Equipment; namespace WcsMain.ApiServe.Service.WcsService; diff --git a/WcsMain/ApiServe/Service/WcsService/LocationService.cs b/WcsMain/ApiServe/Service/WcsService/LocationService.cs index f123f36..c31c63c 100644 --- a/WcsMain/ApiServe/Service/WcsService/LocationService.cs +++ b/WcsMain/ApiServe/Service/WcsService/LocationService.cs @@ -1,9 +1,9 @@ -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.Factory; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.WcsService; diff --git a/WcsMain/ApiServe/Service/WcsService/MenuService.cs b/WcsMain/ApiServe/Service/WcsService/MenuService.cs index 15378d0..452fc0a 100644 --- a/WcsMain/ApiServe/Service/WcsService/MenuService.cs +++ b/WcsMain/ApiServe/Service/WcsService/MenuService.cs @@ -1,9 +1,9 @@ -using WcsMain.ApiServe.Controllers.Dto.WcsDto.Menu; -using WcsMain.ApiServe.Controllers.Dto; -using WcsMain.DataBase.Dao; +using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; using WcsMain.ApiServe.Factory; +using WcsMain.ApiServe.Dto; +using WcsMain.ApiServe.Dto.WcsDto.Menu; namespace WcsMain.ApiServe.Service.WcsService; diff --git a/WcsMain/ApiServe/Service/WcsService/PlcDbService.cs b/WcsMain/ApiServe/Service/WcsService/PlcDbService.cs index c9a168d..8aec274 100644 --- a/WcsMain/ApiServe/Service/WcsService/PlcDbService.cs +++ b/WcsMain/ApiServe/Service/WcsService/PlcDbService.cs @@ -1,10 +1,10 @@ using DataCheck; -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.Factory; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.WcsService; diff --git a/WcsMain/ApiServe/Service/WcsService/PlcService.cs b/WcsMain/ApiServe/Service/WcsService/PlcService.cs index d3c595f..7a52094 100644 --- a/WcsMain/ApiServe/Service/WcsService/PlcService.cs +++ b/WcsMain/ApiServe/Service/WcsService/PlcService.cs @@ -1,11 +1,10 @@ using DataCheck; -using System.Collections.Generic; -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.Factory; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.WcsService; diff --git a/WcsMain/ApiServe/Service/WcsService/RunningInfoService.cs b/WcsMain/ApiServe/Service/WcsService/RunningInfoService.cs index 6a2c535..5e44a65 100644 --- a/WcsMain/ApiServe/Service/WcsService/RunningInfoService.cs +++ b/WcsMain/ApiServe/Service/WcsService/RunningInfoService.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Mvc; -using WcsMain.ApiServe.Controllers.Dto.WcsDto.SystemController; -using WcsMain.ApiServe.Controllers.Dto; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; using WcsMain.ApiServe.Factory; using DataCheck; +using WcsMain.ApiServe.Dto; +using WcsMain.ApiServe.Dto.WcsDto.SystemController; namespace WcsMain.ApiServe.Service.WcsService; diff --git a/WcsMain/ApiServe/Service/WcsService/ScanService.cs b/WcsMain/ApiServe/Service/WcsService/ScanService.cs index fdb90ae..151f63f 100644 --- a/WcsMain/ApiServe/Service/WcsService/ScanService.cs +++ b/WcsMain/ApiServe/Service/WcsService/ScanService.cs @@ -1,9 +1,9 @@ -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.Factory; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.WcsService; diff --git a/WcsMain/ApiServe/Service/WcsService/SettingService.cs b/WcsMain/ApiServe/Service/WcsService/SettingService.cs index 121e73f..64b61f8 100644 --- a/WcsMain/ApiServe/Service/WcsService/SettingService.cs +++ b/WcsMain/ApiServe/Service/WcsService/SettingService.cs @@ -1,10 +1,10 @@ using DataCheck; -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.Factory; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.WcsService; diff --git a/WcsMain/ApiServe/Service/WcsService/SocketService.cs b/WcsMain/ApiServe/Service/WcsService/SocketService.cs index e465d25..f3fe9a2 100644 --- a/WcsMain/ApiServe/Service/WcsService/SocketService.cs +++ b/WcsMain/ApiServe/Service/WcsService/SocketService.cs @@ -1,11 +1,11 @@ using WcsMain.ExtendMethod; -using WcsMain.ApiServe.Controllers.Dto; -using WcsMain.ApiServe.Controllers.Dto.WcsDto.Socket; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; using WcsMain.ApiServe.Factory; using DataCheck; +using WcsMain.ApiServe.Dto; +using WcsMain.ApiServe.Dto.WcsDto.Socket; namespace WcsMain.ApiServe.Service.WcsService; diff --git a/WcsMain/ApiServe/Service/WcsService/StackerConveyService.cs b/WcsMain/ApiServe/Service/WcsService/StackerConveyService.cs index 9e34caa..5555b0b 100644 --- a/WcsMain/ApiServe/Service/WcsService/StackerConveyService.cs +++ b/WcsMain/ApiServe/Service/WcsService/StackerConveyService.cs @@ -1,14 +1,11 @@ -using Microsoft.CodeAnalysis.CSharp.Syntax; -using WcsMain.ApiServe.Controllers.Dto; -using WcsMain.ApiServe.Controllers.Dto.WcsDto.StackerConvey; +using WcsMain.ApiServe.Dto; +using WcsMain.ApiServe.Dto.WcsDto.StackerConvey; using WcsMain.ApiServe.Factory; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; using WcsMain.EquipOperation.Convey; -using WcsMain.EquipOperation.StackerConvey; -using WcsMain.Plugins; -using WcsMain.WcsAttribute.AutoFacAttribute; -using static Dm.net.buffer.ByteArrayBuffer; +using WcsMain.Utils.Plugins; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.WcsService; diff --git a/WcsMain/ApiServe/Service/WcsService/StackerService.cs b/WcsMain/ApiServe/Service/WcsService/StackerService.cs index 11507a7..c6f04ac 100644 --- a/WcsMain/ApiServe/Service/WcsService/StackerService.cs +++ b/WcsMain/ApiServe/Service/WcsService/StackerService.cs @@ -1,13 +1,11 @@ using DataCheck; -using Microsoft.VisualStudio.Web.CodeGenerators.Mvc.Dependency; -using System.Collections.Generic; -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.Factory; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; using WcsMain.EquipOperation.Stacker; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.WcsService; diff --git a/WcsMain/ApiServe/Service/WcsService/UserGroupService.cs b/WcsMain/ApiServe/Service/WcsService/UserGroupService.cs index 9470af5..790381c 100644 --- a/WcsMain/ApiServe/Service/WcsService/UserGroupService.cs +++ b/WcsMain/ApiServe/Service/WcsService/UserGroupService.cs @@ -1,10 +1,10 @@ using DataCheck; -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.Factory; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.WcsService; diff --git a/WcsMain/ApiServe/Service/WcsService/UserRuleService.cs b/WcsMain/ApiServe/Service/WcsService/UserRuleService.cs index d951537..17b491c 100644 --- a/WcsMain/ApiServe/Service/WcsService/UserRuleService.cs +++ b/WcsMain/ApiServe/Service/WcsService/UserRuleService.cs @@ -1,10 +1,10 @@ using DataCheck; -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.Factory; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.WcsService; diff --git a/WcsMain/ApiServe/Service/WcsService/UserService.cs b/WcsMain/ApiServe/Service/WcsService/UserService.cs index 4e51249..e6c28c0 100644 --- a/WcsMain/ApiServe/Service/WcsService/UserService.cs +++ b/WcsMain/ApiServe/Service/WcsService/UserService.cs @@ -1,11 +1,11 @@ using DataCheck; using EncryptTool; -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.Factory; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.WcsService; diff --git a/WcsMain/ApiServe/Service/WcsService/WcsTaskService.cs b/WcsMain/ApiServe/Service/WcsService/WcsTaskService.cs index 64a0a1e..5a27ec0 100644 --- a/WcsMain/ApiServe/Service/WcsService/WcsTaskService.cs +++ b/WcsMain/ApiServe/Service/WcsService/WcsTaskService.cs @@ -1,11 +1,11 @@ using DataCheck; using Microsoft.AspNetCore.Mvc; -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.Factory; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.WcsService; diff --git a/WcsMain/ApiServe/Service/WcsService/WmsTaskService.cs b/WcsMain/ApiServe/Service/WcsService/WmsTaskService.cs index 9b3d4c0..b0a53ab 100644 --- a/WcsMain/ApiServe/Service/WcsService/WmsTaskService.cs +++ b/WcsMain/ApiServe/Service/WcsService/WmsTaskService.cs @@ -1,15 +1,15 @@ using DataCheck; -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.Factory; using WcsMain.Business.CommonAction; +using WcsMain.Common.DataService; +using WcsMain.Constant.Enum.Stacker; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.DataService; -using WcsMain.Enum.Stacker; using WcsMain.StaticData; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.WcsService; diff --git a/WcsMain/ApiServe/Service/WmsService/ConveyService.cs b/WcsMain/ApiServe/Service/WmsService/ConveyService.cs index 26ab984..277ae19 100644 --- a/WcsMain/ApiServe/Service/WmsService/ConveyService.cs +++ b/WcsMain/ApiServe/Service/WmsService/ConveyService.cs @@ -1,14 +1,12 @@ -using System.Configuration; -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.Factory; -using WcsMain.Common; +using WcsMain.Common.DataService; +using WcsMain.Constant.Enum.Convey; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.DataService; -using WcsMain.Enum.Convey; using WcsMain.EquipOperation.Convey; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.WmsService; diff --git a/WcsMain/ApiServe/Service/WmsService/ElTagService.cs b/WcsMain/ApiServe/Service/WmsService/ElTagService.cs index d8272b4..72beab4 100644 --- a/WcsMain/ApiServe/Service/WmsService/ElTagService.cs +++ b/WcsMain/ApiServe/Service/WmsService/ElTagService.cs @@ -1,13 +1,12 @@ using DataCheck; -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.Factory; -using WcsMain.Common; +using WcsMain.Common.DataService; +using WcsMain.Constant.Enum.ElTag; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.DataService; -using WcsMain.Enum.ElTag; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.WmsService; diff --git a/WcsMain/ApiServe/Service/WmsService/EquipmentService.cs b/WcsMain/ApiServe/Service/WmsService/EquipmentService.cs index e7055c4..b388688 100644 --- a/WcsMain/ApiServe/Service/WmsService/EquipmentService.cs +++ b/WcsMain/ApiServe/Service/WmsService/EquipmentService.cs @@ -1,7 +1,7 @@ -using WcsMain.ApiServe.Controllers.Dto.WMSEntity.Equipment; -using WcsMain.ApiServe.Controllers.Dto.WMSEntity; -using WcsMain.ApiServe.Factory; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.ApiServe.Factory; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; +using WcsMain.ApiServe.Dto.WMSEntity; +using WcsMain.ApiServe.Dto.WMSEntity.Equipment; namespace WcsMain.ApiServe.Service.WmsService; diff --git a/WcsMain/ApiServe/Service/WmsService/WmsTaskService.cs b/WcsMain/ApiServe/Service/WmsService/WmsTaskService.cs index 29ea4ea..c136bb8 100644 --- a/WcsMain/ApiServe/Service/WmsService/WmsTaskService.cs +++ b/WcsMain/ApiServe/Service/WmsService/WmsTaskService.cs @@ -1,17 +1,17 @@ using DataCheck; -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.Factory; using WcsMain.Business.CommonAction; using WcsMain.Common; +using WcsMain.Constant.Enum.Stacker; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.Enum.Stacker; using WcsMain.ExtendMethod; -using WcsMain.Plugins; using WcsMain.StaticData; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Utils.Plugins; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.WmsService; diff --git a/WcsMain/AppEntity/SystemData/AppConfigEntity.cs b/WcsMain/AppEntity/SystemData/AppConfigEntity.cs index 27d8e88..5618ca3 100644 --- a/WcsMain/AppEntity/SystemData/AppConfigEntity.cs +++ b/WcsMain/AppEntity/SystemData/AppConfigEntity.cs @@ -1,4 +1,4 @@ -using WcsMain.WcsAttribute.AppConfig; +using WcsMain.Constant.WcsAttribute.AppConfig; namespace WcsMain.AppEntity.SystemData; diff --git a/WcsMain/Business/CirculationTask/ScanMethod.cs b/WcsMain/Business/CirculationTask/ScanMethod.cs deleted file mode 100644 index ef15b92..0000000 --- a/WcsMain/Business/CirculationTask/ScanMethod.cs +++ /dev/null @@ -1,74 +0,0 @@ -using WcsMain.DataService; - -namespace WcsMain.Business.CirculationTask; - -/// -/// 读取 PLC 的扫码 -/// -//[Circulation] -public class ScanMethod() -{ - - - //private static string[]? _scanId; - //private static ScanCodeAction? scanCodeAction; - - ///// - ///// - ///// - ///// - ////[Circulation("读取扫码信息", 100)] - //public bool ReadScanCode() - //{ - // if (_scanId == default) - // { - // GetScanNo(); - // return true; - // } - // foreach (string scanId in _scanId) - // { - // Thread.Sleep(10); - // (string? errText, short scanOk, string code) = ConveyOperation.Instance().ReadScanInfo(scanId); - // if (!string.IsNullOrEmpty(errText)) - // { - // ConsoleLog.Error($"在扫码：{scanId} 处读取信息失败，信息：{errText}"); - // Thread.Sleep(10000); - // continue; - // } - // if (scanOk != 1) { continue; } - // ConveyOperation.Instance().ClearScanStatus(scanId); - // Task.Factory.StartNew(() => - // { - // ConsoleLog.Info($"扫码器：{scanId} 收到数据：{code}"); - // if (string.IsNullOrEmpty(code)) { return; }// 没有条码，不处理 - // scanCodeAction ??= new ScanCodeAction(); - // Type type = scanCodeAction.GetType(); - // var methods = type.GetMethods(); - // if (methods.Length < 1) { return; } // 类里面没有方法 - // foreach (var method in methods) - // { - // string? methodName = DataBaseData.Instance().GetConfig($"ScanMethod{scanId}"); - // if (string.IsNullOrEmpty(methodName)) { return; } - // if (method.Name == methodName) - // { - // method.Invoke(scanCodeAction, [new ScanCodeClass() { Code = code, StrScanID = scanId }]); - // return; - // } - // } - // ConsoleLog.Error($"扫码器编号：{scanId} 未找到方法，请配置 config 参数。"); - // }); - // } - // return true; - //} - - - - //private void GetScanNo() - //{ - // string? scans = DataBaseData.Instance().GetConfig("scanNo"); - // if (string.IsNullOrEmpty(scans)) { return; } - // _scanId = scans.Split(','); - //} - - -} \ No newline at end of file diff --git a/WcsMain/Business/CommonAction/ClearData.cs b/WcsMain/Business/CommonAction/ClearData.cs index 4d146ae..22bc1a3 100644 --- a/WcsMain/Business/CommonAction/ClearData.cs +++ b/WcsMain/Business/CommonAction/ClearData.cs @@ -1,10 +1,10 @@ using WcsMain.ExtendMethod; using WcsMain.DataBase.Dao; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; using System.Reflection; using SqlSugar; -using WcsMain.WcsAttribute.Clear; using WcsMain.Common; +using WcsMain.Constant.WcsAttribute.Clear; namespace WcsMain.Business.CommonAction; diff --git a/WcsMain/Business/CommonAction/CusBindingVehicle.cs b/WcsMain/Business/CommonAction/CusBindingVehicle.cs deleted file mode 100644 index f68d299..0000000 --- a/WcsMain/Business/CommonAction/CusBindingVehicle.cs +++ /dev/null @@ -1,34 +0,0 @@ -namespace WcsMain.Business.CommonAction; - -/// -/// 绑定任务号和箱子 -/// -//[Component] -public class CusBindingVehicle -{ - - ///// - ///// 绑定任务号和载具号 - ///// - ///// - ///// - //public void VehicleBinding(string? vehicleNo, int plcId) - //{ - // if (string.IsNullOrEmpty(vehicleNo)) - // { - // return; - // } - // // 清理旧数据 - // AppVehicleBindingDao.Instance().DeleteWithVehicleNo(vehicleNo); - // // 绑定新数据 - // AppVehicleBindingDao.Instance().Insert(new AppVehicleBinding() - // { - // vehicleNo = vehicleNo, - // PlcId = plcId, - // BindingTime = DateTime.Now - // }); - - //} - - -} \ No newline at end of file diff --git a/WcsMain/Business/CommonAction/WCSTaskExecuteEvent.cs b/WcsMain/Business/CommonAction/WCSTaskExecuteEvent.cs index bbf4876..cfe7a4e 100644 --- a/WcsMain/Business/CommonAction/WCSTaskExecuteEvent.cs +++ b/WcsMain/Business/CommonAction/WCSTaskExecuteEvent.cs @@ -2,10 +2,11 @@ using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; using WcsMain.DataBase.MixDao; -using WcsMain.Enum.TaskEnum; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; using WcsMain.StaticData; -using WcsMain.Enum.Stacker; +using WcsMain.ApiClient.WMS; +using WcsMain.Constant.Enum.Stacker; +using WcsMain.Constant.Enum.TaskEnum; namespace WcsMain.Business.CommonAction; diff --git a/WcsMain/Business/CommonAction/WmsTaskAction.cs b/WcsMain/Business/CommonAction/WmsTaskAction.cs index 0279839..288fa41 100644 --- a/WcsMain/Business/CommonAction/WmsTaskAction.cs +++ b/WcsMain/Business/CommonAction/WmsTaskAction.cs @@ -1,7 +1,8 @@ -using WcsMain.DataBase.Dao; +using WcsMain.ApiClient.WMS; +using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; using WcsMain.StaticData; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.Business.CommonAction; diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/I/IBaseGetData.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/I/IBaseGetData.cs index 12a6811..4ace1dc 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/I/IBaseGetData.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/I/IBaseGetData.cs @@ -1,5 +1,4 @@ using WcsMain.DataBase.TableEntity; -using WcsMain.Tcp.Entity.Convey; namespace WcsMain.Business.Convey.HistoryDataHandler.HisGetData.I; diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/LoginGetData.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/LoginGetData.cs index 008e0c5..4b7f13b 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/LoginGetData.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/LoginGetData.cs @@ -1,16 +1,16 @@ -using WcsMain.ApiClient.DataEntity.WmsEntity; +using WcsMain.ApiClient.WMS; +using WcsMain.ApiClient.WMS.Dto; using WcsMain.Business.Convey.HistoryDataHandler.HisGetData.I; using WcsMain.Common; using WcsMain.DataBase.TableEntity; using WcsMain.ExtendMethod; -using WcsMain.Plugins; namespace WcsMain.Business.Convey.HistoryDataHandler.HisGetData; /// /// 注册口逻辑 /// -public class LoginGetData(WmsWebApiPost wmsWebApiPost) : IBaseGetData +public class LoginGetData(WmsBaseWebApi wmsWebApiPost) : IBaseGetData { /// diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick1StandOutC3.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick1StandOutC3.cs index 86b6a9f..f984e9d 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick1StandOutC3.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick1StandOutC3.cs @@ -1,14 +1,14 @@ -using WcsMain.ApiClient.DataEntity.WmsEntity; +using WcsMain.ApiClient.WMS; +using WcsMain.ApiClient.WMS.Dto; using WcsMain.Business.Convey.HistoryDataHandler.HisGetData.I; using WcsMain.Common; +using WcsMain.Common.DataService; +using WcsMain.Constant.Enum.Convey; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.DataService; -using WcsMain.Enum.Convey; using WcsMain.EquipOperation.Convey; using WcsMain.EquipOperation.Entity; using WcsMain.ExtendMethod; -using WcsMain.Plugins; namespace WcsMain.Business.Convey.HistoryDataHandler.HisGetData; @@ -18,7 +18,7 @@ namespace WcsMain.Business.Convey.HistoryDataHandler.HisGetData; /// /// /// -public class Pick1StandOutC3(ConveyOperation conveyOperation, DataBaseData dataBaseData, AppConveyTaskDao conveyTaskDao, WmsWebApiPost wmsWebApiPost) : IBaseGetData +public class Pick1StandOutC3(ConveyOperation conveyOperation, DataBaseData dataBaseData, AppConveyTaskDao conveyTaskDao, WmsBaseWebApi wmsWebApiPost) : IBaseGetData { /// diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick2StandOutC4.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick2StandOutC4.cs index 1ffef13..c009cf8 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick2StandOutC4.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/Pick2StandOutC4.cs @@ -1,14 +1,14 @@ -using WcsMain.ApiClient.DataEntity.WmsEntity; +using WcsMain.ApiClient.WMS; +using WcsMain.ApiClient.WMS.Dto; using WcsMain.Business.Convey.HistoryDataHandler.HisGetData.I; using WcsMain.Common; +using WcsMain.Common.DataService; +using WcsMain.Constant.Enum.Convey; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.DataService; -using WcsMain.Enum.Convey; using WcsMain.EquipOperation.Convey; using WcsMain.EquipOperation.Entity; using WcsMain.ExtendMethod; -using WcsMain.Plugins; namespace WcsMain.Business.Convey.HistoryDataHandler.HisGetData; @@ -18,7 +18,7 @@ namespace WcsMain.Business.Convey.HistoryDataHandler.HisGetData; /// /// /// -public class Pick2StandOutC4(ConveyOperation conveyOperation, DataBaseData dataBaseData, AppConveyTaskDao conveyTaskDao, WmsWebApiPost wmsWebApiPost) : IBaseGetData +public class Pick2StandOutC4(ConveyOperation conveyOperation, DataBaseData dataBaseData, AppConveyTaskDao conveyTaskDao, WmsBaseWebApi wmsWebApiPost) : IBaseGetData { /// diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/PickStandGetData.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/PickStandGetData.cs index df108c3..ac8aa13 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/PickStandGetData.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/PickStandGetData.cs @@ -1,11 +1,10 @@ using WcsMain.Business.Convey.HistoryDataHandler.HisGetData.I; +using WcsMain.Common.DataService; +using WcsMain.Constant.Enum.Convey; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.DataService; -using WcsMain.Enum.Convey; using WcsMain.EquipOperation.Convey; using WcsMain.EquipOperation.Entity; -using WcsMain.ExtendMethod; namespace WcsMain.Business.Convey.HistoryDataHandler.HisGetData; diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/PickStandP5.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/PickStandP5.cs index 10fb83e..ddca581 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/PickStandP5.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/PickStandP5.cs @@ -1,12 +1,11 @@ using WcsMain.Business.Convey.HistoryDataHandler.HisGetData.I; using WcsMain.Common; +using WcsMain.Common.DataService; +using WcsMain.Constant.Enum.Convey; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.DataService; -using WcsMain.Enum.Convey; using WcsMain.EquipOperation.Convey; using WcsMain.EquipOperation.Entity; -using WcsMain.ExtendMethod; namespace WcsMain.Business.Convey.HistoryDataHandler.HisGetData; diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInErr.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInErr.cs index a987f8b..c467c17 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInErr.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInErr.cs @@ -1,10 +1,10 @@ using WcsMain.Business.Convey.HistoryDataHandler.HisGetData.I; using WcsMain.Common; +using WcsMain.Common.DataService; +using WcsMain.Constant.Enum.Convey; +using WcsMain.Constant.Enum.Stacker; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.DataService; -using WcsMain.Enum.Convey; -using WcsMain.Enum.Stacker; using WcsMain.EquipOperation.Convey; using WcsMain.EquipOperation.Entity; using WcsMain.ExtendMethod; diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInSpliter.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInSpliter.cs index 93212ba..0db628b 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInSpliter.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInSpliter.cs @@ -1,10 +1,10 @@ using WcsMain.Business.Convey.HistoryDataHandler.HisGetData.I; using WcsMain.Common; +using WcsMain.Common.DataService; +using WcsMain.Constant.Enum.Convey; +using WcsMain.Constant.Enum.Stacker; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.DataService; -using WcsMain.Enum.Convey; -using WcsMain.Enum.Stacker; using WcsMain.EquipOperation.Convey; using WcsMain.EquipOperation.Entity; using WcsMain.ExtendMethod; diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutC1.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutC1.cs index 26ddcec..be58993 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutC1.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutC1.cs @@ -1,12 +1,11 @@ using WcsMain.Business.Convey.HistoryDataHandler.HisGetData.I; using WcsMain.Common; +using WcsMain.Common.DataService; +using WcsMain.Constant.Enum.Convey; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.DataService; -using WcsMain.Enum.Convey; using WcsMain.EquipOperation.Convey; using WcsMain.EquipOperation.Entity; -using WcsMain.ExtendMethod; namespace WcsMain.Business.Convey.HistoryDataHandler.HisGetData; diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutErrC2.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutErrC2.cs index bd64f13..5ef0483 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutErrC2.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutErrC2.cs @@ -1,11 +1,10 @@ using WcsMain.Business.Convey.HistoryDataHandler.HisGetData.I; +using WcsMain.Common.DataService; +using WcsMain.Constant.Enum.Convey; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.DataService; -using WcsMain.Enum.Convey; using WcsMain.EquipOperation.Convey; using WcsMain.EquipOperation.Entity; -using WcsMain.ExtendMethod; namespace WcsMain.Business.Convey.HistoryDataHandler.HisGetData; diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HistoryConveyDataHander.cs b/WcsMain/Business/Convey/HistoryDataHandler/HistoryConveyDataHander.cs index a16d297..b01ea0f 100644 --- a/WcsMain/Business/Convey/HistoryDataHandler/HistoryConveyDataHander.cs +++ b/WcsMain/Business/Convey/HistoryDataHandler/HistoryConveyDataHander.cs @@ -1,11 +1,9 @@ using Autofac; -using System.Collections.Generic; using System.Reflection; using WcsMain.Business.Convey.HistoryDataHandler.HisGetData.I; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.Tcp.Entity.Convey; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.Business.Convey.HistoryDataHandler; diff --git a/WcsMain/ElTag/Atop/AtopEnum/AtopSubCommandEnum.cs b/WcsMain/Business/ElTag/Atop/AtopEnum/AtopSubCommandEnum.cs similarity index 83% rename from WcsMain/ElTag/Atop/AtopEnum/AtopSubCommandEnum.cs rename to WcsMain/Business/ElTag/Atop/AtopEnum/AtopSubCommandEnum.cs index 07ffea0..8134c34 100644 --- a/WcsMain/ElTag/Atop/AtopEnum/AtopSubCommandEnum.cs +++ b/WcsMain/Business/ElTag/Atop/AtopEnum/AtopSubCommandEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.ElTag.Atop.AtopEnum; +namespace WcsMain.Business.ElTag.Atop.AtopEnum; public enum AtopSubCommandEnum { diff --git a/WcsMain/ElTag/Atop/AtopEnum/BuzzerType.cs b/WcsMain/Business/ElTag/Atop/AtopEnum/BuzzerType.cs similarity index 76% rename from WcsMain/ElTag/Atop/AtopEnum/BuzzerType.cs rename to WcsMain/Business/ElTag/Atop/AtopEnum/BuzzerType.cs index c8db8e1..434f4f7 100644 --- a/WcsMain/ElTag/Atop/AtopEnum/BuzzerType.cs +++ b/WcsMain/Business/ElTag/Atop/AtopEnum/BuzzerType.cs @@ -1,4 +1,4 @@ -namespace WcsMain.ElTag.Atop.AtopEnum; +namespace WcsMain.Business.ElTag.Atop.AtopEnum; /// /// 蜂鸣器类型 diff --git a/WcsMain/ElTag/Atop/AtopEnum/LedColor.cs b/WcsMain/Business/ElTag/Atop/AtopEnum/LedColor.cs similarity index 76% rename from WcsMain/ElTag/Atop/AtopEnum/LedColor.cs rename to WcsMain/Business/ElTag/Atop/AtopEnum/LedColor.cs index b01e1ce..1c62398 100644 --- a/WcsMain/ElTag/Atop/AtopEnum/LedColor.cs +++ b/WcsMain/Business/ElTag/Atop/AtopEnum/LedColor.cs @@ -1,4 +1,4 @@ -namespace WcsMain.ElTag.Atop.AtopEnum; +namespace WcsMain.Business.ElTag.Atop.AtopEnum; /// /// 电子标签灯的颜色 diff --git a/WcsMain/ElTag/Atop/AtopEnum/LedStatus.cs b/WcsMain/Business/ElTag/Atop/AtopEnum/LedStatus.cs similarity index 79% rename from WcsMain/ElTag/Atop/AtopEnum/LedStatus.cs rename to WcsMain/Business/ElTag/Atop/AtopEnum/LedStatus.cs index 41a7155..3a0aba5 100644 --- a/WcsMain/ElTag/Atop/AtopEnum/LedStatus.cs +++ b/WcsMain/Business/ElTag/Atop/AtopEnum/LedStatus.cs @@ -1,4 +1,4 @@ -namespace WcsMain.ElTag.Atop.AtopEnum; +namespace WcsMain.Business.ElTag.Atop.AtopEnum; /// /// 灯的状态 diff --git a/WcsMain/ElTag/Atop/AtopEnum/TagButtons.cs b/WcsMain/Business/ElTag/Atop/AtopEnum/TagButtons.cs similarity index 71% rename from WcsMain/ElTag/Atop/AtopEnum/TagButtons.cs rename to WcsMain/Business/ElTag/Atop/AtopEnum/TagButtons.cs index f300859..e937a4e 100644 --- a/WcsMain/ElTag/Atop/AtopEnum/TagButtons.cs +++ b/WcsMain/Business/ElTag/Atop/AtopEnum/TagButtons.cs @@ -1,4 +1,4 @@ -namespace WcsMain.ElTag.Atop.AtopEnum; +namespace WcsMain.Business.ElTag.Atop.AtopEnum; /// /// 标签按钮 diff --git a/WcsMain/ElTag/Atop/AtopEnum/TagMode.cs b/WcsMain/Business/ElTag/Atop/AtopEnum/TagMode.cs similarity index 67% rename from WcsMain/ElTag/Atop/AtopEnum/TagMode.cs rename to WcsMain/Business/ElTag/Atop/AtopEnum/TagMode.cs index 121f122..d4aff26 100644 --- a/WcsMain/ElTag/Atop/AtopEnum/TagMode.cs +++ b/WcsMain/Business/ElTag/Atop/AtopEnum/TagMode.cs @@ -1,4 +1,4 @@ -namespace WcsMain.ElTag.Atop.AtopEnum; +namespace WcsMain.Business.ElTag.Atop.AtopEnum; /// /// 标签的模式 diff --git a/WcsMain/ElTag/Atop/BaseOprDataHandler.cs b/WcsMain/Business/ElTag/Atop/BaseOprDataHandler.cs similarity index 92% rename from WcsMain/ElTag/Atop/BaseOprDataHandler.cs rename to WcsMain/Business/ElTag/Atop/BaseOprDataHandler.cs index f4a12ff..b77c7ec 100644 --- a/WcsMain/ElTag/Atop/BaseOprDataHandler.cs +++ b/WcsMain/Business/ElTag/Atop/BaseOprDataHandler.cs @@ -1,23 +1,23 @@ using System.Text.RegularExpressions; -using WcsMain.ApiClient.DataEntity.WmsEntity; +using WcsMain.ApiClient.WMS; +using WcsMain.ApiClient.WMS.Dto; +using WcsMain.Business.ElTag.Atop.AtopEnum; +using WcsMain.Business.ElTag.Atop.Entity; using WcsMain.Common; +using WcsMain.Constant.Enum.ElTag; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.ElTag.Atop.AtopEnum; -using WcsMain.ElTag.Atop.Entity; -using WcsMain.Enum.ElTag; using WcsMain.EquipOperation.ElTag; using WcsMain.ExtendMethod; -using WcsMain.Plugins; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; -namespace WcsMain.ElTag.Atop; +namespace WcsMain.Business.ElTag.Atop; /// /// 电子标签收到数据的数据处理类 /// [Component] -public class BaseOprDataHandler(AppElTagLocationDao tagBaseDao, AppElTagTaskDao tagTaskDao, AtopOperation atopOperation, WmsWebApiPost wmsWebApiPost) +public class BaseOprDataHandler(AppElTagLocationDao tagBaseDao, AppElTagTaskDao tagTaskDao, AtopOperation atopOperation, WmsBaseWebApi wmsWebApiPost) { /// @@ -54,18 +54,18 @@ public class BaseOprDataHandler(AppElTagLocationDao tagBaseDao, AppElTagTaskDao /// 按下确认键 /// /// - public void Confirm(TagReturnInfo tcpServe) + public void Confirm(TagReturnInfo tcpServe) { // _atopOperation.ShowMsgOnly(tcpServe.ControllerDisplayName, tcpServe.TagId, tcpServe.Data); // 重新点亮标签，仅显示字符 /* 找出这个标签最新点亮的那条记录 */ List? eltags = tagBaseDao.Query(new AppElTagLocation { ControllerDisplayName = tcpServe.ControllerDisplayName, TagId = tcpServe.TagId }); - if(eltags == default) + if (eltags == default) { ConsoleLog.Exception($"【异常】电子标签确认查询数据库标签信息失败，与数据库服务器连连接中断，控制器：{tcpServe.ControllerDisplayName}，标签号：{tcpServe.TagId}，数据：{tcpServe.Data}"); atopOperation.ShowMsg(tcpServe.ControllerDisplayName, tcpServe.TagId, tcpServe.Data); // 重新点亮标签 return; } - if(eltags.Count < 1) + if (eltags.Count < 1) { ConsoleLog.Warning($"【异常】电子标签确认按钮按下，该标签不在基础资料表，控制器：{tcpServe.ControllerDisplayName}，标签号：{tcpServe.TagId}，数据：{tcpServe.Data}"); return; @@ -74,14 +74,14 @@ public class BaseOprDataHandler(AppElTagLocationDao tagBaseDao, AppElTagTaskDao eltags = [.. eltags.OrderByDescending(el => el.LastLightTime)]; var eltag = eltags[0]; string? taskId = eltag.TaskId; // 获取任务号 - if(string.IsNullOrEmpty(taskId)) + if (string.IsNullOrEmpty(taskId)) { ConsoleLog.Warning($"【异常】电子标签确认按钮按下，该标签没有绑定的显示任务，控制器：{tcpServe.ControllerDisplayName}，标签号：{tcpServe.TagId}，数据：{tcpServe.Data}"); return; } /* 获取该任务号对应的任务 */ List? tagTasks = tagTaskDao.Query(new AppElTagTask { TaskId = taskId }); - if(tagTasks == default) + if (tagTasks == default) { ConsoleLog.Exception($"【异常】电子标签确认查询数据库任务失败，与数据库服务器连连接中断，控制器：{tcpServe.ControllerDisplayName}，标签号：{tcpServe.TagId}，数据：{tcpServe.Data}"); atopOperation.ShowMsg(tcpServe.ControllerDisplayName, tcpServe.TagId, tcpServe.Data); // 重新点亮标签 diff --git a/WcsMain/ElTag/Atop/ConnectOprServe.cs b/WcsMain/Business/ElTag/Atop/ConnectOprServe.cs similarity index 95% rename from WcsMain/ElTag/Atop/ConnectOprServe.cs rename to WcsMain/Business/ElTag/Atop/ConnectOprServe.cs index 298200e..89ffaeb 100644 --- a/WcsMain/ElTag/Atop/ConnectOprServe.cs +++ b/WcsMain/Business/ElTag/Atop/ConnectOprServe.cs @@ -1,18 +1,15 @@ -using LedSimple; -using System.Xml.Linq; +using WcsMain.Business.ElTag.Atop.Entity; using WcsMain.Common; +using WcsMain.Constant.Enum.ElTag; +using WcsMain.Constant.Enum.General; +using WcsMain.Constant.Enum.Tcp; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.ElTag.Atop.AtopEnum; -using WcsMain.ElTag.Atop.Entity; -using WcsMain.Enum.ElTag; -using WcsMain.Enum.General; -using WcsMain.Enum.Tcp; using WcsMain.EquipOperation.ElTag; -using WcsMain.Tcp.Entity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Utils.Tcp.Entity; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; -namespace WcsMain.ElTag.Atop; +namespace WcsMain.Business.ElTag.Atop; /// /// 连接并接收电子标签信息 diff --git a/WcsMain/ElTag/Atop/Entity/TagReturnInfo.cs b/WcsMain/Business/ElTag/Atop/Entity/TagReturnInfo.cs similarity index 94% rename from WcsMain/ElTag/Atop/Entity/TagReturnInfo.cs rename to WcsMain/Business/ElTag/Atop/Entity/TagReturnInfo.cs index 03a42c8..04bd205 100644 --- a/WcsMain/ElTag/Atop/Entity/TagReturnInfo.cs +++ b/WcsMain/Business/ElTag/Atop/Entity/TagReturnInfo.cs @@ -1,4 +1,4 @@ -namespace WcsMain.ElTag.Atop.Entity; +namespace WcsMain.Business.ElTag.Atop.Entity; public class TagReturnInfo { @@ -53,7 +53,7 @@ public class TagReturnInfo /// /// 返回的数据 /// - public string? Data { get; set; } + public string? Data { get; set; } diff --git a/WcsMain/ElTag/Atop/Entity/TagSendInfo.cs b/WcsMain/Business/ElTag/Atop/Entity/TagSendInfo.cs similarity index 96% rename from WcsMain/ElTag/Atop/Entity/TagSendInfo.cs rename to WcsMain/Business/ElTag/Atop/Entity/TagSendInfo.cs index 6bbba47..c9935bb 100644 --- a/WcsMain/ElTag/Atop/Entity/TagSendInfo.cs +++ b/WcsMain/Business/ElTag/Atop/Entity/TagSendInfo.cs @@ -1,7 +1,6 @@ -using System.Drawing; -using WcsMain.ElTag.Atop.AtopEnum; +using WcsMain.Business.ElTag.Atop.AtopEnum; -namespace WcsMain.ElTag.Atop.Entity; +namespace WcsMain.Business.ElTag.Atop.Entity; /// /// 发送到电子标签的信息 @@ -159,7 +158,7 @@ public class TagSendInfo public static byte[] ShowValue(byte tagId, int? value) { string showStr; - if (value == default || value > 999) + if (value == default || value > 999) { showStr = "MAX"; } @@ -167,7 +166,7 @@ public class TagSendInfo { showStr = value!.ToString()!; } - if(showStr!.Length < 6) + if (showStr!.Length < 6) { showStr = showStr.PadLeft(6, ' '); } diff --git a/WcsMain/Business/ElTag/Atop/OprTcpClient.cs b/WcsMain/Business/ElTag/Atop/OprTcpClient.cs new file mode 100644 index 0000000..5f54b7b --- /dev/null +++ b/WcsMain/Business/ElTag/Atop/OprTcpClient.cs @@ -0,0 +1,12 @@ +using WcsMain.Utils.Tcp.Client; + +namespace WcsMain.Business.ElTag.Atop; + +/// +/// 电子标签主控制类 +/// +public class OprTcpClient : BaseTcpClient +{ + + +} diff --git a/WcsMain/Business/CirculationTask/Convey/PickStandButton.cs b/WcsMain/CirculationJob/Convey/PickStandButton.cs similarity index 89% rename from WcsMain/Business/CirculationTask/Convey/PickStandButton.cs rename to WcsMain/CirculationJob/Convey/PickStandButton.cs index 5d5a418..fc92092 100644 --- a/WcsMain/Business/CirculationTask/Convey/PickStandButton.cs +++ b/WcsMain/CirculationJob/Convey/PickStandButton.cs @@ -1,20 +1,20 @@ using CirculateTool.Attribute; -using WcsMain.ApiClient.DataEntity.WmsEntity; +using WcsMain.ApiClient.WMS; +using WcsMain.ApiClient.WMS.Dto; using WcsMain.Common; +using WcsMain.Constant.Enum.Convey; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.Enum.Convey; using WcsMain.EquipOperation.Convey; using WcsMain.ExtendMethod; -using WcsMain.Plugins; -namespace WcsMain.Business.CirculationTask.Convey; +namespace WcsMain.CirculationJob.Convey; /// /// 拣选站台按钮 /// //[Circulation] -public class PickStandButton(AppConveyStandDao conveyStandDao, ConveyOperation conveyOperation, WmsWebApiPost wmsWebApiPost) +public class PickStandButton(AppConveyStandDao conveyStandDao, ConveyOperation conveyOperation, WmsBaseWebApi wmsWebApiPost) { private static List? _pickStands; // 拣选站台 @@ -58,7 +58,7 @@ public class PickStandButton(AppConveyStandDao conveyStandDao, ConveyOperation c var responseEntity = wmsWebApiPost.HttpPost(request, CommonData.AppApiBaseInfos.GetAddress("UploadPickStandButtonMethod") ?? "", 2000); if (!responseEntity.IsSend) return; // 发送失败不处理，下一次循环在发送 // 只要发送成功则不再发送 - ConsoleLog.Info( $"拣选站：{pickStand.StandId} 按钮已经按下上报成功，WMS返回：{responseEntity.ResponseMsg}"); + ConsoleLog.Info($"拣选站：{pickStand.StandId} 按钮已经按下上报成功，WMS返回：{responseEntity.ResponseMsg}"); var result = responseEntity.ResponseEntity; if (result is { Code: 0 }) { diff --git a/WcsMain/Business/CirculationTask/Convey/ReadScanCode.cs b/WcsMain/CirculationJob/Convey/ReadScanCode.cs similarity index 89% rename from WcsMain/Business/CirculationTask/Convey/ReadScanCode.cs rename to WcsMain/CirculationJob/Convey/ReadScanCode.cs index 8603844..02c53d3 100644 --- a/WcsMain/Business/CirculationTask/Convey/ReadScanCode.cs +++ b/WcsMain/CirculationJob/Convey/ReadScanCode.cs @@ -1,12 +1,12 @@ using CirculateTool.Attribute; using WcsMain.Business.Convey.HistoryDataHandler; +using WcsMain.Common.DataService; +using WcsMain.Constant.Enum.General; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.DataService; -using WcsMain.Enum.General; using WcsMain.EquipOperation.Convey; -namespace WcsMain.Business.CirculationTask.Convey; +namespace WcsMain.CirculationJob.Convey; /// @@ -15,7 +15,7 @@ namespace WcsMain.Business.CirculationTask.Convey; //[Circulation] public class ReadScanCode(AppRouterMethodDao routerMethodDao, ConveyOperation conveyOperation, HistoryConveyDataHander historyConveyDataHander, AppScanRecordDao scanRecordDao, DataBaseData dataBaseData) { - private static List? routers; + private static List? routers; /// /// 读取扫码数据 @@ -24,13 +24,13 @@ public class ReadScanCode(AppRouterMethodDao routerMethodDao, ConveyOperation co [Circulation("读取扫码数据", 300)] public bool ReadData() { - if(routers == default) + if (routers == default) { routers = routerMethodDao.Query(new AppRouterMethod() { RouterStatus = (int)TrueFalseEnum.TRUE }); return true; } List tasks = []; - foreach(AppRouterMethod router in routers) + foreach (AppRouterMethod router in routers) { tasks.Add(Task.Factory.StartNew(() => { diff --git a/WcsMain/Business/CirculationTask/Convey/UploadBoxArrive.cs b/WcsMain/CirculationJob/Convey/UploadBoxArrive.cs similarity index 94% rename from WcsMain/Business/CirculationTask/Convey/UploadBoxArrive.cs rename to WcsMain/CirculationJob/Convey/UploadBoxArrive.cs index 144116a..36b19b5 100644 --- a/WcsMain/Business/CirculationTask/Convey/UploadBoxArrive.cs +++ b/WcsMain/CirculationJob/Convey/UploadBoxArrive.cs @@ -1,20 +1,19 @@ using CirculateTool.Attribute; using System.Text.RegularExpressions; -using WcsMain.ApiClient.DataEntity.WmsEntity; +using WcsMain.ApiClient.WMS; +using WcsMain.ApiClient.WMS.Dto; using WcsMain.Common; +using WcsMain.Constant.Enum.Convey; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.DataService; -using WcsMain.Enum.Convey; using WcsMain.EquipOperation.Convey; using WcsMain.ExtendMethod; -using WcsMain.Plugins; -namespace WcsMain.Business.CirculationTask.Convey; +namespace WcsMain.CirculationJob.Convey; //[Circulation] -public class UploadBoxArrive(AppConveyStandDao conveyStandDao, ConveyOperation conveyOperation, WmsWebApiPost wmsWebApiPost, AppConveyTaskDao conveyTaskDao, AppElTagTaskDao elTagTaskDao) +public class UploadBoxArrive(AppConveyStandDao conveyStandDao, ConveyOperation conveyOperation, WmsBaseWebApi wmsWebApiPost, AppConveyTaskDao conveyTaskDao, AppElTagTaskDao elTagTaskDao) { private static List? _pickStands; // 拣选站台 diff --git a/WcsMain/Business/CirculationTask/ElTag/LightElTag.cs b/WcsMain/CirculationJob/ElTag/LightElTag.cs similarity index 92% rename from WcsMain/Business/CirculationTask/ElTag/LightElTag.cs rename to WcsMain/CirculationJob/ElTag/LightElTag.cs index 29d9181..98ddf97 100644 --- a/WcsMain/Business/CirculationTask/ElTag/LightElTag.cs +++ b/WcsMain/CirculationJob/ElTag/LightElTag.cs @@ -1,15 +1,12 @@ using CirculateTool.Attribute; -using LedSimple; +using WcsMain.Business.ElTag.Atop.AtopEnum; using WcsMain.Common; +using WcsMain.Constant.Enum.ElTag; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.ElTag.Atop; -using WcsMain.ElTag.Atop.AtopEnum; -using WcsMain.ElTag.Atop.Entity; -using WcsMain.Enum.ElTag; using WcsMain.EquipOperation.ElTag; -namespace WcsMain.Business.CirculationTask.ElTag; +namespace WcsMain.CirculationJob.ElTag; //[Circulation] @@ -42,7 +39,7 @@ public class LightElTag(AppElTagTaskDao tagTaskDao, AtopOperation atopOperation, { if (CommonData.AppElTags == default || CommonData.AppElTags.Count < 1) return; var tagInfo = CommonData.AppElTags.Find(f => f.Location == tagTask.Location); - if(tagInfo == default) + if (tagInfo == default) { ConsoleLog.Warning($"【警告】电子标签：{tagTask.Location} 不存在，无法点亮"); tagTaskDao.Update(new AppElTagTask @@ -66,7 +63,7 @@ public class LightElTag(AppElTagTaskDao tagTaskDao, AtopOperation atopOperation, ; }).Invoke(); var resultException = atopOperation.ShowMsg(tagInfo.ControllerDisplayName, tagInfo.TagId, tagTask.NeedNum, lEDColor); - if(resultException == default ) + if (resultException == default) { ConsoleLog.Success($"点亮电子标签成功，点位：{tagTask.Location}，数据：{tagTask.NeedNum}，载具号：{tagTask.VehicleNo}，标签号：{tagInfo.TagId}"); tagTaskDao.Update(new AppElTagTask diff --git a/WcsMain/Business/CirculationTask/ElTag/OffElTag.cs b/WcsMain/CirculationJob/ElTag/OffElTag.cs similarity index 93% rename from WcsMain/Business/CirculationTask/ElTag/OffElTag.cs rename to WcsMain/CirculationJob/ElTag/OffElTag.cs index 1038b75..fbebd98 100644 --- a/WcsMain/Business/CirculationTask/ElTag/OffElTag.cs +++ b/WcsMain/CirculationJob/ElTag/OffElTag.cs @@ -1,12 +1,11 @@ using CirculateTool.Attribute; +using WcsMain.Business.ElTag.Atop.Entity; using WcsMain.Common; +using WcsMain.Constant.Enum.ElTag; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.ElTag.Atop.Entity; -using WcsMain.Enum.ElTag; -using WcsMain.EquipOperation.ElTag; -namespace WcsMain.Business.CirculationTask.ElTag; +namespace WcsMain.CirculationJob.ElTag; /************************* * 当某个任务组的全部任务都确认之后熄灭所有电子标签 @@ -45,11 +44,11 @@ public class OffElTag(AppElTagTaskDao tagTaskDao) /// 检验任务组内任务是否全部确认，若全部确认则熄灭所有标签 /// /// - public void CheckTaskIsConfirmAllMethod(List tasks) + public void CheckTaskIsConfirmAllMethod(List tasks) { if (tasks.Count == 0) return; List taskGroups = []; - foreach (var task in tasks) + foreach (var task in tasks) { if (taskGroups.Contains(task.TaskGroup)) continue; taskGroups.Add(task.TaskGroup); diff --git a/WcsMain/Business/CirculationTask/CommonCirculation/ConnectPlcWithCirculation.cs b/WcsMain/CirculationJob/General/ConnectPlcWithCirculation.cs similarity index 93% rename from WcsMain/Business/CirculationTask/CommonCirculation/ConnectPlcWithCirculation.cs rename to WcsMain/CirculationJob/General/ConnectPlcWithCirculation.cs index a4e6cd4..4b447b3 100644 --- a/WcsMain/Business/CirculationTask/CommonCirculation/ConnectPlcWithCirculation.cs +++ b/WcsMain/CirculationJob/General/ConnectPlcWithCirculation.cs @@ -2,7 +2,7 @@ using WcsMain.Common; using WcsMain.EquipOperation; -namespace WcsMain.Business.CirculationTask.CommonCirculation; +namespace WcsMain.CirculationJob.General; /// /// 定时器检测 PLC 是否连接，若没有连接则重新连接 diff --git a/WcsMain/Business/CirculationTask/CommonCirculation/DataClear.cs b/WcsMain/CirculationJob/General/DataClear.cs similarity index 93% rename from WcsMain/Business/CirculationTask/CommonCirculation/DataClear.cs rename to WcsMain/CirculationJob/General/DataClear.cs index 5e2317e..9a0617c 100644 --- a/WcsMain/Business/CirculationTask/CommonCirculation/DataClear.cs +++ b/WcsMain/CirculationJob/General/DataClear.cs @@ -1,7 +1,7 @@ using CirculateTool.Attribute; using WcsMain.Business.CommonAction; -namespace WcsMain.Business.CirculationTask.CommonCirculation; +namespace WcsMain.CirculationJob.General; /// /// 数据清理 diff --git a/WcsMain/Business/CirculationTask/CommonCirculation/HeartBeat.cs b/WcsMain/CirculationJob/General/HeartBeat.cs similarity index 82% rename from WcsMain/Business/CirculationTask/CommonCirculation/HeartBeat.cs rename to WcsMain/CirculationJob/General/HeartBeat.cs index 1c27bfb..6a41274 100644 --- a/WcsMain/Business/CirculationTask/CommonCirculation/HeartBeat.cs +++ b/WcsMain/CirculationJob/General/HeartBeat.cs @@ -1,7 +1,7 @@ using CirculateTool.Attribute; using WcsMain.EquipOperation.Convey; -namespace WcsMain.Business.CirculationTask.CommonCirculation; +namespace WcsMain.CirculationJob.General; //[Circulation] public class HeartBeat(ConveyOperation conveyOperation) diff --git a/WcsMain/Business/CirculationTask/Stacker/CheckAccount.cs b/WcsMain/CirculationJob/Stacker/CheckAccount.cs similarity index 98% rename from WcsMain/Business/CirculationTask/Stacker/CheckAccount.cs rename to WcsMain/CirculationJob/Stacker/CheckAccount.cs index a54e518..de72ab0 100644 --- a/WcsMain/Business/CirculationTask/Stacker/CheckAccount.cs +++ b/WcsMain/CirculationJob/Stacker/CheckAccount.cs @@ -1,14 +1,14 @@ using CirculateTool.Attribute; using WcsMain.Business.CommonAction; using WcsMain.Common; +using WcsMain.Constant.Enum; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.Enum; using WcsMain.EquipOperation.Entity; using WcsMain.EquipOperation.Stacker; using WcsMain.ExtendMethod; -namespace WcsMain.Business.CirculationTask.Stacker; +namespace WcsMain.CirculationJob.Stacker; /// /// 过账，PLC任务回告 diff --git a/WcsMain/Business/CirculationTask/Stacker/ExeTaskDoubleFork.cs b/WcsMain/CirculationJob/Stacker/ExeTaskDoubleFork.cs similarity index 96% rename from WcsMain/Business/CirculationTask/Stacker/ExeTaskDoubleFork.cs rename to WcsMain/CirculationJob/Stacker/ExeTaskDoubleFork.cs index 2ed18ca..b8625da 100644 --- a/WcsMain/Business/CirculationTask/Stacker/ExeTaskDoubleFork.cs +++ b/WcsMain/CirculationJob/Stacker/ExeTaskDoubleFork.cs @@ -1,16 +1,16 @@ using CirculateTool.Attribute; using WcsMain.Business.CommonAction; using WcsMain.Common; +using WcsMain.Common.DataService; +using WcsMain.Constant.Enum.Stacker; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.DataService; -using WcsMain.Enum.Stacker; using WcsMain.EquipOperation.Convey; using WcsMain.EquipOperation.Entity.Stacker; using WcsMain.EquipOperation.Stacker; using WcsMain.ExtendMethod; -namespace WcsMain.Business.CirculationTask.Stacker; +namespace WcsMain.CirculationJob.Stacker; /// @@ -18,7 +18,7 @@ namespace WcsMain.Business.CirculationTask.Stacker; /// //[Circulation("双货叉单深位执行堆垛机任务")] public class ExeTaskDoubleFork( - StackerOperation stackerOperation, AppWcsTaskDao wcsTaskDao, WCSTaskExecuteEvent wcsTaskEvent, + StackerOperation stackerOperation, AppWcsTaskDao wcsTaskDao, WCSTaskExecuteEvent wcsTaskEvent, ConveyOperation conveyOperation, DataBaseData dataBaseData) { /// @@ -70,10 +70,10 @@ public class ExeTaskDoubleFork( if (stackerId == default) return false; /* 检查入库站台是否允许取货 */ bool allowGetGoods = conveyOperation.AllowGetVehicle(stackerId.ToString()); - if(!allowGetGoods) return false; // 入库站台不允许取货 + if (!allowGetGoods) return false; // 入库站台不允许取货 /* 读取入库站台的条码 */ var codes = conveyOperation.ReadAreaConveyCode(stackerId.ToString()); - if(codes == default || codes.Count != 2) return false; + if (codes == default || codes.Count != 2) return false; /* 构造任务数据 */ bool isWriteTask = false; // 指示是否写入任务 for (int i = 0; i < 2; i++) @@ -91,10 +91,10 @@ public class ExeTaskDoubleFork( if (!allowSetGoods) continue; // 出库站台不允许取货 /* 生成一个直接卸货出去的任务 */ int? plcId = dataBaseData.GetNewPlcTaskId(); - if(plcId == default || plcId == 0) continue; + if (plcId == default || plcId == 0) continue; StackerPlcTask errTask = StackerPlcTask.DefaultErrTask((int)plcId!, (int)stackerId!, i + 1); string WriteTaskErrText = stackerOperation.WriteTask(errTask, i + 1); - if(string.IsNullOrEmpty(WriteTaskErrText)) // 写入成功 + if (string.IsNullOrEmpty(WriteTaskErrText)) // 写入成功 { ConsoleLog.Success($"{stackerId} 号堆垛机，入库位置：{i + 1} 条码：{code}，写入任务成功，{errTask}"); isWriteTask = true; @@ -106,12 +106,12 @@ public class ExeTaskDoubleFork( continue; } var wcsTasks = wcsTaskDao.Select(new AppWcsTask { VehicleNo = code, TaskStatus = (int)WcsTaskStatusEnum.create }); - if(wcsTasks == default) // 查询任务失败 + if (wcsTasks == default) // 查询任务失败 { ConsoleLog.Exception($"【警告】{stackerId} 号堆垛机，入库位置：{i + 1} 条码：{code} 查找任务失败，和数据库服务器连接中断"); continue; } - if(wcsTasks.Count < 1) // 没有任务 + if (wcsTasks.Count < 1) // 没有任务 { /* 检查卸货站台是否允许卸货 */ bool allowSetGoods = conveyOperation.AllowSetVehicle(stackerId.ToString()); @@ -136,7 +136,7 @@ public class ExeTaskDoubleFork( var wcsTask = wcsTasks[0]; // 找出第一个任务 /* 校验终点是否正确 */ var destinationLocationInfo = CommonData.AppLocations.DetailWithWcsLocation(wcsTask.Destination); - if(destinationLocationInfo == default) // 任务终点错误，理论上此处不应该出现异常 + if (destinationLocationInfo == default) // 任务终点错误，理论上此处不应该出现异常 { /* 检查卸货站台是否允许卸货 */ bool allowSetGoods = conveyOperation.AllowSetVehicle(stackerId.ToString()); @@ -162,7 +162,7 @@ public class ExeTaskDoubleFork( /* 判断冲突货位是否有任务 */ var runningWcsTasks = wcsTaskDao.QueryTaskWithWcsLocation(destinationLocationInfo.InterveneLocation); if (runningWcsTasks == default) continue; // 查询失败 - if(runningWcsTasks.Count > 0) continue; // 存在冲突点位，等待 + if (runningWcsTasks.Count > 0) continue; // 存在冲突点位，等待 /* 下发任务 */ StackerPlcTask stackerTask = wcsTask.ToStackerInTask((int)stackerId!, i + 1, destinationLocationInfo); string WriteStackerTaskErrText = stackerOperation.WriteTask(stackerTask, i + 1); @@ -177,7 +177,7 @@ public class ExeTaskDoubleFork( ConsoleLog.Warning($"【警告】{stackerId} 号堆垛机，入库位置：{i + 1} 条码：{code}，写入任务失败，{stackerTask}，异常信息：{WriteStackerTaskErrText}，"); } } - if (isWriteTask) + if (isWriteTask) { string confirmResult = stackerOperation.WriteTaskConfirm(stackerId); // 写入任务确认 ConsoleLog.Info($"堆垛机：{stackerId} 入库任务写任务确认；信息：{(string.IsNullOrEmpty(confirmResult) ? "成功" : confirmResult)}"); @@ -214,7 +214,7 @@ public class ExeTaskDoubleFork( string forkStatus = CommonData.AppStackers.First(f => f.StackerId == stackerId).ForkStatus ?? ""; if (forkStatus.Length <= i || forkStatus[i] != '1') { - writeTaskCount ++; + writeTaskCount++; continue; // 获取数据失败或者货叉未开启 } var wcsTask = wcsTasks[i]; @@ -408,7 +408,7 @@ public class ExeTaskDoubleFork( if (doubleInTasks.Count == 0) return false; // 找不到对应的PlcId的任务 var doubleTask = doubleInTasks[0]; /* 判断这个任务是否出现卸货位置有货 */ - if(doubleTask.TaskStatus != (int)WcsTaskStatusEnum.doubleIn) { return false; } // 没有重复入库不执行下面方法 + if (doubleTask.TaskStatus != (int)WcsTaskStatusEnum.doubleIn) { return false; } // 没有重复入库不执行下面方法 /* 查找这个任务的新任务 */ List? newTasks = wcsTaskDao.Select(new AppWcsTask { TaskId = doubleTask.TaskId, TaskType = (int)WcsTaskTypeEnum.newTaskForDoubleIn, TaskStatus = (int)WcsTaskStatusEnum.create }); if (newTasks == default) diff --git a/WcsMain/Business/CirculationTask/Stacker/ExecuteWcsTask.cs b/WcsMain/CirculationJob/Stacker/ExecuteWcsTask.cs similarity index 99% rename from WcsMain/Business/CirculationTask/Stacker/ExecuteWcsTask.cs rename to WcsMain/CirculationJob/Stacker/ExecuteWcsTask.cs index 1d79ca3..b172728 100644 --- a/WcsMain/Business/CirculationTask/Stacker/ExecuteWcsTask.cs +++ b/WcsMain/CirculationJob/Stacker/ExecuteWcsTask.cs @@ -1,15 +1,15 @@ using CirculateTool.Attribute; using WcsMain.Business.CommonAction; using WcsMain.Common; +using WcsMain.Constant.Enum.Stacker; +using WcsMain.Constant.Enum.TaskEnum; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.Enum.Stacker; -using WcsMain.Enum.TaskEnum; using WcsMain.EquipOperation.Entity.Stacker; using WcsMain.EquipOperation.Stacker; using WcsMain.ExtendMethod; -namespace WcsMain.Business.CirculationTask.Stacker; +namespace WcsMain.CirculationJob.Stacker; /// /// 执行堆垛机任务类 diff --git a/WcsMain/Business/CirculationTask/Stacker/ExecuteWmsTask.cs b/WcsMain/CirculationJob/Stacker/ExecuteWmsTask.cs similarity index 92% rename from WcsMain/Business/CirculationTask/Stacker/ExecuteWmsTask.cs rename to WcsMain/CirculationJob/Stacker/ExecuteWmsTask.cs index a61efed..5c5c8be 100644 --- a/WcsMain/Business/CirculationTask/Stacker/ExecuteWmsTask.cs +++ b/WcsMain/CirculationJob/Stacker/ExecuteWmsTask.cs @@ -1,22 +1,19 @@ using CirculateTool.Attribute; -using WcsMain.ApiClient.DataEntity.AGVEntity; -using WcsMain.Business.AGV; -using WcsMain.Business.CommonAction; -using WcsMain.Business.Container; -using WcsMain.Constant; +using WcsMain.ApiClient.AGV; +using WcsMain.ApiClient.Shuttle; +using WcsMain.Constant.Enum.General; +using WcsMain.Constant.Enum.Stacker; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.Enum.General; -using WcsMain.Enum.Stacker; using WcsMain.EquipOperation.StackerConvey; -namespace WcsMain.Business.CirculationTask.Stacker; +namespace WcsMain.CirculationJob.Stacker; /// /// 执行仓库任务 /// [Circulation] -public class ExecuteWmsTask(AppWmsTaskDao wmsTaskDao, StackerConveyOperation stackerConveyOperation, AGVAction agvAction, ContainerAction containerAction, AppLiftInfoDao liftInfoDao) +public class ExecuteWmsTask(AppWmsTaskDao wmsTaskDao, StackerConveyOperation stackerConveyOperation, AGVWebApiAction agvAction, ShuttleWebApiAction containerAction, AppLiftInfoDao liftInfoDao) { /// /// 开始执行任务 @@ -27,7 +24,7 @@ public class ExecuteWmsTask(AppWmsTaskDao wmsTaskDao, StackerConveyOperation sta { /* 执行任务列表任务 */ List? wmsTasks = wmsTaskDao.Select(new AppWmsTask() { TaskStatus = (int)WmsTaskStatusEnum.create }); - if(wmsTasks == default) + if (wmsTasks == default) { ConsoleLog.Error("【异常】解析Wms任务时拉取任务列表失败，与数据库连接中断"); Thread.Sleep(5000); @@ -71,7 +68,7 @@ public class ExecuteWmsTask(AppWmsTaskDao wmsTaskDao, StackerConveyOperation sta private void ExecuteAGVTask(AppWmsTask wmsTask) { string errText = agvAction.Send_NO_VERIFY_BUCKET_MOVE(wmsTask); - if(!string.IsNullOrEmpty(errText)) + if (!string.IsNullOrEmpty(errText)) { ConsoleLog.Warning($"【警告】AGV点对点搬运请求AGV服务失败，任务号：{wmsTask.TaskId}，异常信息：{errText}"); return; @@ -93,8 +90,8 @@ public class ExecuteWmsTask(AppWmsTaskDao wmsTaskDao, StackerConveyOperation sta if (string.IsNullOrEmpty(midPoint)) return; // 没有可用的站台 /* 发送AGV 搬运任务 */ string errText = agvAction.Send_AGV_TASK(wmsTask.TaskId, wmsTask.Origin, midPoint); - if (!string.IsNullOrEmpty(errText)) - { + if (!string.IsNullOrEmpty(errText)) + { ConsoleLog.Warning($"【警告】入库请求AGV搬运失败，任务号：{wmsTask.TaskId}，异常信息：{errText}"); return; } @@ -109,10 +106,10 @@ public class ExecuteWmsTask(AppWmsTaskDao wmsTaskDao, StackerConveyOperation sta /// 执行出库任务 /// /// - private void ExecuteOutTask(AppWmsTask wmsTask) + private void ExecuteOutTask(AppWmsTask wmsTask) { string? midPoint = GetEmptyOutLift(wmsTask.Origin); - if(string.IsNullOrEmpty(midPoint)) return; // 没有可用站台 + if (string.IsNullOrEmpty(midPoint)) return; // 没有可用站台 /* 发送四向车搬运任务 */ string? errText = containerAction.ExecuteOutTask(wmsTask.TaskId, wmsTask.Origin, midPoint, wmsTask.VehicleNo); if (!string.IsNullOrEmpty(errText)) @@ -165,7 +162,7 @@ public class ExecuteWmsTask(AppWmsTaskDao wmsTaskDao, StackerConveyOperation sta if (model != 2 || allowAction != (short)TrueFalseEnum.TRUE || errCode != 0) continue; // 不满足执行条件 /* 查找出库任务 */ List? tasks = wmsTaskDao.Select(new() { VehicleNo = code, TaskStatus = (int)WmsTaskStatusEnum.arriveMid })?.OrderByDescending(o => o.CreateTime).ToList(); - if(tasks == null || tasks.Count == 0) continue; + if (tasks == null || tasks.Count == 0) continue; var task = tasks.First(); /* 下发任务 */ string agvErrText = agvAction.Send_AGV_TASK(task.TaskId, task.MidPoint, task.Destination); @@ -196,7 +193,7 @@ public class ExecuteWmsTask(AppWmsTaskDao wmsTaskDao, StackerConveyOperation sta foreach (var liftInfo in liftInfos) { (string errText, short model, short allowAction, short errCode, string code) = stackerConveyOperation.GetLiftInfo(liftInfo.LiftId ?? ""); - if(!string.IsNullOrEmpty(errText)) + if (!string.IsNullOrEmpty(errText)) { ConsoleLog.Warning($"【警告】提升机站台信息获取失败，异常信息：{errText}"); continue; @@ -246,7 +243,7 @@ public class ExecuteWmsTask(AppWmsTaskDao wmsTaskDao, StackerConveyOperation sta liftTaskCount.TryAdd(liftInfo.Tag ?? "", tasks.Count); } var sortLiftInfos = liftTaskCount.OrderBy(o => o.Value).ToDictionary(); - if(sortLiftInfos.Count > 0) return sortLiftInfos.First().Key; + if (sortLiftInfos.Count > 0) return sortLiftInfos.First().Key; return default; } diff --git a/WcsMain/Business/CirculationTask/Stacker/RecordErr.cs b/WcsMain/CirculationJob/Stacker/RecordErr.cs similarity index 89% rename from WcsMain/Business/CirculationTask/Stacker/RecordErr.cs rename to WcsMain/CirculationJob/Stacker/RecordErr.cs index 23aa223..d3e928e 100644 --- a/WcsMain/Business/CirculationTask/Stacker/RecordErr.cs +++ b/WcsMain/CirculationJob/Stacker/RecordErr.cs @@ -1,14 +1,12 @@ using CirculateTool.Attribute; -using WcsMain.ApiServe.Controllers.Dto.WcsDto.Stacker; -using WcsMain.ApiServe.Factory; using WcsMain.Common; +using WcsMain.Common.DataService; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.DataService; using WcsMain.EquipOperation.Stacker; using WcsMain.ExtendMethod; -namespace WcsMain.Business.CirculationTask.Stacker; +namespace WcsMain.CirculationJob.Stacker; /// /// 本类主要用于采集堆垛机报警信息 @@ -38,7 +36,7 @@ public class RecordErr(StackerOperation stackerOperation, AppErrRecorDao errReco if (errCode != 0) // 有故障 { bool isGet = errData.TryGetValue((int)stacker.StackerId, out short oldErrCode); - if(!isGet || oldErrCode != errCode) // 发生了一个新故障 + if (!isGet || oldErrCode != errCode) // 发生了一个新故障 { AddStackerErr($"Stacker{stacker.StackerId}", errCode); // 添加故障 } diff --git a/WcsMain/Business/CirculationTask/Stacker/UploadStackerStatus.cs b/WcsMain/CirculationJob/Stacker/UploadStackerStatus.cs similarity index 83% rename from WcsMain/Business/CirculationTask/Stacker/UploadStackerStatus.cs rename to WcsMain/CirculationJob/Stacker/UploadStackerStatus.cs index 895df0f..0e47529 100644 --- a/WcsMain/Business/CirculationTask/Stacker/UploadStackerStatus.cs +++ b/WcsMain/CirculationJob/Stacker/UploadStackerStatus.cs @@ -1,17 +1,18 @@ using CirculateTool.Attribute; -using WcsMain.ApiClient.DataEntity.WmsEntity; +using WcsMain.ApiClient.WMS; +using WcsMain.ApiClient.WMS.Dto; using WcsMain.Common; +using WcsMain.Constant.Enum.Stacker; using WcsMain.EquipOperation.Stacker; using WcsMain.ExtendMethod; -using WcsMain.Plugins; -namespace WcsMain.Business.CirculationTask.Stacker; +namespace WcsMain.CirculationJob.Stacker; /// /// 上传堆垛机可用状态给wms /// //[Circulation] -public class UploadStackerStatus(StackerOperation stackerOperation, WmsWebApiPost wmsWebApiPost) +public class UploadStackerStatus(StackerOperation stackerOperation, WmsBaseWebApi wmsWebApiPost) { List StackerNotOpen = []; @@ -22,7 +23,7 @@ public class UploadStackerStatus(StackerOperation stackerOperation, WmsWebApiPos var allStackers = CommonData.AppStackers; foreach (var stacker in allStackers) { - if(!StackerNotOpen.Contains(stacker.StackerId)) + if (!StackerNotOpen.Contains(stacker.StackerId)) { /* 检查堆垛机是否开放 */ var canUse = stacker.StackerStatus; @@ -49,7 +50,7 @@ public class UploadStackerStatus(StackerOperation stackerOperation, WmsWebApiPos }); continue; } - int canUse2 = (stackerInfo.ErrCode == 0 && stackerInfo.ControlModel == Enum.Stacker.StackerControlModeEnum.online && stackerInfo.StackerStatus != Enum.Stacker.StackerStatusEnum.offline) ? 1 : 0; + int canUse2 = stackerInfo.ErrCode == 0 && stackerInfo.ControlModel == StackerControlModeEnum.online && stackerInfo.StackerStatus != StackerStatusEnum.offline ? 1 : 0; uploadStackerStatusRequests.Add(new UploadStackerStatusRequest { Equipment = stacker.StackerId, diff --git a/WcsMain/Business/CirculationTask/StackerConvey/CheckAccount.cs b/WcsMain/CirculationJob/StackerConvey/CheckAccount.cs similarity index 97% rename from WcsMain/Business/CirculationTask/StackerConvey/CheckAccount.cs rename to WcsMain/CirculationJob/StackerConvey/CheckAccount.cs index df9b310..90907b0 100644 --- a/WcsMain/Business/CirculationTask/StackerConvey/CheckAccount.cs +++ b/WcsMain/CirculationJob/StackerConvey/CheckAccount.cs @@ -1,12 +1,12 @@ using CirculateTool.Attribute; using WcsMain.Business.CommonAction; +using WcsMain.Constant.Enum; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.Enum; using WcsMain.EquipOperation.Entity; using WcsMain.EquipOperation.StackerConvey; -namespace WcsMain.Business.CirculationTask.StackerConvey; +namespace WcsMain.CirculationJob.StackerConvey; /// /// 过账，PLC任务回告 ---- 库前输送线 @@ -23,7 +23,7 @@ public class CheckAccount(AppWcsTaskDao wcsTaskDao, StackerConveyOperation stack public bool CheckAccountTask() { List? taskFeedBackEntities = stackerConveyOperation.GetConveyTaskFeedBackData(20); - if (taskFeedBackEntities == default || taskFeedBackEntities.Count < 1) {return true; } + if (taskFeedBackEntities == default || taskFeedBackEntities.Count < 1) { return true; } foreach (TaskFeedBackEntity taskFeedBackEntity in taskFeedBackEntities) { if (taskFeedBackEntity.PlcId == 0) { continue; } diff --git a/WcsMain/Business/CirculationTask/StackerConvey/ExecuteScanMethod.cs b/WcsMain/CirculationJob/StackerConvey/ExecuteScanMethod.cs similarity index 85% rename from WcsMain/Business/CirculationTask/StackerConvey/ExecuteScanMethod.cs rename to WcsMain/CirculationJob/StackerConvey/ExecuteScanMethod.cs index 2772b71..6bb0b17 100644 --- a/WcsMain/Business/CirculationTask/StackerConvey/ExecuteScanMethod.cs +++ b/WcsMain/CirculationJob/StackerConvey/ExecuteScanMethod.cs @@ -1,6 +1,6 @@ using CirculateTool.Attribute; -namespace WcsMain.Business.CirculationTask.StackerConvey; +namespace WcsMain.CirculationJob.StackerConvey; //[Circulation("执行输送机扫码方法")] public class ExecuteScanMethod @@ -8,7 +8,7 @@ public class ExecuteScanMethod #region 扫码入库 - + /// /// 扫码入库 /// @@ -17,11 +17,11 @@ public class ExecuteScanMethod public bool ScanTaskIn() { //var code = StackerConveyOperation.Instance().ReadConveyCode("R1"); - + return true; } - + #endregion diff --git a/WcsMain/Business/CirculationTask/TaskData/ResolveWmsTask.cs b/WcsMain/CirculationJob/TaskData/ResolveWmsTask.cs similarity index 96% rename from WcsMain/Business/CirculationTask/TaskData/ResolveWmsTask.cs rename to WcsMain/CirculationJob/TaskData/ResolveWmsTask.cs index d6cbfed..837f53e 100644 --- a/WcsMain/Business/CirculationTask/TaskData/ResolveWmsTask.cs +++ b/WcsMain/CirculationJob/TaskData/ResolveWmsTask.cs @@ -2,16 +2,15 @@ using WcsMain.ExtendMethod; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.DataService; -using WcsMain.Business.CommonAction; using WcsMain.Common; using WcsMain.StaticData; -using System.Linq.Expressions; using WcsMain.DataBase.MixDao; -using WcsMain.Enum.Stacker; -using WcsMain.Enum.TaskEnum; +using WcsMain.ApiClient.WMS; +using WcsMain.Common.DataService; +using WcsMain.Constant.Enum.Stacker; +using WcsMain.Constant.Enum.TaskEnum; -namespace WcsMain.Business.CirculationTask.TaskData; +namespace WcsMain.CirculationJob.TaskData; /// /// WMS任务解析类 @@ -47,7 +46,7 @@ public class ResolveWmsTask(AppWmsTaskDao wmsTaskDao, SendWmsTaskStatus sendWmsT /* 校验起点终点是否在点位表 */ if (wmsTask.TaskType == (int)WmsTaskTypeEnum.inTask) { - wmsTask.Origin = string.IsNullOrEmpty(wmsTask.Origin)? "R" : wmsTask.Origin; + wmsTask.Origin = string.IsNullOrEmpty(wmsTask.Origin) ? "R" : wmsTask.Origin; } if (wmsTask.TaskType == (int)WmsTaskTypeEnum.outTask) { @@ -63,7 +62,7 @@ public class ResolveWmsTask(AppWmsTaskDao wmsTaskDao, SendWmsTaskStatus sendWmsT TaskMsg = "不受支持的起点或终点", EndTime = DateTime.Now }); - if(wmsTask.CreatePerson == StaticString.WMS) + if (wmsTask.CreatePerson == StaticString.WMS) { sendWmsTaskStatus.SendTaskErr(wmsTask.TaskId, "不受支持的起点或终点"); } @@ -73,7 +72,7 @@ public class ResolveWmsTask(AppWmsTaskDao wmsTaskDao, SendWmsTaskStatus sendWmsT TransToWcsTask(wmsTask); } - + /// /// 处理WMS任务，插入WCS任务 @@ -113,7 +112,7 @@ public class ResolveWmsTask(AppWmsTaskDao wmsTaskDao, SendWmsTaskStatus sendWmsT AppLocation? wcsDestination = CommonData.AppLocations.DetailWithWmsLocation(wmsTask.Destination); if (wcsOrigin == default || wcsDestination == default) { return; } int? plcId = dataBaseData.GetNewPlcTaskId(); - if(plcId == default) { return; } + if (plcId == default) { return; } AppWcsTask wcsTask = new() { PlcId = plcId, @@ -135,7 +134,7 @@ public class ResolveWmsTask(AppWmsTaskDao wmsTaskDao, SendWmsTaskStatus sendWmsT }; /* 插入新任务同时更新 wms 任务为排队中 */ string? errMessage = taskDao.CreateWcsTask(wcsTask); - if(string.IsNullOrWhiteSpace(errMessage)) + if (string.IsNullOrWhiteSpace(errMessage)) { ConsoleLog.Info($"【提示】任务：{wmsTask.TaskId} 已经进入队列"); return; diff --git a/WcsMain/Business/CirculationTask/TestCirculation.cs b/WcsMain/CirculationJob/TestCirculation.cs similarity index 85% rename from WcsMain/Business/CirculationTask/TestCirculation.cs rename to WcsMain/CirculationJob/TestCirculation.cs index 9f08ce4..0507aa3 100644 --- a/WcsMain/Business/CirculationTask/TestCirculation.cs +++ b/WcsMain/CirculationJob/TestCirculation.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Business.CirculationTask; +namespace WcsMain.CirculationJob; /// /// 测试类 diff --git a/WcsMain/Common/CommonData.cs b/WcsMain/Common/CommonData.cs index 2174c79..f5839ad 100644 --- a/WcsMain/Common/CommonData.cs +++ b/WcsMain/Common/CommonData.cs @@ -1,5 +1,4 @@ -using Autofac; -using System.Diagnostics.CodeAnalysis; +using System.Diagnostics.CodeAnalysis; using WcsMain.AppEntity.SystemData; using WcsMain.DataBase.TableEntity; diff --git a/WcsMain/Common/CommonTool.cs b/WcsMain/Common/CommonTool.cs index 0898011..0b0b97d 100644 --- a/WcsMain/Common/CommonTool.cs +++ b/WcsMain/Common/CommonTool.cs @@ -3,8 +3,8 @@ using PlcTool.Siemens; using SqlSugar; using System.Diagnostics.CodeAnalysis; using WcsMain.Business.CommonAction; -using WcsMain.ElTag.Atop; -using WcsMain.Tcp.Client; +using WcsMain.Business.ElTag.Atop; +using WcsMain.Utils.Tcp.Client; namespace WcsMain.Common; diff --git a/WcsMain/DataService/DataBaseData.cs b/WcsMain/Common/DataService/DataBaseData.cs similarity index 98% rename from WcsMain/DataService/DataBaseData.cs rename to WcsMain/Common/DataService/DataBaseData.cs index eb88f11..05ba6d7 100644 --- a/WcsMain/DataService/DataBaseData.cs +++ b/WcsMain/Common/DataService/DataBaseData.cs @@ -1,10 +1,9 @@ using System.Text.RegularExpressions; -using WcsMain.Common; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; -namespace WcsMain.DataService; +namespace WcsMain.Common.DataService; /// /// diff --git a/WcsMain/DataService/EnumData.cs b/WcsMain/Common/DataService/EnumData.cs similarity index 83% rename from WcsMain/DataService/EnumData.cs rename to WcsMain/Common/DataService/EnumData.cs index 815e3c5..b5cdbf8 100644 --- a/WcsMain/DataService/EnumData.cs +++ b/WcsMain/Common/DataService/EnumData.cs @@ -1,6 +1,6 @@ -using WcsMain.Enum.Stacker; +using WcsMain.Constant.Enum.Stacker; -namespace WcsMain.DataService; +namespace WcsMain.Common.DataService; /// /// 枚举的数据操作 diff --git a/WcsMain/Enum/ApiServer/ApiResponseCodeEnum.cs b/WcsMain/Constant/Enum/ApiServer/ApiResponseCodeEnum.cs similarity index 90% rename from WcsMain/Enum/ApiServer/ApiResponseCodeEnum.cs rename to WcsMain/Constant/Enum/ApiServer/ApiResponseCodeEnum.cs index a14769d..6064c25 100644 --- a/WcsMain/Enum/ApiServer/ApiResponseCodeEnum.cs +++ b/WcsMain/Constant/Enum/ApiServer/ApiResponseCodeEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.ApiServer; +namespace WcsMain.Constant.Enum.ApiServer; /// /// WMS 接口返回代码 diff --git a/WcsMain/Enum/Convey/ConveyRouterEnum.cs b/WcsMain/Constant/Enum/Convey/ConveyRouterEnum.cs similarity index 95% rename from WcsMain/Enum/Convey/ConveyRouterEnum.cs rename to WcsMain/Constant/Enum/Convey/ConveyRouterEnum.cs index 264349c..16c29f0 100644 --- a/WcsMain/Enum/Convey/ConveyRouterEnum.cs +++ b/WcsMain/Constant/Enum/Convey/ConveyRouterEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.Convey; +namespace WcsMain.Constant.Enum.Convey; /// /// 输送线写路向的枚举 @@ -57,7 +57,7 @@ public enum ConveyRouterEnum : short Router_37 = 37, Router_38 = 38, Router_39 = 39, - Router_40 = 40, + Router_40 = 40, Router_41 = 41, Router_42 = 42, Router_43 = 43, diff --git a/WcsMain/Enum/Convey/ConveyStandTypeEnum.cs b/WcsMain/Constant/Enum/Convey/ConveyStandTypeEnum.cs similarity index 81% rename from WcsMain/Enum/Convey/ConveyStandTypeEnum.cs rename to WcsMain/Constant/Enum/Convey/ConveyStandTypeEnum.cs index 2bac404..d550de9 100644 --- a/WcsMain/Enum/Convey/ConveyStandTypeEnum.cs +++ b/WcsMain/Constant/Enum/Convey/ConveyStandTypeEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.Convey; +namespace WcsMain.Constant.Enum.Convey; /// /// 箱式线站台类型 diff --git a/WcsMain/Enum/Convey/ConveyTaskStatusEnum.cs b/WcsMain/Constant/Enum/Convey/ConveyTaskStatusEnum.cs similarity index 81% rename from WcsMain/Enum/Convey/ConveyTaskStatusEnum.cs rename to WcsMain/Constant/Enum/Convey/ConveyTaskStatusEnum.cs index 8c8e0ed..132ac16 100644 --- a/WcsMain/Enum/Convey/ConveyTaskStatusEnum.cs +++ b/WcsMain/Constant/Enum/Convey/ConveyTaskStatusEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.Convey; +namespace WcsMain.Constant.Enum.Convey; /// /// 输送机任务状态枚举 diff --git a/WcsMain/Enum/Convey/ConveyTaskTypeEnum.cs b/WcsMain/Constant/Enum/Convey/ConveyTaskTypeEnum.cs similarity index 82% rename from WcsMain/Enum/Convey/ConveyTaskTypeEnum.cs rename to WcsMain/Constant/Enum/Convey/ConveyTaskTypeEnum.cs index 5614ef9..48d548f 100644 --- a/WcsMain/Enum/Convey/ConveyTaskTypeEnum.cs +++ b/WcsMain/Constant/Enum/Convey/ConveyTaskTypeEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.Convey; +namespace WcsMain.Constant.Enum.Convey; /// /// 箱式线任务类型 diff --git a/WcsMain/Enum/ElTag/ElTagTaskStatusEnum.cs b/WcsMain/Constant/Enum/ElTag/ElTagTaskStatusEnum.cs similarity index 85% rename from WcsMain/Enum/ElTag/ElTagTaskStatusEnum.cs rename to WcsMain/Constant/Enum/ElTag/ElTagTaskStatusEnum.cs index 5948956..4747c09 100644 --- a/WcsMain/Enum/ElTag/ElTagTaskStatusEnum.cs +++ b/WcsMain/Constant/Enum/ElTag/ElTagTaskStatusEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.ElTag; +namespace WcsMain.Constant.Enum.ElTag; /// /// 电子标签任务状态枚举 diff --git a/WcsMain/Enum/ElTag/ElTagTaskTypeEnum.cs b/WcsMain/Constant/Enum/ElTag/ElTagTaskTypeEnum.cs similarity index 78% rename from WcsMain/Enum/ElTag/ElTagTaskTypeEnum.cs rename to WcsMain/Constant/Enum/ElTag/ElTagTaskTypeEnum.cs index cf5ad87..00ab2ee 100644 --- a/WcsMain/Enum/ElTag/ElTagTaskTypeEnum.cs +++ b/WcsMain/Constant/Enum/ElTag/ElTagTaskTypeEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.ElTag; +namespace WcsMain.Constant.Enum.ElTag; /// /// 电子标签的任务类型 diff --git a/WcsMain/Enum/General/TrueFalseEnum.cs b/WcsMain/Constant/Enum/General/TrueFalseEnum.cs similarity index 74% rename from WcsMain/Enum/General/TrueFalseEnum.cs rename to WcsMain/Constant/Enum/General/TrueFalseEnum.cs index 186a762..09d8f94 100644 --- a/WcsMain/Enum/General/TrueFalseEnum.cs +++ b/WcsMain/Constant/Enum/General/TrueFalseEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.General; +namespace WcsMain.Constant.Enum.General; /// /// 通用枚举，0 1表示true or false diff --git a/WcsMain/Enum/Location/LocationStatusEnum.cs b/WcsMain/Constant/Enum/Location/LocationStatusEnum.cs similarity index 84% rename from WcsMain/Enum/Location/LocationStatusEnum.cs rename to WcsMain/Constant/Enum/Location/LocationStatusEnum.cs index f18dd5f..f81423f 100644 --- a/WcsMain/Enum/Location/LocationStatusEnum.cs +++ b/WcsMain/Constant/Enum/Location/LocationStatusEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.Location; +namespace WcsMain.Constant.Enum.Location; /// /// 库位状态枚举 diff --git a/WcsMain/Enum/Plc/PickTaskRouterEnum.cs b/WcsMain/Constant/Enum/Plc/PickTaskRouterEnum.cs similarity index 80% rename from WcsMain/Enum/Plc/PickTaskRouterEnum.cs rename to WcsMain/Constant/Enum/Plc/PickTaskRouterEnum.cs index dfa80fe..a6ae2be 100644 --- a/WcsMain/Enum/Plc/PickTaskRouterEnum.cs +++ b/WcsMain/Constant/Enum/Plc/PickTaskRouterEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.Plc; +namespace WcsMain.Constant.Enum.Plc; /// /// 拣选移栽机路向枚举 diff --git a/WcsMain/Enum/Plc/StackerConveyModelEnum.cs b/WcsMain/Constant/Enum/Plc/StackerConveyModelEnum.cs similarity index 50% rename from WcsMain/Enum/Plc/StackerConveyModelEnum.cs rename to WcsMain/Constant/Enum/Plc/StackerConveyModelEnum.cs index 367ac1b..a30480c 100644 --- a/WcsMain/Enum/Plc/StackerConveyModelEnum.cs +++ b/WcsMain/Constant/Enum/Plc/StackerConveyModelEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.Plc; +namespace WcsMain.Constant.Enum.Plc; public enum StackerConveyModelEnum { diff --git a/WcsMain/Enum/Plc/StackerConveyStatusEnum.cs b/WcsMain/Constant/Enum/Plc/StackerConveyStatusEnum.cs similarity index 50% rename from WcsMain/Enum/Plc/StackerConveyStatusEnum.cs rename to WcsMain/Constant/Enum/Plc/StackerConveyStatusEnum.cs index 147d541..0adf696 100644 --- a/WcsMain/Enum/Plc/StackerConveyStatusEnum.cs +++ b/WcsMain/Constant/Enum/Plc/StackerConveyStatusEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.Plc; +namespace WcsMain.Constant.Enum.Plc; public enum StackerConveyStatusEnum { diff --git a/WcsMain/Enum/SendWmsTaskStatusEnum.cs b/WcsMain/Constant/Enum/SendWmsTaskStatusEnum.cs similarity index 93% rename from WcsMain/Enum/SendWmsTaskStatusEnum.cs rename to WcsMain/Constant/Enum/SendWmsTaskStatusEnum.cs index 219f7ad..69622bc 100644 --- a/WcsMain/Enum/SendWmsTaskStatusEnum.cs +++ b/WcsMain/Constant/Enum/SendWmsTaskStatusEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum; +namespace WcsMain.Constant.Enum; /// /// 发送给 WMS 的任务状态 diff --git a/WcsMain/Enum/Stacker/StackerControlModeEnum.cs b/WcsMain/Constant/Enum/Stacker/StackerControlModeEnum.cs similarity index 87% rename from WcsMain/Enum/Stacker/StackerControlModeEnum.cs rename to WcsMain/Constant/Enum/Stacker/StackerControlModeEnum.cs index 6118e2c..2f78b3c 100644 --- a/WcsMain/Enum/Stacker/StackerControlModeEnum.cs +++ b/WcsMain/Constant/Enum/Stacker/StackerControlModeEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.Stacker; +namespace WcsMain.Constant.Enum.Stacker; /// /// 堆垛机控制方式 diff --git a/WcsMain/Enum/Stacker/StackerStatusEnum.cs b/WcsMain/Constant/Enum/Stacker/StackerStatusEnum.cs similarity index 92% rename from WcsMain/Enum/Stacker/StackerStatusEnum.cs rename to WcsMain/Constant/Enum/Stacker/StackerStatusEnum.cs index 83550c3..2907d6d 100644 --- a/WcsMain/Enum/Stacker/StackerStatusEnum.cs +++ b/WcsMain/Constant/Enum/Stacker/StackerStatusEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.Stacker; +namespace WcsMain.Constant.Enum.Stacker; /// /// 堆垛机状态 diff --git a/WcsMain/Enum/Stacker/StackerUseStatusEnum.cs b/WcsMain/Constant/Enum/Stacker/StackerUseStatusEnum.cs similarity index 83% rename from WcsMain/Enum/Stacker/StackerUseStatusEnum.cs rename to WcsMain/Constant/Enum/Stacker/StackerUseStatusEnum.cs index cf3557f..a4b62e7 100644 --- a/WcsMain/Enum/Stacker/StackerUseStatusEnum.cs +++ b/WcsMain/Constant/Enum/Stacker/StackerUseStatusEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.Stacker; +namespace WcsMain.Constant.Enum.Stacker; /// /// 堆垛机使用状态 diff --git a/WcsMain/Enum/Stacker/WcsTaskStatusEnum.cs b/WcsMain/Constant/Enum/Stacker/WcsTaskStatusEnum.cs similarity index 83% rename from WcsMain/Enum/Stacker/WcsTaskStatusEnum.cs rename to WcsMain/Constant/Enum/Stacker/WcsTaskStatusEnum.cs index 036ea75..9ce3c44 100644 --- a/WcsMain/Enum/Stacker/WcsTaskStatusEnum.cs +++ b/WcsMain/Constant/Enum/Stacker/WcsTaskStatusEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.Stacker; +namespace WcsMain.Constant.Enum.Stacker; /// /// WCS 表状态 diff --git a/WcsMain/Enum/Stacker/WcsTaskTypeEnum.cs b/WcsMain/Constant/Enum/Stacker/WcsTaskTypeEnum.cs similarity index 85% rename from WcsMain/Enum/Stacker/WcsTaskTypeEnum.cs rename to WcsMain/Constant/Enum/Stacker/WcsTaskTypeEnum.cs index 7053129..83cd811 100644 --- a/WcsMain/Enum/Stacker/WcsTaskTypeEnum.cs +++ b/WcsMain/Constant/Enum/Stacker/WcsTaskTypeEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.Stacker; +namespace WcsMain.Constant.Enum.Stacker; public enum WcsTaskTypeEnum { diff --git a/WcsMain/Enum/Stacker/WmsTaskStatusEnum.cs b/WcsMain/Constant/Enum/Stacker/WmsTaskStatusEnum.cs similarity index 90% rename from WcsMain/Enum/Stacker/WmsTaskStatusEnum.cs rename to WcsMain/Constant/Enum/Stacker/WmsTaskStatusEnum.cs index 7396d9d..f870563 100644 --- a/WcsMain/Enum/Stacker/WmsTaskStatusEnum.cs +++ b/WcsMain/Constant/Enum/Stacker/WmsTaskStatusEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.Stacker; +namespace WcsMain.Constant.Enum.Stacker; /// /// WMS任务状态枚举 diff --git a/WcsMain/Enum/Stacker/WmsTaskTypeEnum.cs b/WcsMain/Constant/Enum/Stacker/WmsTaskTypeEnum.cs similarity index 86% rename from WcsMain/Enum/Stacker/WmsTaskTypeEnum.cs rename to WcsMain/Constant/Enum/Stacker/WmsTaskTypeEnum.cs index 750f2d8..096d2a9 100644 --- a/WcsMain/Enum/Stacker/WmsTaskTypeEnum.cs +++ b/WcsMain/Constant/Enum/Stacker/WmsTaskTypeEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.Stacker; +namespace WcsMain.Constant.Enum.Stacker; /// /// Wms 的任务枚举 diff --git a/WcsMain/Enum/StandTypeEnum.cs b/WcsMain/Constant/Enum/StandTypeEnum.cs similarity index 91% rename from WcsMain/Enum/StandTypeEnum.cs rename to WcsMain/Constant/Enum/StandTypeEnum.cs index a29a140..cbff33e 100644 --- a/WcsMain/Enum/StandTypeEnum.cs +++ b/WcsMain/Constant/Enum/StandTypeEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum; +namespace WcsMain.Constant.Enum; /// /// 用于指示 点位的类型 diff --git a/WcsMain/Enum/TaskEnum/TaskCategoryEnum.cs b/WcsMain/Constant/Enum/TaskEnum/TaskCategoryEnum.cs similarity index 78% rename from WcsMain/Enum/TaskEnum/TaskCategoryEnum.cs rename to WcsMain/Constant/Enum/TaskEnum/TaskCategoryEnum.cs index 2af8f7f..8fa51d4 100644 --- a/WcsMain/Enum/TaskEnum/TaskCategoryEnum.cs +++ b/WcsMain/Constant/Enum/TaskEnum/TaskCategoryEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.TaskEnum; +namespace WcsMain.Constant.Enum.TaskEnum; /// /// 任务类别 diff --git a/WcsMain/Enum/TaskEnum/TaskTypeEnum.cs b/WcsMain/Constant/Enum/TaskEnum/TaskTypeEnum.cs similarity index 88% rename from WcsMain/Enum/TaskEnum/TaskTypeEnum.cs rename to WcsMain/Constant/Enum/TaskEnum/TaskTypeEnum.cs index 4219d70..dbe0925 100644 --- a/WcsMain/Enum/TaskEnum/TaskTypeEnum.cs +++ b/WcsMain/Constant/Enum/TaskEnum/TaskTypeEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.TaskEnum; +namespace WcsMain.Constant.Enum.TaskEnum; /// /// 任务类型 diff --git a/WcsMain/Enum/TaskFeedBackTypeEnum.cs b/WcsMain/Constant/Enum/TaskFeedBackTypeEnum.cs similarity index 85% rename from WcsMain/Enum/TaskFeedBackTypeEnum.cs rename to WcsMain/Constant/Enum/TaskFeedBackTypeEnum.cs index 87f077d..3d1df4a 100644 --- a/WcsMain/Enum/TaskFeedBackTypeEnum.cs +++ b/WcsMain/Constant/Enum/TaskFeedBackTypeEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum; +namespace WcsMain.Constant.Enum; /// /// 过账反馈类型 diff --git a/WcsMain/Enum/Tcp/TcpType.cs b/WcsMain/Constant/Enum/Tcp/TcpType.cs similarity index 78% rename from WcsMain/Enum/Tcp/TcpType.cs rename to WcsMain/Constant/Enum/Tcp/TcpType.cs index 8bd203d..81efe50 100644 --- a/WcsMain/Enum/Tcp/TcpType.cs +++ b/WcsMain/Constant/Enum/Tcp/TcpType.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.Tcp; +namespace WcsMain.Constant.Enum.Tcp; /// /// Tcp 类型 diff --git a/WcsMain/Enum/UserStatusEnum.cs b/WcsMain/Constant/Enum/UserStatusEnum.cs similarity index 79% rename from WcsMain/Enum/UserStatusEnum.cs rename to WcsMain/Constant/Enum/UserStatusEnum.cs index 2bc01be..b5d0a02 100644 --- a/WcsMain/Enum/UserStatusEnum.cs +++ b/WcsMain/Constant/Enum/UserStatusEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum; +namespace WcsMain.Constant.Enum; /// /// 用户状态枚举 diff --git a/WcsMain/WcsAttribute/AppConfig/ConfigKeyAttribute.cs b/WcsMain/Constant/WcsAttribute/AppConfig/ConfigKeyAttribute.cs similarity index 85% rename from WcsMain/WcsAttribute/AppConfig/ConfigKeyAttribute.cs rename to WcsMain/Constant/WcsAttribute/AppConfig/ConfigKeyAttribute.cs index d585ca7..2628ffb 100644 --- a/WcsMain/WcsAttribute/AppConfig/ConfigKeyAttribute.cs +++ b/WcsMain/Constant/WcsAttribute/AppConfig/ConfigKeyAttribute.cs @@ -1,4 +1,4 @@ -namespace WcsMain.WcsAttribute.AppConfig; +namespace WcsMain.Constant.WcsAttribute.AppConfig; /// /// 数据库配置键的映射 diff --git a/WcsMain/WcsAttribute/AutoFacAttribute/AutowiredAttribute.cs b/WcsMain/Constant/WcsAttribute/AutoFacAttribute/AutowiredAttribute.cs similarity index 69% rename from WcsMain/WcsAttribute/AutoFacAttribute/AutowiredAttribute.cs rename to WcsMain/Constant/WcsAttribute/AutoFacAttribute/AutowiredAttribute.cs index b757e9c..d58579a 100644 --- a/WcsMain/WcsAttribute/AutoFacAttribute/AutowiredAttribute.cs +++ b/WcsMain/Constant/WcsAttribute/AutoFacAttribute/AutowiredAttribute.cs @@ -1,4 +1,4 @@ -namespace WcsMain.WcsAttribute.AutoFacAttribute; +namespace WcsMain.Constant.WcsAttribute.AutoFacAttribute; /// diff --git a/WcsMain/WcsAttribute/AutoFacAttribute/ComponentAttribute.cs b/WcsMain/Constant/WcsAttribute/AutoFacAttribute/ComponentAttribute.cs similarity index 68% rename from WcsMain/WcsAttribute/AutoFacAttribute/ComponentAttribute.cs rename to WcsMain/Constant/WcsAttribute/AutoFacAttribute/ComponentAttribute.cs index 93f4e3e..cb05917 100644 --- a/WcsMain/WcsAttribute/AutoFacAttribute/ComponentAttribute.cs +++ b/WcsMain/Constant/WcsAttribute/AutoFacAttribute/ComponentAttribute.cs @@ -1,4 +1,4 @@ -namespace WcsMain.WcsAttribute.AutoFacAttribute; +namespace WcsMain.Constant.WcsAttribute.AutoFacAttribute; /// /// 组件 diff --git a/WcsMain/WcsAttribute/AutoFacAttribute/ServiceAttribute.cs b/WcsMain/Constant/WcsAttribute/AutoFacAttribute/ServiceAttribute.cs similarity index 75% rename from WcsMain/WcsAttribute/AutoFacAttribute/ServiceAttribute.cs rename to WcsMain/Constant/WcsAttribute/AutoFacAttribute/ServiceAttribute.cs index bf7478c..a1a531f 100644 --- a/WcsMain/WcsAttribute/AutoFacAttribute/ServiceAttribute.cs +++ b/WcsMain/Constant/WcsAttribute/AutoFacAttribute/ServiceAttribute.cs @@ -1,4 +1,4 @@ -namespace WcsMain.WcsAttribute.AutoFacAttribute; +namespace WcsMain.Constant.WcsAttribute.AutoFacAttribute; /// diff --git a/WcsMain/WcsAttribute/Clear/ClearTableAttribute.cs b/WcsMain/Constant/WcsAttribute/Clear/ClearTableAttribute.cs similarity index 89% rename from WcsMain/WcsAttribute/Clear/ClearTableAttribute.cs rename to WcsMain/Constant/WcsAttribute/Clear/ClearTableAttribute.cs index 7b48b16..004e850 100644 --- a/WcsMain/WcsAttribute/Clear/ClearTableAttribute.cs +++ b/WcsMain/Constant/WcsAttribute/Clear/ClearTableAttribute.cs @@ -1,4 +1,4 @@ -namespace WcsMain.WcsAttribute.Clear; +namespace WcsMain.Constant.WcsAttribute.Clear; /// /// 加上此特性用于标记自动清除的数据库表 diff --git a/WcsMain/DataBase/Dao/AppApiAcceptDao.cs b/WcsMain/DataBase/Dao/AppApiAcceptDao.cs index 2c38a82..7bb3455 100644 --- a/WcsMain/DataBase/Dao/AppApiAcceptDao.cs +++ b/WcsMain/DataBase/Dao/AppApiAcceptDao.cs @@ -1,7 +1,7 @@ -using WcsMain.ApiServe.Controllers.Dto.WcsDto.ApiAccept; +using WcsMain.ApiServe.Dto.WcsDto.ApiAccept; using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppApiBaseInfoDao.cs b/WcsMain/DataBase/Dao/AppApiBaseInfoDao.cs index 6cd2c93..829ca1c 100644 --- a/WcsMain/DataBase/Dao/AppApiBaseInfoDao.cs +++ b/WcsMain/DataBase/Dao/AppApiBaseInfoDao.cs @@ -1,6 +1,6 @@ using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppApiRequestDao.cs b/WcsMain/DataBase/Dao/AppApiRequestDao.cs index f7495e1..e660237 100644 --- a/WcsMain/DataBase/Dao/AppApiRequestDao.cs +++ b/WcsMain/DataBase/Dao/AppApiRequestDao.cs @@ -1,8 +1,8 @@ using System.ComponentModel; -using WcsMain.ApiServe.Controllers.Dto.WcsDto.ApiRequest; +using WcsMain.ApiServe.Dto.WcsDto.ApiRequest; using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppBaseErrDao.cs b/WcsMain/DataBase/Dao/AppBaseErrDao.cs index d70d54b..6afb2cb 100644 --- a/WcsMain/DataBase/Dao/AppBaseErrDao.cs +++ b/WcsMain/DataBase/Dao/AppBaseErrDao.cs @@ -1,6 +1,6 @@ using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppConfigDao.cs b/WcsMain/DataBase/Dao/AppConfigDao.cs index 2f4331f..1eba8c2 100644 --- a/WcsMain/DataBase/Dao/AppConfigDao.cs +++ b/WcsMain/DataBase/Dao/AppConfigDao.cs @@ -1,7 +1,7 @@ -using WcsMain.ApiServe.Controllers.Dto.WcsDto.Config; +using WcsMain.ApiServe.Dto.WcsDto.Config; using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppConveyStandDao.cs b/WcsMain/DataBase/Dao/AppConveyStandDao.cs index 9d3e1a2..f44ec12 100644 --- a/WcsMain/DataBase/Dao/AppConveyStandDao.cs +++ b/WcsMain/DataBase/Dao/AppConveyStandDao.cs @@ -1,6 +1,6 @@ using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppConveyTaskDao.cs b/WcsMain/DataBase/Dao/AppConveyTaskDao.cs index 60b582d..219397d 100644 --- a/WcsMain/DataBase/Dao/AppConveyTaskDao.cs +++ b/WcsMain/DataBase/Dao/AppConveyTaskDao.cs @@ -1,9 +1,7 @@ -using System.Threading.Tasks; -using WcsMain.ApiServe.Controllers.Dto.WcsDto.Convey; -using WcsMain.ApiServe.Controllers.Dto.WcsDto.ElTag; +using WcsMain.ApiServe.Dto.WcsDto.Convey; using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppDBDao.cs b/WcsMain/DataBase/Dao/AppDBDao.cs index d813b28..a1d4b5c 100644 --- a/WcsMain/DataBase/Dao/AppDBDao.cs +++ b/WcsMain/DataBase/Dao/AppDBDao.cs @@ -1,7 +1,7 @@ -using WcsMain.ApiServe.Controllers.Dto.WcsDto.DB; +using WcsMain.ApiServe.Dto.WcsDto.DB; using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppElTagLocationDao.cs b/WcsMain/DataBase/Dao/AppElTagLocationDao.cs index 7122d28..601bfaa 100644 --- a/WcsMain/DataBase/Dao/AppElTagLocationDao.cs +++ b/WcsMain/DataBase/Dao/AppElTagLocationDao.cs @@ -1,7 +1,7 @@ -using WcsMain.ApiServe.Controllers.Dto.WcsDto.ElTag; +using WcsMain.ApiServe.Dto.WcsDto.ElTag; using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppElTagTaskDao.cs b/WcsMain/DataBase/Dao/AppElTagTaskDao.cs index 4655171..cd7efa0 100644 --- a/WcsMain/DataBase/Dao/AppElTagTaskDao.cs +++ b/WcsMain/DataBase/Dao/AppElTagTaskDao.cs @@ -1,8 +1,8 @@ -using WcsMain.ApiServe.Controllers.Dto.WcsDto.ElTag; +using WcsMain.ApiServe.Dto.WcsDto.ElTag; using WcsMain.Common; +using WcsMain.Constant.Enum.ElTag; using WcsMain.DataBase.TableEntity; -using WcsMain.Enum.ElTag; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppErrRecorDao.cs b/WcsMain/DataBase/Dao/AppErrRecorDao.cs index 6b30911..89a267a 100644 --- a/WcsMain/DataBase/Dao/AppErrRecorDao.cs +++ b/WcsMain/DataBase/Dao/AppErrRecorDao.cs @@ -1,6 +1,6 @@ using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppLiftInfoDao.cs b/WcsMain/DataBase/Dao/AppLiftInfoDao.cs index 4ce79bf..137fec4 100644 --- a/WcsMain/DataBase/Dao/AppLiftInfoDao.cs +++ b/WcsMain/DataBase/Dao/AppLiftInfoDao.cs @@ -1,6 +1,6 @@ using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppLocationDao.cs b/WcsMain/DataBase/Dao/AppLocationDao.cs index d2b39d6..a595445 100644 --- a/WcsMain/DataBase/Dao/AppLocationDao.cs +++ b/WcsMain/DataBase/Dao/AppLocationDao.cs @@ -1,9 +1,9 @@ -using WcsMain.ApiServe.Controllers.Dto.WcsDto.Location; +using WcsMain.ApiServe.Dto.WcsDto.Location; using WcsMain.Common; +using WcsMain.Constant.Enum; +using WcsMain.Constant.Enum.Location; using WcsMain.DataBase.TableEntity; -using WcsMain.Enum; -using WcsMain.Enum.Location; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppMenuDao.cs b/WcsMain/DataBase/Dao/AppMenuDao.cs index 26be8a5..7de07d2 100644 --- a/WcsMain/DataBase/Dao/AppMenuDao.cs +++ b/WcsMain/DataBase/Dao/AppMenuDao.cs @@ -1,7 +1,7 @@ -using WcsMain.ApiServe.Controllers.Dto.WcsDto.Menu; +using WcsMain.ApiServe.Dto.WcsDto.Menu; using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppPLCDao.cs b/WcsMain/DataBase/Dao/AppPLCDao.cs index 2fa5884..09f3ce9 100644 --- a/WcsMain/DataBase/Dao/AppPLCDao.cs +++ b/WcsMain/DataBase/Dao/AppPLCDao.cs @@ -1,6 +1,6 @@ using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppRouterMethodDao.cs b/WcsMain/DataBase/Dao/AppRouterMethodDao.cs index 4a3e3be..5616fe2 100644 --- a/WcsMain/DataBase/Dao/AppRouterMethodDao.cs +++ b/WcsMain/DataBase/Dao/AppRouterMethodDao.cs @@ -1,6 +1,6 @@ using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppScanRecordDao.cs b/WcsMain/DataBase/Dao/AppScanRecordDao.cs index de29565..b2a14b7 100644 --- a/WcsMain/DataBase/Dao/AppScanRecordDao.cs +++ b/WcsMain/DataBase/Dao/AppScanRecordDao.cs @@ -1,7 +1,7 @@ -using WcsMain.ApiServe.Controllers.Dto.WcsDto.Scan; +using WcsMain.ApiServe.Dto.WcsDto.Scan; using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppSettingsDao.cs b/WcsMain/DataBase/Dao/AppSettingsDao.cs index 2b80896..17f0ba5 100644 --- a/WcsMain/DataBase/Dao/AppSettingsDao.cs +++ b/WcsMain/DataBase/Dao/AppSettingsDao.cs @@ -1,6 +1,6 @@ using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppStackerConveyDao.cs b/WcsMain/DataBase/Dao/AppStackerConveyDao.cs index 47be481..10f636e 100644 --- a/WcsMain/DataBase/Dao/AppStackerConveyDao.cs +++ b/WcsMain/DataBase/Dao/AppStackerConveyDao.cs @@ -1,6 +1,6 @@ using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppStackerDao.cs b/WcsMain/DataBase/Dao/AppStackerDao.cs index e546104..c88998a 100644 --- a/WcsMain/DataBase/Dao/AppStackerDao.cs +++ b/WcsMain/DataBase/Dao/AppStackerDao.cs @@ -1,6 +1,6 @@ using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppTcpDao.cs b/WcsMain/DataBase/Dao/AppTcpDao.cs index 9122ec2..93957e1 100644 --- a/WcsMain/DataBase/Dao/AppTcpDao.cs +++ b/WcsMain/DataBase/Dao/AppTcpDao.cs @@ -1,6 +1,6 @@ using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppUserDao.cs b/WcsMain/DataBase/Dao/AppUserDao.cs index 3555a3b..cfc1597 100644 --- a/WcsMain/DataBase/Dao/AppUserDao.cs +++ b/WcsMain/DataBase/Dao/AppUserDao.cs @@ -1,8 +1,8 @@ -using WcsMain.ApiServe.Controllers.Dto.WcsDto.User; +using WcsMain.ApiServe.Dto.WcsDto.User; using WcsMain.Common; +using WcsMain.Constant.Enum; using WcsMain.DataBase.TableEntity; -using WcsMain.Enum; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppUserGroupDao.cs b/WcsMain/DataBase/Dao/AppUserGroupDao.cs index f29aac5..0c8d318 100644 --- a/WcsMain/DataBase/Dao/AppUserGroupDao.cs +++ b/WcsMain/DataBase/Dao/AppUserGroupDao.cs @@ -1,6 +1,6 @@ using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppUserRuleDao.cs b/WcsMain/DataBase/Dao/AppUserRuleDao.cs index 03a6102..10345f9 100644 --- a/WcsMain/DataBase/Dao/AppUserRuleDao.cs +++ b/WcsMain/DataBase/Dao/AppUserRuleDao.cs @@ -1,7 +1,7 @@ -using WcsMain.ApiServe.Controllers.Dto.WcsDto.UserRule; +using WcsMain.ApiServe.Dto.WcsDto.UserRule; using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppVehicleBindingDao.cs b/WcsMain/DataBase/Dao/AppVehicleBindingDao.cs index 2f74216..6aebacd 100644 --- a/WcsMain/DataBase/Dao/AppVehicleBindingDao.cs +++ b/WcsMain/DataBase/Dao/AppVehicleBindingDao.cs @@ -1,6 +1,6 @@ using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppWcsTaskDao.cs b/WcsMain/DataBase/Dao/AppWcsTaskDao.cs index 132c1c2..10c9c72 100644 --- a/WcsMain/DataBase/Dao/AppWcsTaskDao.cs +++ b/WcsMain/DataBase/Dao/AppWcsTaskDao.cs @@ -1,10 +1,11 @@ using System.Text; -using WcsMain.ApiServe.Controllers.Dto.WcsDto.WcsTask; +using WcsMain.ApiServe.Dto.WcsDto.WcsTask; using WcsMain.Common; +using WcsMain.Common.DataService; +using WcsMain.Constant.Enum.Stacker; +using WcsMain.Constant.Enum.TaskEnum; using WcsMain.DataBase.TableEntity; -using WcsMain.Enum.Stacker; -using WcsMain.Enum.TaskEnum; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; @@ -466,7 +467,7 @@ public class AppWcsTaskDao { var sqlFuc = CommonTool.DbServe.Queryable() .Where(x => x.Destination == destination || x.Origin == destination) - .Where(x => DataService.EnumData.GetWcsTaskStatusEnumRunningStatus().Contains(x.TaskStatus)); + .Where(x => EnumData.GetWcsTaskStatusEnumRunningStatus().Contains(x.TaskStatus)); result.AddRange(sqlFuc.ToList()); } return result; diff --git a/WcsMain/DataBase/Dao/AppWmsTaskDao.cs b/WcsMain/DataBase/Dao/AppWmsTaskDao.cs index 17d9322..6b09034 100644 --- a/WcsMain/DataBase/Dao/AppWmsTaskDao.cs +++ b/WcsMain/DataBase/Dao/AppWmsTaskDao.cs @@ -1,8 +1,8 @@ -using WcsMain.ApiServe.Controllers.Dto.WcsDto.WmsTask; +using WcsMain.ApiServe.Dto.WcsDto.WmsTask; using WcsMain.Common; +using WcsMain.Constant.Enum.Stacker; using WcsMain.DataBase.TableEntity; -using WcsMain.Enum.Stacker; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/MixDao/TaskDao.cs b/WcsMain/DataBase/MixDao/TaskDao.cs index 73d34f8..743506a 100644 --- a/WcsMain/DataBase/MixDao/TaskDao.cs +++ b/WcsMain/DataBase/MixDao/TaskDao.cs @@ -1,10 +1,8 @@ -using System.Threading.Tasks; -using WcsMain.Common; -using WcsMain.DataBase.Dao; +using WcsMain.Common; +using WcsMain.Constant.Enum.Stacker; using WcsMain.DataBase.TableEntity; -using WcsMain.Enum.Stacker; using WcsMain.ExtendMethod; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.MixDao; diff --git a/WcsMain/DataBase/TableEntity/AppApiAccept.cs b/WcsMain/DataBase/TableEntity/AppApiAccept.cs index 81d4cd6..634cc98 100644 --- a/WcsMain/DataBase/TableEntity/AppApiAccept.cs +++ b/WcsMain/DataBase/TableEntity/AppApiAccept.cs @@ -1,7 +1,7 @@ using System.Text; using System.Text.Json.Serialization; using SqlSugar; -using WcsMain.WcsAttribute.Clear; +using WcsMain.Constant.WcsAttribute.Clear; namespace WcsMain.DataBase.TableEntity; diff --git a/WcsMain/DataBase/TableEntity/AppApiRequest.cs b/WcsMain/DataBase/TableEntity/AppApiRequest.cs index 4aa98a2..987716d 100644 --- a/WcsMain/DataBase/TableEntity/AppApiRequest.cs +++ b/WcsMain/DataBase/TableEntity/AppApiRequest.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; using SqlSugar; -using WcsMain.WcsAttribute.Clear; +using WcsMain.Constant.WcsAttribute.Clear; namespace WcsMain.DataBase.TableEntity; diff --git a/WcsMain/DataBase/TableEntity/AppConveyTask.cs b/WcsMain/DataBase/TableEntity/AppConveyTask.cs index 5ca683c..1bbf97d 100644 --- a/WcsMain/DataBase/TableEntity/AppConveyTask.cs +++ b/WcsMain/DataBase/TableEntity/AppConveyTask.cs @@ -1,6 +1,6 @@ using SqlSugar; using System.Text.Json.Serialization; -using WcsMain.WcsAttribute.Clear; +using WcsMain.Constant.WcsAttribute.Clear; namespace WcsMain.DataBase.TableEntity; diff --git a/WcsMain/DataBase/TableEntity/AppElTagTask.cs b/WcsMain/DataBase/TableEntity/AppElTagTask.cs index b499a6c..9485911 100644 --- a/WcsMain/DataBase/TableEntity/AppElTagTask.cs +++ b/WcsMain/DataBase/TableEntity/AppElTagTask.cs @@ -1,6 +1,6 @@ using SqlSugar; using System.Text.Json.Serialization; -using WcsMain.WcsAttribute.Clear; +using WcsMain.Constant.WcsAttribute.Clear; namespace WcsMain.DataBase.TableEntity; diff --git a/WcsMain/DataBase/TableEntity/AppErrRecord.cs b/WcsMain/DataBase/TableEntity/AppErrRecord.cs index 7f65fa0..b4f2634 100644 --- a/WcsMain/DataBase/TableEntity/AppErrRecord.cs +++ b/WcsMain/DataBase/TableEntity/AppErrRecord.cs @@ -1,6 +1,6 @@ using SqlSugar; using System.Text.Json.Serialization; -using WcsMain.WcsAttribute.Clear; +using WcsMain.Constant.WcsAttribute.Clear; namespace WcsMain.DataBase.TableEntity; diff --git a/WcsMain/DataBase/TableEntity/AppLocation.cs b/WcsMain/DataBase/TableEntity/AppLocation.cs index 4ed94ac..09a631c 100644 --- a/WcsMain/DataBase/TableEntity/AppLocation.cs +++ b/WcsMain/DataBase/TableEntity/AppLocation.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; using SqlSugar; -using WcsMain.Enum.Location; +using WcsMain.Constant.Enum.Location; namespace WcsMain.DataBase.TableEntity; diff --git a/WcsMain/DataBase/TableEntity/AppScanRecord.cs b/WcsMain/DataBase/TableEntity/AppScanRecord.cs index 5680cd1..bb2cabf 100644 --- a/WcsMain/DataBase/TableEntity/AppScanRecord.cs +++ b/WcsMain/DataBase/TableEntity/AppScanRecord.cs @@ -1,6 +1,6 @@ using SqlSugar; using System.Text.Json.Serialization; -using WcsMain.WcsAttribute.Clear; +using WcsMain.Constant.WcsAttribute.Clear; namespace WcsMain.DataBase.TableEntity; diff --git a/WcsMain/DataBase/TableEntity/AppWcsTask.cs b/WcsMain/DataBase/TableEntity/AppWcsTask.cs index 5625624..f661eda 100644 --- a/WcsMain/DataBase/TableEntity/AppWcsTask.cs +++ b/WcsMain/DataBase/TableEntity/AppWcsTask.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; using SqlSugar; -using WcsMain.WcsAttribute.Clear; +using WcsMain.Constant.WcsAttribute.Clear; namespace WcsMain.DataBase.TableEntity; diff --git a/WcsMain/DataBase/TableEntity/AppWcsTaskBak.cs b/WcsMain/DataBase/TableEntity/AppWcsTaskBak.cs index a7aef90..ddf346f 100644 --- a/WcsMain/DataBase/TableEntity/AppWcsTaskBak.cs +++ b/WcsMain/DataBase/TableEntity/AppWcsTaskBak.cs @@ -1,6 +1,6 @@ using SqlSugar; using System.Text.Json.Serialization; -using WcsMain.WcsAttribute.Clear; +using WcsMain.Constant.WcsAttribute.Clear; namespace WcsMain.DataBase.TableEntity; diff --git a/WcsMain/DataBase/TableEntity/AppWmsTask.cs b/WcsMain/DataBase/TableEntity/AppWmsTask.cs index 25bc98a..9d60c94 100644 --- a/WcsMain/DataBase/TableEntity/AppWmsTask.cs +++ b/WcsMain/DataBase/TableEntity/AppWmsTask.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; using SqlSugar; -using WcsMain.WcsAttribute.Clear; +using WcsMain.Constant.WcsAttribute.Clear; namespace WcsMain.DataBase.TableEntity; diff --git a/WcsMain/ElTag/Atop/OprTcpClient.cs b/WcsMain/ElTag/Atop/OprTcpClient.cs deleted file mode 100644 index 3266918..0000000 --- a/WcsMain/ElTag/Atop/OprTcpClient.cs +++ /dev/null @@ -1,16 +0,0 @@ -using SocketTool; -using System.Text; -using WcsMain.ElTag.Atop.Entity; -using WcsMain.Tcp.Client; -using WcsMain.WcsAttribute.AutoFacAttribute; - -namespace WcsMain.ElTag.Atop; - -/// -/// 电子标签主控制类 -/// -public class OprTcpClient : BaseTcpClient -{ - - -} diff --git a/WcsMain/EquipOperation/ConnectPLCs.cs b/WcsMain/EquipOperation/ConnectPLCs.cs index 82a586c..c6770e8 100644 --- a/WcsMain/EquipOperation/ConnectPLCs.cs +++ b/WcsMain/EquipOperation/ConnectPLCs.cs @@ -2,7 +2,7 @@ using WcsMain.Common; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.EquipOperation; diff --git a/WcsMain/EquipOperation/Convey/ConveyOperation.cs b/WcsMain/EquipOperation/Convey/ConveyOperation.cs index 86e9486..cc4e9c1 100644 --- a/WcsMain/EquipOperation/Convey/ConveyOperation.cs +++ b/WcsMain/EquipOperation/Convey/ConveyOperation.cs @@ -2,7 +2,7 @@ using System.Text.RegularExpressions; using WcsMain.Common; using WcsMain.EquipOperation.Entity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.EquipOperation.Convey; diff --git a/WcsMain/EquipOperation/ElTag/AtopOperation.cs b/WcsMain/EquipOperation/ElTag/AtopOperation.cs index 2653bde..21aa367 100644 --- a/WcsMain/EquipOperation/ElTag/AtopOperation.cs +++ b/WcsMain/EquipOperation/ElTag/AtopOperation.cs @@ -1,8 +1,8 @@ -using WcsMain.Common; -using WcsMain.ElTag.Atop.AtopEnum; -using WcsMain.ElTag.Atop.Entity; -using WcsMain.Tcp.Entity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Business.ElTag.Atop.AtopEnum; +using WcsMain.Business.ElTag.Atop.Entity; +using WcsMain.Common; +using WcsMain.Utils.Tcp.Entity; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.EquipOperation.ElTag; diff --git a/WcsMain/EquipOperation/Entity/Stacker/StackerInfo.cs b/WcsMain/EquipOperation/Entity/Stacker/StackerInfo.cs index 17e343c..a3850a3 100644 --- a/WcsMain/EquipOperation/Entity/Stacker/StackerInfo.cs +++ b/WcsMain/EquipOperation/Entity/Stacker/StackerInfo.cs @@ -1,4 +1,4 @@ -using WcsMain.Enum.Stacker; +using WcsMain.Constant.Enum.Stacker; namespace WcsMain.EquipOperation.Entity.Stacker; diff --git a/WcsMain/EquipOperation/Entity/Stacker/StackerPlcTask.cs b/WcsMain/EquipOperation/Entity/Stacker/StackerPlcTask.cs index 1055f0f..19b0630 100644 --- a/WcsMain/EquipOperation/Entity/Stacker/StackerPlcTask.cs +++ b/WcsMain/EquipOperation/Entity/Stacker/StackerPlcTask.cs @@ -1,5 +1,4 @@ -using System.Collections; -using WcsMain.Enum.Stacker; +using WcsMain.Constant.Enum.Stacker; namespace WcsMain.EquipOperation.Entity.Stacker; diff --git a/WcsMain/EquipOperation/Entity/StackerConvey/StackerConveyInfo.cs b/WcsMain/EquipOperation/Entity/StackerConvey/StackerConveyInfo.cs index 7b78e8a..c64a75d 100644 --- a/WcsMain/EquipOperation/Entity/StackerConvey/StackerConveyInfo.cs +++ b/WcsMain/EquipOperation/Entity/StackerConvey/StackerConveyInfo.cs @@ -1,4 +1,4 @@ -using WcsMain.Enum.Plc; +using WcsMain.Constant.Enum.Plc; namespace WcsMain.EquipOperation.Entity.StackerConvey; diff --git a/WcsMain/EquipOperation/Stacker/StackerOperation.cs b/WcsMain/EquipOperation/Stacker/StackerOperation.cs index d87cbfb..1f81ac5 100644 --- a/WcsMain/EquipOperation/Stacker/StackerOperation.cs +++ b/WcsMain/EquipOperation/Stacker/StackerOperation.cs @@ -1,9 +1,9 @@ using WcsMain.Common; +using WcsMain.Constant.Enum.Stacker; using WcsMain.DataBase.TableEntity; -using WcsMain.Enum.Stacker; using WcsMain.EquipOperation.Entity; using WcsMain.EquipOperation.Entity.Stacker; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.EquipOperation.Stacker; diff --git a/WcsMain/EquipOperation/StackerConvey/StackerConveyOperation.cs b/WcsMain/EquipOperation/StackerConvey/StackerConveyOperation.cs index b834099..a21c1d8 100644 --- a/WcsMain/EquipOperation/StackerConvey/StackerConveyOperation.cs +++ b/WcsMain/EquipOperation/StackerConvey/StackerConveyOperation.cs @@ -1,12 +1,10 @@ using System.Text.RegularExpressions; using System.Text; -using WcsMain.AppEntity.LED; using WcsMain.Common; -using WcsMain.Enum.Plc; using WcsMain.EquipOperation.Entity; using WcsMain.EquipOperation.Entity.StackerConvey; -using WcsMain.WcsAttribute.AutoFacAttribute; -using static System.Runtime.InteropServices.JavaScript.JSType; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.Enum.Plc; namespace WcsMain.EquipOperation.StackerConvey; @@ -61,7 +59,7 @@ public class StackerConveyOperation { return ("设备尚未连接", 0, 0, 999, ""); // 未连接PLC } - var readResult = CommonTool.Siemens.ReadByteWithName($"提升机信息{stackerConveyName}", 36); + var readResult = CommonTool.Siemens.ReadByteWithName($"提升机信息{stackerConveyName}", 26); if (!readResult.Success || readResult.Value == default) { return (readResult.Message ?? "读取失败", 0, 0, 999, ""); // 读取失败 diff --git a/WcsMain/ExtendMethod/AppWcsTaskExtendMethod.cs b/WcsMain/ExtendMethod/AppWcsTaskExtendMethod.cs index 645da84..a288a91 100644 --- a/WcsMain/ExtendMethod/AppWcsTaskExtendMethod.cs +++ b/WcsMain/ExtendMethod/AppWcsTaskExtendMethod.cs @@ -1,5 +1,5 @@ -using WcsMain.DataBase.TableEntity; -using WcsMain.Enum.Stacker; +using WcsMain.Constant.Enum.Stacker; +using WcsMain.DataBase.TableEntity; using WcsMain.EquipOperation.Entity.Stacker; namespace WcsMain.ExtendMethod; diff --git a/WcsMain/ExtendMethod/StackerExtendMethod.cs b/WcsMain/ExtendMethod/StackerExtendMethod.cs index 8530fbc..ab126ba 100644 --- a/WcsMain/ExtendMethod/StackerExtendMethod.cs +++ b/WcsMain/ExtendMethod/StackerExtendMethod.cs @@ -1,4 +1,4 @@ -using WcsMain.Enum.Stacker; +using WcsMain.Constant.Enum.Stacker; namespace WcsMain.ExtendMethod; diff --git a/WcsMain/Socket/SocketOperation.cs b/WcsMain/Socket/SocketOperation.cs index 8e86bc3..002ca06 100644 --- a/WcsMain/Socket/SocketOperation.cs +++ b/WcsMain/Socket/SocketOperation.cs @@ -4,7 +4,7 @@ using SocketTool.Entity; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; using WcsMain.Business.CommonAction; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.Socket; diff --git a/WcsMain/StartAction/AutofacModule.cs b/WcsMain/StartAction/AutofacModule.cs index c1df4a9..f225c9b 100644 --- a/WcsMain/StartAction/AutofacModule.cs +++ b/WcsMain/StartAction/AutofacModule.cs @@ -1,6 +1,6 @@ using Autofac; using System.Reflection; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.StartAction; diff --git a/WcsMain/StartAction/AutowiredSelector.cs b/WcsMain/StartAction/AutowiredSelector.cs index b2bb043..6fbb1dd 100644 --- a/WcsMain/StartAction/AutowiredSelector.cs +++ b/WcsMain/StartAction/AutowiredSelector.cs @@ -1,6 +1,6 @@ using Autofac.Core; using System.Reflection; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; namespace WcsMain.StartAction; diff --git a/WcsMain/StartAction/ServiceStart.cs b/WcsMain/StartAction/ServiceStart.cs index c3a1b83..ae99b0d 100644 --- a/WcsMain/StartAction/ServiceStart.cs +++ b/WcsMain/StartAction/ServiceStart.cs @@ -1,15 +1,14 @@ using WcsMain.Socket; using WcsMain.Common; -using WcsMain.WcsAttribute.AutoFacAttribute; -using WcsMain.Plugins; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; using System.Reflection; using WcsMain.AppEntity.SystemData; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.WcsAttribute.AppConfig; -using WcsMain.Business.Convey; -using WcsMain.ElTag.Atop; using WcsMain.EquipOperation; +using WcsMain.Business.ElTag.Atop; +using WcsMain.Constant.WcsAttribute.AppConfig; +using WcsMain.Utils.Plugins; namespace WcsMain.StartAction; diff --git a/WcsMain/Plugins/ObjectCopy.cs b/WcsMain/Utils/Plugins/ObjectCopy.cs similarity index 88% rename from WcsMain/Plugins/ObjectCopy.cs rename to WcsMain/Utils/Plugins/ObjectCopy.cs index 555e166..0f803a1 100644 --- a/WcsMain/Plugins/ObjectCopy.cs +++ b/WcsMain/Utils/Plugins/ObjectCopy.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Plugins; +namespace WcsMain.Utils.Plugins; /// @@ -27,10 +27,10 @@ public class ObjectCopy // 输入 Type inType = typeof(IN); var inProperties = inType.GetProperties(); - foreach ( var inProperty in inProperties) + foreach (var inProperty in inProperties) { var outPropertie = outProperties.FirstOrDefault(s => s.Name == inProperty.Name); - if(outPropertie == default) continue; + if (outPropertie == default) continue; outPropertie.SetValue(newClass, inProperty.GetValue(input)); } return newClass; diff --git a/WcsMain/Plugins/WcsCirculation.cs b/WcsMain/Utils/Plugins/WcsCirculation.cs similarity index 97% rename from WcsMain/Plugins/WcsCirculation.cs rename to WcsMain/Utils/Plugins/WcsCirculation.cs index 886d7e3..e62fc39 100644 --- a/WcsMain/Plugins/WcsCirculation.cs +++ b/WcsMain/Utils/Plugins/WcsCirculation.cs @@ -1,9 +1,9 @@ using Autofac; using CirculateTool.Attribute; using CirculateTool; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.WcsAttribute.AutoFacAttribute; -namespace WcsMain.Plugins; +namespace WcsMain.Utils.Plugins; /// /// 新的 WCS 定时任务类，添加 IOC 容器支持，添加非静态变量支持 diff --git a/WcsMain/Tcp/Client/BaseTcpClient.cs b/WcsMain/Utils/Tcp/Client/BaseTcpClient.cs similarity index 90% rename from WcsMain/Tcp/Client/BaseTcpClient.cs rename to WcsMain/Utils/Tcp/Client/BaseTcpClient.cs index afe9d2a..d149db1 100644 --- a/WcsMain/Tcp/Client/BaseTcpClient.cs +++ b/WcsMain/Utils/Tcp/Client/BaseTcpClient.cs @@ -1,10 +1,10 @@ using System.Text; using System.Text.RegularExpressions; +using WcsMain.Constant.Enum.General; using WcsMain.DataBase.TableEntity; -using WcsMain.Tcp.Entity; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Utils.Tcp.Entity; -namespace WcsMain.Tcp.Client; +namespace WcsMain.Utils.Tcp.Client; /// /// Wcs 的Tcp 客户端 @@ -95,11 +95,11 @@ public class BaseTcpClient { try { - if(serveData.IsConnected == Enum.General.TrueFalseEnum.TRUE) return; + if (serveData.IsConnected == TrueFalseEnum.TRUE) return; _connecting?.Invoke(serveData); serveData.TcpClient = new System.Net.Sockets.TcpClient(); serveData.TcpClient.Connect(serveData.TcpServe!.TcpIp!, (int)serveData.TcpServe.TcpPort!); - tcpServeConnectionDatas.Find(tcp => tcp.DisplayName == serveData.DisplayName)!.IsConnected = Enum.General.TrueFalseEnum.TRUE; + tcpServeConnectionDatas.Find(tcp => tcp.DisplayName == serveData.DisplayName)!.IsConnected = TrueFalseEnum.TRUE; _connectSuccess?.Invoke(serveData); while (true) { @@ -115,14 +115,14 @@ public class BaseTcpClient continue; } _connectOffline?.Invoke(serveData); - tcpServeConnectionDatas.Find(tcp => tcp.DisplayName == serveData.DisplayName)!.IsConnected = Enum.General.TrueFalseEnum.FALSE; + tcpServeConnectionDatas.Find(tcp => tcp.DisplayName == serveData.DisplayName)!.IsConnected = TrueFalseEnum.FALSE; break; } } catch (Exception ex) { _ = ex; - tcpServeConnectionDatas.Find(tcp => tcp.DisplayName == serveData.DisplayName)!.IsConnected = Enum.General.TrueFalseEnum.FALSE; + tcpServeConnectionDatas.Find(tcp => tcp.DisplayName == serveData.DisplayName)!.IsConnected = TrueFalseEnum.FALSE; _connectFail?.Invoke(serveData, ex); } } @@ -139,7 +139,7 @@ public class BaseTcpClient { foreach (var tcpServe in tcpServeConnectionDatas) { - if (tcpServe.IsConnected != Enum.General.TrueFalseEnum.FALSE) continue; + if (tcpServe.IsConnected != TrueFalseEnum.FALSE) continue; tcpServe.IsConnected = default; ConnectAsync(tcpServe); } @@ -159,13 +159,13 @@ public class BaseTcpClient List checkTasks = []; foreach (var tcpServe in tcpServeConnectionDatas) { - if (tcpServe.IsConnected == Enum.General.TrueFalseEnum.FALSE || tcpServe.IsConnected == default) continue; - // 检测与服务端是否断开 ---- 多种检测方式并存 + if (tcpServe.IsConnected == TrueFalseEnum.FALSE || tcpServe.IsConnected == default) continue; + // 检测与服务端是否断开 ---- 多种检测方式并存 checkTasks.Add(Task.Factory.StartNew(() => { // Ping 地址 bool pingok = false; - for(int i = 0; i < 4; i++) + for (int i = 0; i < 4; i++) { System.Net.NetworkInformation.Ping ping = new(); var pingResult = ping.Send(tcpServe.TcpServe!.TcpIp!, 100); @@ -173,7 +173,7 @@ public class BaseTcpClient pingok = true; break; } - if(!pingok) + if (!pingok) { tcpServe.TcpClient?.Close(); //tcpServe.IsConnected = Enum.General.TrueFalseEnum.FALSE; @@ -187,7 +187,7 @@ public class BaseTcpClient byte[] bytes = []; networkStream.Write(bytes); } - catch + catch { tcpServe.TcpClient?.Close(); //tcpServe.IsConnected = Enum.General.TrueFalseEnum.FALSE; @@ -213,7 +213,7 @@ public class BaseTcpClient foreach (var tcpServe in tcpServeConnectionDatas) { if (displayNames.Length > 0 && !displayNames.Contains(tcpServe.DisplayName)) { continue; } - if (tcpServe.TcpClient == default || tcpServe.IsConnected != Enum.General.TrueFalseEnum.TRUE) + if (tcpServe.TcpClient == default || tcpServe.IsConnected != TrueFalseEnum.TRUE) { tcpClientSendResult = new() { Success = false, Exception = new Exception($"别称：{tcpServe.DisplayName} 的Tcp连接不可用") }; } @@ -246,7 +246,7 @@ public class BaseTcpClient /// public TcpClientSendResult Send(string? value, params string[] displayNames) { - if(string.IsNullOrEmpty(value)) + if (string.IsNullOrEmpty(value)) { return new() { Success = false, Exception = new Exception("传入的值为空") }; } @@ -256,7 +256,7 @@ public class BaseTcpClient foreach (var tcpServe in tcpServeConnectionDatas) { if (displayNames.Length > 0 && !displayNames.Contains(tcpServe.DisplayName)) { continue; } - if (tcpServe.TcpClient == default || tcpServe.IsConnected != Enum.General.TrueFalseEnum.TRUE) + if (tcpServe.TcpClient == default || tcpServe.IsConnected != TrueFalseEnum.TRUE) { tcpClientSendResult = new() { Success = false, Exception = new Exception($"别称：{tcpServe.DisplayName} 的Tcp连接不可用") }; } @@ -276,7 +276,7 @@ public class BaseTcpClient })); } } - if(sendTasks.Count == 0) return new() { Success = false, Exception = new Exception("没有要发送的客户端") }; + if (sendTasks.Count == 0) return new() { Success = false, Exception = new Exception("没有要发送的客户端") }; Task.WaitAll([.. sendTasks]); return tcpClientSendResult; } diff --git a/WcsMain/Tcp/Client/PlcTcpClient.cs b/WcsMain/Utils/Tcp/Client/PlcTcpClient.cs similarity index 77% rename from WcsMain/Tcp/Client/PlcTcpClient.cs rename to WcsMain/Utils/Tcp/Client/PlcTcpClient.cs index 766a0e6..2bce237 100644 --- a/WcsMain/Tcp/Client/PlcTcpClient.cs +++ b/WcsMain/Utils/Tcp/Client/PlcTcpClient.cs @@ -1,10 +1,10 @@ using System.Diagnostics; using System.Text.RegularExpressions; -using WcsMain.Tcp.Entity; -using WcsMain.Tcp.Entity.Message; -using WcsMain.WcsAttribute.AutoFacAttribute; +using WcsMain.Constant.Enum.General; +using WcsMain.Utils.Tcp.Entity; +using WcsMain.Utils.Tcp.Entity.Message; -namespace WcsMain.Tcp.Client; +namespace WcsMain.Utils.Tcp.Client; /// /// 专用与连接 PLC 的Tcp客户端 @@ -29,7 +29,7 @@ public class PlcTcpClient : BaseTcpClient { foreach (var tcpServe in tcpServeConnectionDatas) { - if (tcpServe.IsConnected == Enum.General.TrueFalseEnum.FALSE || tcpServe.IsConnected == default) continue; + if (tcpServe.IsConnected == TrueFalseEnum.FALSE || tcpServe.IsConnected == default) continue; // 计算上一次接收消息的时间和当前的时间差，超过三秒判断断开 var lastRevMsgTime = tcpServe.RecvMsgTime; var timespan = DateTime.Now - lastRevMsgTime; @@ -37,7 +37,7 @@ public class PlcTcpClient : BaseTcpClient if (timespanSeconds > 3) // 心跳超时时间 { tcpServe.TcpClient?.Close(); - tcpServe.IsConnected = Enum.General.TrueFalseEnum.FALSE; + tcpServe.IsConnected = TrueFalseEnum.FALSE; continue; } } @@ -58,17 +58,17 @@ public class PlcTcpClient : BaseTcpClient return new() { Success = false, Exception = new Exception("传入的参数为空") }; } MsgHeader? header = GetMsgHeader(value); - if(header == default || string.IsNullOrEmpty(header.MsgId)) return new() { Success = false, Exception = new Exception("发送的信息不是标准报文格式") }; + if (header == default || string.IsNullOrEmpty(header.MsgId)) return new() { Success = false, Exception = new Exception("发送的信息不是标准报文格式") }; Stopwatch stopwatch = Stopwatch.StartNew(); var sendResult = Send(value, displayName); // 发送消息 - if(!sendResult.Success) return new() { Success = sendResult.Success, Exception = sendResult.Exception }; // 发送失败 + if (!sendResult.Success) return new() { Success = sendResult.Success, Exception = sendResult.Exception }; // 发送失败 MsgInfo? msgInfo = default; while (stopwatch.ElapsedMilliseconds < timeout) { bool exist = msgInfos.TryGetValue(header.MsgId, out msgInfo); if (exist) break; } - if(msgInfo == default) return new() { Success = false, Exception = new Exception("发送的信息不是标准报文格式"), UseTime = stopwatch.ElapsedMilliseconds}; + if (msgInfo == default) return new() { Success = false, Exception = new Exception("发送的信息不是标准报文格式"), UseTime = stopwatch.ElapsedMilliseconds }; return new() { Success = true, @@ -87,7 +87,7 @@ public class PlcTcpClient : BaseTcpClient if (string.IsNullOrEmpty(value)) return default; if (!Regex.IsMatch(value, "^<.+\\>$")) return default; string[] msgDatas = value.Split(';'); - if(msgDatas.Length < 4 ) return default; + if (msgDatas.Length < 4) return default; var msgHeader = new MsgHeader() { MsgType = msgDatas[0].Replace("<", ""), diff --git a/WcsMain/Tcp/Entity/Convey/GetRouterData.cs b/WcsMain/Utils/Tcp/Entity/Convey/GetRouterData.cs similarity index 89% rename from WcsMain/Tcp/Entity/Convey/GetRouterData.cs rename to WcsMain/Utils/Tcp/Entity/Convey/GetRouterData.cs index 171343a..78c4a0f 100644 --- a/WcsMain/Tcp/Entity/Convey/GetRouterData.cs +++ b/WcsMain/Utils/Tcp/Entity/Convey/GetRouterData.cs @@ -1,6 +1,6 @@ -using WcsMain.Tcp.Entity.Message; +using WcsMain.Utils.Tcp.Entity.Message; -namespace WcsMain.Tcp.Entity.Convey; +namespace WcsMain.Utils.Tcp.Entity.Convey; /// /// PLC 向WCS请求分拣口时的请求数据 @@ -10,7 +10,7 @@ public class GetRouterData : MsgHeader /// /// 请求位置 /// - public string? Area { get; set; } + public string? Area { get; set; } /// /// 分拣口庄涛 diff --git a/WcsMain/Tcp/Entity/Convey/SetRouterData.cs b/WcsMain/Utils/Tcp/Entity/Convey/SetRouterData.cs similarity index 92% rename from WcsMain/Tcp/Entity/Convey/SetRouterData.cs rename to WcsMain/Utils/Tcp/Entity/Convey/SetRouterData.cs index 57c9c62..2c46fdf 100644 --- a/WcsMain/Tcp/Entity/Convey/SetRouterData.cs +++ b/WcsMain/Utils/Tcp/Entity/Convey/SetRouterData.cs @@ -1,6 +1,6 @@ -using WcsMain.Tcp.Entity.Message; +using WcsMain.Utils.Tcp.Entity.Message; -namespace WcsMain.Tcp.Entity.Convey; +namespace WcsMain.Utils.Tcp.Entity.Convey; /// /// 回复 PLC 路向的实体 @@ -55,7 +55,7 @@ public class SetRouterData : MsgHeader /// /// 路向 /// - public int? Router { get; set; } + public int? Router { get; set; } /// /// 备用1 diff --git a/WcsMain/Tcp/Entity/Message/MsgHeader.cs b/WcsMain/Utils/Tcp/Entity/Message/MsgHeader.cs similarity index 75% rename from WcsMain/Tcp/Entity/Message/MsgHeader.cs rename to WcsMain/Utils/Tcp/Entity/Message/MsgHeader.cs index 1d8729f..95e27c8 100644 --- a/WcsMain/Tcp/Entity/Message/MsgHeader.cs +++ b/WcsMain/Utils/Tcp/Entity/Message/MsgHeader.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Tcp.Entity.Message; +namespace WcsMain.Utils.Tcp.Entity.Message; /// /// PLC 报文的消息头 @@ -8,7 +8,7 @@ public class MsgHeader /// /// 消息类型 /// - public string? MsgType { get; set; } + public string? MsgType { get; set; } /// /// 客户端编号 @@ -23,7 +23,7 @@ public class MsgHeader /// /// 消息标记 /// - public string? MsgTag { get; set; } + public string? MsgTag { get; set; } } diff --git a/WcsMain/Tcp/Entity/Message/MsgInfo.cs b/WcsMain/Utils/Tcp/Entity/Message/MsgInfo.cs similarity index 93% rename from WcsMain/Tcp/Entity/Message/MsgInfo.cs rename to WcsMain/Utils/Tcp/Entity/Message/MsgInfo.cs index 84002fc..723e382 100644 --- a/WcsMain/Tcp/Entity/Message/MsgInfo.cs +++ b/WcsMain/Utils/Tcp/Entity/Message/MsgInfo.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Tcp.Entity.Message; +namespace WcsMain.Utils.Tcp.Entity.Message; /// /// PLC报文的详细信息 diff --git a/WcsMain/Tcp/Entity/PlcTcpClientSendResult.cs b/WcsMain/Utils/Tcp/Entity/PlcTcpClientSendResult.cs similarity index 76% rename from WcsMain/Tcp/Entity/PlcTcpClientSendResult.cs rename to WcsMain/Utils/Tcp/Entity/PlcTcpClientSendResult.cs index 00cb4fe..4f5099b 100644 --- a/WcsMain/Tcp/Entity/PlcTcpClientSendResult.cs +++ b/WcsMain/Utils/Tcp/Entity/PlcTcpClientSendResult.cs @@ -1,6 +1,6 @@ -using WcsMain.Tcp.Entity.Message; +using WcsMain.Utils.Tcp.Entity.Message; -namespace WcsMain.Tcp.Entity; +namespace WcsMain.Utils.Tcp.Entity; public class PlcTcpClientSendResult : TcpClientSendResult { diff --git a/WcsMain/Tcp/Entity/TcpClientSendResult.cs b/WcsMain/Utils/Tcp/Entity/TcpClientSendResult.cs similarity index 89% rename from WcsMain/Tcp/Entity/TcpClientSendResult.cs rename to WcsMain/Utils/Tcp/Entity/TcpClientSendResult.cs index 2fd0933..3730b62 100644 --- a/WcsMain/Tcp/Entity/TcpClientSendResult.cs +++ b/WcsMain/Utils/Tcp/Entity/TcpClientSendResult.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Tcp.Entity; +namespace WcsMain.Utils.Tcp.Entity; /// /// 作为 Tcp客户端发送时的返回信息 diff --git a/WcsMain/Tcp/Entity/TcpServeConnectionData.cs b/WcsMain/Utils/Tcp/Entity/TcpServeConnectionData.cs similarity index 84% rename from WcsMain/Tcp/Entity/TcpServeConnectionData.cs rename to WcsMain/Utils/Tcp/Entity/TcpServeConnectionData.cs index 5e93bea..275c724 100644 --- a/WcsMain/Tcp/Entity/TcpServeConnectionData.cs +++ b/WcsMain/Utils/Tcp/Entity/TcpServeConnectionData.cs @@ -1,8 +1,8 @@ using System.Net.Sockets; +using WcsMain.Constant.Enum.General; using WcsMain.DataBase.TableEntity; -using WcsMain.Enum.General; -namespace WcsMain.Tcp.Entity; +namespace WcsMain.Utils.Tcp.Entity; /// @@ -10,11 +10,11 @@ namespace WcsMain.Tcp.Entity; /// public class TcpServeConnectionData { - + /// /// 基础信息 /// - public AppTcp? TcpServe { get; set; } + public AppTcp? TcpServe { get; set; } /// /// 别称 @@ -24,7 +24,7 @@ public class TcpServeConnectionData /// /// Tcp客户端连接 /// - public TcpClient? TcpClient { get; set; } + public TcpClient? TcpClient { get; set; } /// /// 是否连接 diff --git a/WcsMain/WebSocket/WebSocketOperation.cs b/WcsMain/Utils/WebSocket/WebSocketOperation.cs similarity index 97% rename from WcsMain/WebSocket/WebSocketOperation.cs rename to WcsMain/Utils/WebSocket/WebSocketOperation.cs index 637ecda..54159ab 100644 --- a/WcsMain/WebSocket/WebSocketOperation.cs +++ b/WcsMain/Utils/WebSocket/WebSocketOperation.cs @@ -1,4 +1,4 @@ -namespace WcsMain.WebSocket; +namespace WcsMain.Utils.WebSocket; public class WebSocketOperation { diff --git a/WcsMain/WcsMain.csproj b/WcsMain/WcsMain.csproj index 38bfafe..5d19db2 100644 --- a/WcsMain/WcsMain.csproj +++ b/WcsMain/WcsMain.csproj @@ -37,10 +37,14 @@ - + + + + - - + + +