fix

WCS.Core/LogicHandler.cs

@@ -6,8 +6,8 @@ using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using WCS.BaseExtensions;
 using WCS.Entity;
-using WCS.Service;
 
 namespace WCS.Core
 {

WCS.Core/Properties/PublishProfiles/FolderProfile.pubxml

@@ -8,6 +8,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>D:\XM\Release\DLL</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <VersionPrefix>1.0.5</VersionPrefix>
+    <VersionPrefix>1.0.6</VersionPrefix>
   </PropertyGroup>
 </Project>

WCS.Core/WCS.Core.csproj

@@ -13,6 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="HslCommunication" Version="6.2.2" />
+    <PackageReference Include="WCS.BaseExtensions" Version="1.0.1" />
     <PackageReference Include="WCS.DbHelper" Version="1.0.0" />
     <PackageReference Include="WCS.Entity" Version="1.0.3" />
     <PackageReference Include="WCS.Redis" Version="1.0.2" />

WCS.Service/Program.cs

@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Hosting;
 using System.Runtime.InteropServices;
 using WCS.Core;
+using WCS.WebApi;
 
 namespace WCS.Service
 {

WCS.Service/Uploader.cs

@@ -1,6 +1,7 @@
 using DbHelper;
 using Log;
 using WCS.Entity;
+using WCS.WebApi.WMS;
 
 namespace WCS.Service
 {

WCS.Service/WCS.Service.csproj

@@ -25,8 +25,9 @@
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.8" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
-    <PackageReference Include="WCS.Core" Version="1.0.5" />
+    <PackageReference Include="WCS.Core" Version="1.0.6" />
     <PackageReference Include="WCS.Entity.Protocol" Version="1.0.1" />
     <PackageReference Include="WCS.Virtual_PLC" Version="1.0.0" />
+    <PackageReference Include="WCS.WebApi" Version="1.0.1" />
   </ItemGroup>
 </Project>

WCS.Service/Worker.cs

@@ -11,6 +11,7 @@ using WCS.Entity.Protocol;
 using WCS.Entity.Protocol.BCR;
 using WCS.Entity.Protocol.Station;
 using WCS.Virtual_PLC;
+using WCS.WebApi.WMS;
 
 namespace WCS.Service
 {
@@ -68,7 +69,7 @@ namespace WCS.Service
                 db.Default.CodeFirst.InitTables(typeof(WCS_AGVTask));
                 db.Default.CodeFirst.InitTables(typeof(WCS_DEVICEPROTOCOL));
                 db.Default.CodeFirst.InitTables(typeof(WCS_GROUPMEMBER));
-                db.Default.CodeFirst.InitTables(typeof(Entity.WCS_MAPPINGENTRY));
+                db.Default.CodeFirst.InitTables(typeof(WCS_MAPPINGENTRY));
                 db.Default.CodeFirst.InitTables(typeof(WCS_USERS));
                 db.Default.CodeFirst.InitTables(typeof(WCS_StatusLog));
                 db.Default.CodeFirst.InitTables(typeof(WCS_BCR80));
@@ -148,29 +149,29 @@ namespace WCS.Service
 
                 #region 设备扩展数据配置
 
-                WCS_DEVICEExtension.AddFlag(DF.一楼RGV放货, "G1035", "G1044", "G1053", "G1062");
-                WCS_DEVICEExtension.AddFlag(DF.SRM, "SRM1", "SRM2", "SRM3", "SRM4", "SRM5", "SRM6", "SRM7", "SRM8");
-                WCS_DEVICEExtension.AddFlag(DF.月台, "G1469", "G1561", "G1538", "G1574", "G1509");
-                WCS_DEVICEExtension.AddFlag(DF.SRM二级品取货, "1040", "1041", "1042", "1043", "1049", "1050", "1051", "1052");
-                WCS_DEVICEExtension.AddFlag(DF.SRM二级品取货, "1058", "1059", "1060", "1061", "1067", "1068");
-                WCS_DEVICEExtension.AddFlag(DF.SRMBOPP取货, "1195", "1194", "1193", "1192", "1204", "1203", "1202", "1201");
-                WCS_DEVICEExtension.AddFlag(DF.SRMBOPP取货, "1213", "1212", "1210", "1211", "1220", "1219", "1230", "1228");
-                WCS_DEVICEExtension.AddFlag(DF.SRM月台放货, "1473", "1476", "1474", "1475", "1491", "1492", "1493", "1494");
-                WCS_DEVICEExtension.AddFlag(DF.SRM月台放货, "1520", "1521", "1522", "1523", "1545", "1546", "1451", "1453");
-                WCS_DEVICEExtension.AddFlag(DF.SRM涂布取货, "1431", "1432", "1422", "1423", "1424", "1425", "1415", "1416");
-                WCS_DEVICEExtension.AddFlag(DF.SRM涂布取货, "1605", "1606", "1406", "1407", "1408", "1409");
-                WCS_DEVICEExtension.AddFlag(DF.SRM涂布放货, "1283", "1284", "1290", "1291", "1292", "1293", "1299", "1300");
-                WCS_DEVICEExtension.AddFlag(DF.SRM涂布放货, "1301", "1302", "1308", "1309", "1310", "1311");
-                WCS_DEVICEExtension.AddFlag(DF.涂布RGV, "RGV9", "RGV10", "RGV11", "RGV12", "RGV13", "RGV14");
-                WCS_DEVICEExtension.AddFlag(DF.涂布RGV取货设备组, "G2", "G3", "G5", "G7", "G9", "G11");
-                WCS_DEVICEExtension.AddFlag(DF.涂布RGV放货设备组, "G1", "G4", "G6", "G8", "G10");
-                WCS_DEVICEExtension.AddFlag(DF.涂布出库RGV取货站台, "1285", "1286", "1294", "1295", "1303", "1304", "1312", "1313");
-                WCS_DEVICEExtension.AddFlag(DF.涂布入库RGV取货站台, "1391", "1392", "1399", "1400");
-                WCS_DEVICEExtension.AddFlag(DF.涂布RGV取货站台, "1285", "1286", "1294", "1295", "1303", "1304", "1312", "1313");
-                WCS_DEVICEExtension.AddFlag(DF.涂布RGV取货站台, "1391", "1392", "1399", "1400");
-                WCS_DEVICEExtension.AddFlag(DF.BOPPRGV, "RGV1", "RGV2", "RGV3", "RGV4", "RGV5", "RGV6", "RGV7");
-                WCS_DEVICEExtension.AddFlag(DF.BOPPRGV取货设备组, "G19", "G23");
-                WCS_DEVICEExtension.AddFlag(DF.BOPPRGV放货设备组, "G12", "G13", "G14", "G15", "G16");
+                //WCS_DEVICEExtension.AddFlag(DF.一楼RGV放货, "G1035", "G1044", "G1053", "G1062");
+                //WCS_DEVICEExtension.AddFlag(DF.SRM, "SRM1", "SRM2", "SRM3", "SRM4", "SRM5", "SRM6", "SRM7", "SRM8");
+                //WCS_DEVICEExtension.AddFlag(DF.月台, "G1469", "G1561", "G1538", "G1574", "G1509");
+                //WCS_DEVICEExtension.AddFlag(DF.SRM二级品取货, "1040", "1041", "1042", "1043", "1049", "1050", "1051", "1052");
+                //WCS_DEVICEExtension.AddFlag(DF.SRM二级品取货, "1058", "1059", "1060", "1061", "1067", "1068");
+                //WCS_DEVICEExtension.AddFlag(DF.SRMBOPP取货, "1195", "1194", "1193", "1192", "1204", "1203", "1202", "1201");
+                //WCS_DEVICEExtension.AddFlag(DF.SRMBOPP取货, "1213", "1212", "1210", "1211", "1220", "1219", "1230", "1228");
+                //WCS_DEVICEExtension.AddFlag(DF.SRM月台放货, "1473", "1476", "1474", "1475", "1491", "1492", "1493", "1494");
+                //WCS_DEVICEExtension.AddFlag(DF.SRM月台放货, "1520", "1521", "1522", "1523", "1545", "1546", "1451", "1453");
+                //WCS_DEVICEExtension.AddFlag(DF.SRM涂布取货, "1431", "1432", "1422", "1423", "1424", "1425", "1415", "1416");
+                //WCS_DEVICEExtension.AddFlag(DF.SRM涂布取货, "1605", "1606", "1406", "1407", "1408", "1409");
+                //WCS_DEVICEExtension.AddFlag(DF.SRM涂布放货, "1283", "1284", "1290", "1291", "1292", "1293", "1299", "1300");
+                //WCS_DEVICEExtension.AddFlag(DF.SRM涂布放货, "1301", "1302", "1308", "1309", "1310", "1311");
+                //WCS_DEVICEExtension.AddFlag(DF.涂布RGV, "RGV9", "RGV10", "RGV11", "RGV12", "RGV13", "RGV14");
+                //WCS_DEVICEExtension.AddFlag(DF.涂布RGV取货设备组, "G2", "G3", "G5", "G7", "G9", "G11");
+                //WCS_DEVICEExtension.AddFlag(DF.涂布RGV放货设备组, "G1", "G4", "G6", "G8", "G10");
+                //WCS_DEVICEExtension.AddFlag(DF.涂布出库RGV取货站台, "1285", "1286", "1294", "1295", "1303", "1304", "1312", "1313");
+                //WCS_DEVICEExtension.AddFlag(DF.涂布入库RGV取货站台, "1391", "1392", "1399", "1400");
+                //WCS_DEVICEExtension.AddFlag(DF.涂布RGV取货站台, "1285", "1286", "1294", "1295", "1303", "1304", "1312", "1313");
+                //WCS_DEVICEExtension.AddFlag(DF.涂布RGV取货站台, "1391", "1392", "1399", "1400");
+                //WCS_DEVICEExtension.AddFlag(DF.BOPPRGV, "RGV1", "RGV2", "RGV3", "RGV4", "RGV5", "RGV6", "RGV7");
+                //WCS_DEVICEExtension.AddFlag(DF.BOPPRGV取货设备组, "G19", "G23");
+                //WCS_DEVICEExtension.AddFlag(DF.BOPPRGV放货设备组, "G12", "G13", "G14", "G15", "G16");
 
                 #endregion 设备扩展数据配置
 

WCS.WebApi/APICaller.cs

@@ -8,7 +8,7 @@ using System.Net;
 using System.Text;
 using static System.Net.WebRequest;
 
-namespace WCS.Service
+namespace WCS.WebApi
 {
     public class APICaller
     {

WCS.WebApi/Properties/PublishProfiles/FolderProfile.pubxml

@@ -8,6 +8,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>D:\XM\Release\DLL</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <VersionPrefix>1.0.0</VersionPrefix>
+    <VersionPrefix>1.0.1</VersionPrefix>
   </PropertyGroup>
 </Project>

WCS.WebApi/Startup.cs

@@ -5,7 +5,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.OpenApi.Models;
 
-namespace WCS.Service
+namespace WCS.WebApi
 {
     public class Startup
     {

WCS.WebApi/ViewModels/DeviceStatusViewModel.cs

@@ -1,7 +1,7 @@
 #nullable enable
 using WCS.Entity;
 
-namespace WCS.Service.WebApi.ViewModels
+namespace WCS.WebApi.ViewModels
 {
     public class DeviceStatusViewModel
     {

WCS.WebApi/ViewModels/KeyValueViewModel.cs

@@ -1,4 +1,4 @@
-namespace WCS.Service.WebApi
+namespace WCS.WebApi.ViewModels
 {
     public class KeyValueViewModel<key, value>
     {

WCS.WebApi/WCS.WebApi.csproj

@@ -1,16 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
+    <Description>WMS接口调用及WCS开放的接口</Description>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.8" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
-    <PackageReference Include="WCS.BaseExtensions" Version="1.0.1" />
-    <PackageReference Include="WCS.Core" Version="1.0.5" />
+    <PackageReference Include="WCS.Core" Version="1.0.6" />
     <PackageReference Include="WCS.Entity.Protocol" Version="1.0.1" />
   </ItemGroup>
 

WCS.WebApi/WCSApi.cs

@@ -5,9 +5,10 @@ using System.Collections.Generic;
 using System.Linq;
 using WCS.Entity;
 using WCS.Entity.Protocol;
-using WCS.Service.Entity;
+using WCS.WebApi.WMS;
+using WCS.WebApi.WMS.Response;
 
-namespace WCS.Service.WebApi
+namespace WCS.WebApi
 {
     [ApiController]
     [Route("[controller]/[action]")]

WCS.WebApi/WMS/PushCreateWcsTaskRequest.cs

@@ -1,4 +1,4 @@
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS
 {
     public class PushCreateWcsTaskRequest
     {
@@ -80,4 +80,4 @@
         /// </summary>
         public int Type { get; set; }
     }
-}
+}

WCS.WebApi/WMS/Request/GetProductInfoRequest.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS.Request
 {
     public class GetProductInfoRequest
     {

WCS.WebApi/WMS/Request/I_WCS_GetExcTaskRequest.cs

@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Text;
+using System.ComponentModel.DataAnnotations;
 
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS.Request
 {
     /// <summary>
     /// 获取异常任务请求实体
@@ -15,16 +12,19 @@ namespace WCS.Service.Entity
         /// </summary>
         [Required(ErrorMessage = "{0} 不可为空")]
         public string EquipmentNo { get; set; }
+
         /// <summary>
         /// 异常代码
         /// </summary>
         [Required(ErrorMessage = "{0} 不可为空")]
         public string ExcCode { get; set; }
+
         /// <summary>
         /// 异常消息
         /// </summary>
         [Required(ErrorMessage = "{0} 不可为空")]
         public string ExcMessage { get; set; }
+
         public string Memo1 { get; set; }
         public string Memo2 { get; set; }
     }

WCS.WebApi/WMS/Request/I_WCS_GetInTaskRequest.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS.Request
 {
     /// <summary>
     /// 获取入库任务请求实体
@@ -51,4 +51,4 @@ namespace WCS.Service.Entity
         public string Memo3 { get; set; }
         public string Memo4 { get; set; }
     }
-}
+}

WCS.WebApi/WMS/Request/I_WCS_GetMoveTaskRequest.cs

@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Text;
+using System.ComponentModel.DataAnnotations;
 
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS.Request
 {
     public class I_WCS_GetMoveTaskRequest
     {
@@ -12,10 +9,12 @@ namespace WCS.Service.Entity
         /// </summary>
         [Required(ErrorMessage = "{0} 不可为空")]
         public string WMSTaskNum { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>
         public string Memo1 { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>

WCS.WebApi/WMS/Request/I_WCS_GetOutTaskRequest.cs

@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Text;
+using System.ComponentModel.DataAnnotations;
 
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS.Request
 {
     /// <summary>
     /// 获取出库任务请求实体
@@ -15,34 +12,39 @@ namespace WCS.Service.Entity
         /// </summary>
         [Required(ErrorMessage = "{0} 不可为空")]
         public string OutEndPostion { get; set; }
+
         /// <summary>
         /// 出库类型（0.无效参数；1.物料出库；2.空托盘出库；3.空铁架出库；）
         /// </summary>
         [Required(ErrorMessage = "{0} 不可为空")]
         public int OutType { get; set; }
+
         /// <summary>
         /// 仓库编码
         /// </summary>
         [Required(ErrorMessage = "{0} 不可为空")]
         public string WareHouseId { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>
         public string Memo1 { get; set; }
+
         /// <summary>
         /// 备用 空托盘类型0，1，2，3
         /// </summary>
-        public string Memo2 { get; set; } 
-       
+        public string Memo2 { get; set; }
 
         /// <summary>
         /// OutId
         /// </summary>
         public string OutId { get; set; }
+
         /// <summary>
         /// 熟化时间(小时：10,16)
         /// </summary>
         public decimal TASK_MatureDate { get; set; }
+
         /// <summary>
         /// 熟化温度(小数)
         /// </summary>

WCS.WebApi/WMS/Request/I_WCS_GetTunnelListRequest.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS.Request
 {
     /// <summary>
     /// 获取产品巷道信息请求参数
@@ -24,4 +24,4 @@ namespace WCS.Service.Entity
         /// </summary>
         public string Memo2 { get; set; }
     }
-}
+}

WCS.WebApi/WMS/Request/I_WCS_GetWareCellRequest.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS.Request
 {
     /// <summary>
     /// 分配货位请求实体
@@ -48,4 +48,4 @@ namespace WCS.Service.Entity
         货叉1 = 1,
         货叉2 = 2,
     }
-}
+}

WCS.WebApi/WMS/Request/I_WCS_GetWeightRequest.cs

@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Text;
+using System.ComponentModel.DataAnnotations;
 
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS.Request
 {
     /// <summary>
     /// 称重信息上传请求参数
@@ -15,15 +12,18 @@ namespace WCS.Service.Entity
         /// </summary>
         [Required(ErrorMessage = "{0} 不可为空")]
         public string WMSTaskNum { get; set; }
+
         /// <summary>
         /// 重量
         /// </summary>
         [Required(ErrorMessage = "{0} 不可为空")]
         public decimal Weight { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>
         public string Memo1 { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>

WCS.WebApi/WMS/Request/I_WCS_PutDevInfoRequest.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS.Request
 {
     /// <summary>
     /// 传递设备信息请求实体
@@ -11,15 +7,18 @@ namespace WCS.Service.Entity
     {
         //设备编号
         public string STA_EQUIPMENTNO { get; set; }
+
         //故障代码
         public string STA_ALARMS { get; set; }
+
         //故障信息
         public string STA_ALARMSMSG { get; set; }
+
         //PLC信息
         public string STA_DATA { get; set; }
     }
+
     public class I_WCS_PutDevInfoRequestDto : I_WCS_PutDevInfoRequest
     {
- 
     }
 }

WCS.WebApi/WMS/Request/I_WCS_PutTaskStepRequest.cs

@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS.Request
 {
     public class I_WCS_PutTaskStepRequest
     {
@@ -122,4 +122,4 @@ namespace WCS.Service.Entity
 
         public int Size { get; set; }
     }
-}
+}

WCS.WebApi/WMS/Request/I_WMS_CreateTasksRequest.cs

@@ -1,68 +1,79 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS.Request
 {
     public class I_WMS_CreateTasksRequest
     {
         public string WMSTaskNum { get; set; }
+
         /// <summary>
         /// 任务类型
         /// </summary>
         public int TaskType { get; set; }
+
         /// <summary>
         /// 任务状态
         /// </summary>
         public int TaskState { get; set; }
+
         /// <summary>
         /// 起点地址
         /// </summary>
         public string FromLocation { get; set; }
+
         /// <summary>
         /// 行
         /// </summary>
         public int FromRow { get; set; }
+
         /// <summary>
         /// 列
         /// </summary>
         public int FromColomn { get; set; }
+
         /// <summary>
         /// 层
         /// </summary>
         public int FromLayer { get; set; }
+
         /// <summary>
         /// 巷道号
         /// </summary>
         public string FromTunnelNum { get; set; }
+
         /// <summary>
         /// 目标地址
         /// </summary>
         public string EndLocation { get; set; }
+
         /// <summary>
         /// 行
         /// </summary>
         public int EndRow { get; set; }
+
         /// <summary>
         /// 列
         /// </summary>
         public int EndColomn { get; set; }
+
         /// <summary>
         /// 层
         /// </summary>
         public int EndLayer { get; set; }
+
         /// <summary>
         /// 巷道号
         /// </summary>
         public string EndTunnelNum { get; set; }
+
         /// <summary>
         /// 仓库名称
         /// </summary>
         public string WareHouseName { get; set; }
+
         /// <summary>
         /// 容器条码
         /// </summary>
         public string ContainerBarCode { get; set; }
+
         public string UserName { get; set; }
     }
 }

WCS.WebApi/WMS/Request/PVCSemiFinishedProductReBackRequest.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WCS.Service.Entity
+namespace WCS.Service.Entity
 {
     public class PVCSemiFinishedProductReBackRequest
     {

WCS.WebApi/WMS/Response/GetProductInfoResponse.cs

@@ -1,15 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS.Response
 {
     public class GetProductInfoResponse : WcsContractApiResponse
     {
-
         public string BarCode { get; set; }
+
         /// <summary>
         /// 直径
         /// </summary>
@@ -29,6 +23,7 @@ namespace WCS.Service.Entity
         /// 子托盘类型（0无需自托盘 1 子托盘1 2子托盘2 3子托盘3）
         /// </summary>
         public short ChildContainerType { get; set; }
+
         /// <summary>
         /// 载重卷数
         /// </summary>
@@ -37,6 +32,7 @@ namespace WCS.Service.Entity
         public int DocId { get; set; }
 
         public short ProLine { get; set; }
+
         /// <summary>
         /// 是否尾盘（0否，1是）
         /// </summary>

WCS.WebApi/WMS/Response/I_WCS_GetExcTaskResponse.cs

@@ -1,30 +1,30 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS.Response
 {
     /// <summary>
     /// 获取异常任务响应实体
     /// </summary>
-    public class I_WCS_GetExcTaskResponse: WcsContractApiResponse
+    public class I_WCS_GetExcTaskResponse : WcsContractApiResponse
     {
         /// <summary>
         /// 结果
         /// </summary>
         public new bool ResType { get; set; }
+
         /// <summary>
         /// 消息
         /// </summary>
         public new string ResMessage { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>
         public new string Memo1 { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>
         public new string Memo2 { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>

WCS.WebApi/WMS/Response/I_WCS_GetInTaskResponse.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS.Response
 {
     public class I_WCS_GetInTaskResponse : WcsContractApiResponse
     {
@@ -65,4 +65,4 @@ namespace WCS.Service.Entity
         public string Memo2 { get; set; } = "";
         public string Memo3 { get; set; } = "";
     }
-}
+}

WCS.WebApi/WMS/Response/I_WCS_GetMoveTaskResponse.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS.Response
 {
     public class I_WCS_GetMoveTaskResponse : WcsContractApiResponse
     {
@@ -10,74 +6,92 @@ namespace WCS.Service.Entity
         /// 结果
         /// </summary>
         public new int ResType { get; set; }
+
         /// <summary>
         /// 消息
         /// </summary>
         public new string ResMessage { get; set; }
+
         /// <summary>
         /// WMS任务号
         /// </summary>
         public string WMSTaskNum { get; set; }
+
         /// <summary>
         /// 任务类型
         /// </summary>
         public int TaskType { get; set; }
+
         /// <summary>
         /// 移库起始货位
         /// </summary>
         public string MoveStartWareCell { get; set; }
+
         /// <summary>
         /// 行
         /// </summary>
         public int FromRow { get; set; }
+
         /// <summary>
         /// 列
         /// </summary>
         public int FromColomn { get; set; }
+
         /// <summary>
         /// 层
         /// </summary>
         public int FromLayer { get; set; }
+
         /// <summary>
         /// 巷道号
         /// </summary>
         public string FromTunnelNum { get; set; }
+
         /// <summary>
         /// 移库目标货位
         /// </summary>
         public string MoveEndWareCell { get; set; }
+
         /// <summary>
         /// 行
         /// </summary>
         public int EndRow { get; set; }
+
         /// <summary>
         /// 列
         /// </summary>
         public int EndColomn { get; set; }
+
         /// <summary>
         /// 层
         /// </summary>
         public int EndLayer { get; set; }
+
         /// <summary>
         /// 巷道号
         /// </summary>
         public string EndTunnelNum { get; set; }
+
         /// <summary>
         /// 仓库名称
         /// </summary>
         public string WareHouseName { get; set; }
+
         /// <summary>
         /// 容器条码
         /// </summary>
         public string ContainerBarCode { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>
         public new string Memo1 { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>
         public new string Memo2 { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>

WCS.WebApi/WMS/Response/I_WCS_GetOutTaskResponse.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS.Response
 {
     /// <summary>
     /// 获取出库任务返回结果
@@ -133,4 +133,4 @@ namespace WCS.Service.Entity
         /// </summary>
         public decimal Length { get; set; }
     }
-}
+}

WCS.WebApi/WMS/Response/I_WCS_GetTunnelListResponse.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS.Response
 {
     public class I_WCS_GetTunnelListResponse : WcsContractApiResponse
     {
@@ -15,22 +11,27 @@ namespace WCS.Service.Entity
         /// 结果
         /// </summary>
         public new bool ResType { get; set; }
+
         /// <summary>
         /// 消息
         /// </summary>
         public new string ResMessage { get; set; }
+
         /// <summary>
         /// 巷道号集合
         /// </summary>
         public string TunnelNum { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>
         public new string Memo1 { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>
         public new string Memo2 { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>

WCS.WebApi/WMS/Response/I_WCS_GetWareCellResponse.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS.Response
 {
     /// <summary>
     /// 分配货位响应实体
@@ -13,38 +9,47 @@ namespace WCS.Service.Entity
         /// 结果
         /// </summary>
         public new bool ResType { get; set; }
+
         /// <summary>
         /// 消息
         /// </summary>
         public new string ResMessage { get; set; }
+
         /// <summary>
         /// 货位号
         /// </summary>
         public string CellNo { get; set; }
+
         /// <summary>
         /// 巷道号
         /// </summary>
         public string TunnelNum { get; set; }
+
         /// <summary>
         /// 行
         /// </summary>
         public short Row { get; set; }
+
         /// <summary>
         /// 列
         /// </summary>
         public short Colomn { get; set; }
+
         /// <summary>
         /// 层
         /// </summary>
         public short Layer { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>
         public new string Memo1 { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>
         public new string Memo2 { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>

WCS.WebApi/WMS/Response/I_WCS_GetWeightResponse.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS.Response
 {
     public class I_WCS_GetWeightResponse : WcsContractApiResponse
     {
@@ -10,18 +6,22 @@ namespace WCS.Service.Entity
         /// 结果
         /// </summary>
         public new bool ResType { get; set; }
+
         /// <summary>
         /// 消息
         /// </summary>
         public new string ResMessage { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>
         public new string Memo1 { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>
         public new string Memo2 { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>

WCS.WebApi/WMS/Response/I_WCS_PutDevInfoResponse.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS.Response
 {
     /// <summary>
     /// 传递设备信息响应实体
@@ -13,18 +9,22 @@ namespace WCS.Service.Entity
         /// 结果
         /// </summary>
         public new bool ResType { get; set; }
+
         /// <summary>
         /// 消息
         /// </summary>
         public new string ResMessage { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>
         public new string Memo1 { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>
         public new string Memo2 { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>

WCS.WebApi/WMS/Response/I_WCS_PutTaskStepResponse.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS.Response
 {
     /// <summary>
     /// 更新任务进程响应实体
@@ -13,10 +9,12 @@ namespace WCS.Service.Entity
         /// 结果
         /// </summary>
         public new bool ResType { get; set; }
+
         /// <summary>
         /// 消息
         /// </summary>
         public new string ResMessage { get; set; }
+
         /// <summary>
         /// WMS任务号
         /// </summary>
@@ -26,10 +24,12 @@ namespace WCS.Service.Entity
         /// 备用
         /// </summary>
         public new string Memo1 { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>
         public new string Memo2 { get; set; }
+
         /// <summary>
         /// 备用
         /// </summary>

WCS.WebApi/WMS/Response/Result.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS.Response
 {
     public class Result
     {

WCS.WebApi/WMS/Response/TunnelCountTemp.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS.Response
 {
     public class TunnelCountTemp
     {

WCS.WebApi/WMS/Response/WcsContractApiResponse.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace WCS.Service.Entity
+namespace WCS.WebApi.WMS.Response
 {
     public class WcsContractApiResponse
     {

WCS.WebApi/WMS/WMS.cs

@@ -5,9 +5,10 @@ using System.Collections.Generic;
 using System.Linq;
 using WCS.BaseExtensions;
 using WCS.Core;
-using WCS.Service.Entity;
+using WCS.WebApi.WMS.Request;
+using WCS.WebApi.WMS.Response;
 
-namespace WCS.Service
+namespace WCS.WebApi.WMS
 {
     public class WMS
     {