fix

分拣库/WCS.Entity.Protocol/SRM/ISRM520.cs

@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+
+namespace WCS.Entity.Protocol.SRM
+{
+    /// <summary>
+    ///  堆垛机DB520
+    /// </summary>
+    public interface ISRM520 : IProtocol
+    {
+        /// <summary>
+        ///  备用
+        /// </summary>
+        [Description("备用")]
+        short Res1 { get; set; }
+
+        /// <summary>
+        ///  备用
+        /// </summary>
+        [Description("备用")]
+        short Res2 { get; set; }
+
+        /// <summary>
+        ///  备用
+        /// </summary>
+        [Description("备用")]
+        short Res3 { get; set; }
+
+        /// <summary>
+        ///  货物类型
+        /// </summary>
+        [Description("货物类型")]
+        short GoodsType { get; set; }
+
+        /// <summary>
+        ///  运行速度
+        /// </summary>
+        [Description("运行速度")]
+        SrmRunSpeedEnum RunSpeed { get; set; }
+
+        /// <summary>
+        ///  任务起始行
+        /// </summary>
+        [Description("任务起始行")]
+        short RowPos1 { get; set; }
+
+        /// <summary>
+        ///  任务起始列
+        /// </summary>
+        [Description("任务起始列")]
+        short TravelPos1 { get; set; }
+
+        /// <summary>
+        ///  任务起始层
+        /// </summary>
+        [Description("任务起始层")]
+        short LiftPos1 { get; set; }
+
+        /// <summary>
+        ///  任务起始深度
+        /// </summary>
+        [Description("任务起始深度")]
+        ForkPosition ForkStartPos1 { get; set; }
+
+        /// <summary>
+        ///  任务目标行
+        /// </summary>
+        [Description("任务目标行")]
+        short RowPos2 { get; set; }
+
+        /// <summary>
+        ///  任务目标列
+        /// </summary>
+        [Description("任务目标列")]
+        short TravelPos2 { get; set; }
+
+        /// <summary>
+        ///  任务目标层
+        /// </summary>
+        [Description("任务目标层")]
+        short LiftPos2 { get; set; }
+
+        /// <summary>
+        ///  任务目标深度
+        /// </summary>
+        [Description("任务目标深度")]
+        ForkPosition ForkStartPos2 { get; set; }
+
+        /// <summary>
+        ///  任务号
+        /// </summary>
+        [Description("任务号")]
+        int TaskNumber { get; set; }
+
+        /// <summary>
+        ///  凭证号
+        /// </summary>
+        [Description("凭证号")]
+        short VoucherNo { get; set; }
+
+        /// <summary>
+        ///  完成任务确认清除信号
+        /// </summary>
+        [Description("完成任务确认清除信号")]
+        short OkAck { get; set; }
+
+        /// <summary>
+        ///  任务类型
+        /// </summary>
+        [Description("任务类型")]
+        SrmTaskTypeEnum TaskType { get; set; }
+
+        /// <summary>
+        ///  指令类型
+        /// </summary>
+        [Description("指令类型")]
+        short Cmd { get; set; }
+
+    }
+}

分拣库/WCS.Entity.Protocol/SRM/ISRM521.cs

@@ -0,0 +1,188 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+
+namespace WCS.Entity.Protocol.SRM
+{
+    /// <summary>
+    ///  堆垛机DB521
+    /// </summary>
+    public interface ISRM521 : IProtocol
+    {
+        /// <summary>
+        ///  状态
+        /// </summary>
+        [Description("状态")]
+        SrmStatus Status { get; set; }
+
+        /// <summary>
+        ///  自动状态
+        /// </summary>
+        [Description("自动状态")]
+        SrmAutoStatus AutoStatus { get; set; }
+
+        /// <summary>
+        ///  运行状态
+        /// </summary>
+        [Description("运行状态")]
+        SrmRunStatus RunStatus { get; set; }
+
+        /// <summary>
+        ///  任务起始行
+        /// </summary>
+        [Description("任务起始行")]
+        short RowPos1 { get; set; }
+
+        /// <summary>
+        ///  任务起始列
+        /// </summary>
+        [Description("任务起始列")]
+        short TravelPos1 { get; set; }
+
+        /// <summary>
+        ///  任务起始层
+        /// </summary>
+        [Description("任务起始层")]
+        short LiftPos1 { get; set; }
+
+        /// <summary>
+        ///  任务起始深度
+        /// </summary>
+        [Description("任务起始深度")]
+        ForkPosition ForkDestPos1 { get; set; }
+
+        /// <summary>
+        ///  任务目标行
+        /// </summary>
+        [Description("任务目标行")]
+        short RowPos2 { get; set; }
+
+        /// <summary>
+        ///  任务目标列
+        /// </summary>
+        [Description("任务目标列")]
+        short TravelPos2 { get; set; }
+
+        /// <summary>
+        ///  任务目标层
+        /// </summary>
+        [Description("任务目标层")]
+        short LiftPos2 { get; set; }
+
+        /// <summary>
+        ///  任务目标深度
+        /// </summary>
+        [Description("任务目标深度")]
+        ForkPosition ForkDestPos2 { get; set; }
+
+        /// <summary>
+        ///  任务号
+        /// </summary>
+        [Description("任务号")]
+        int TaskNumber { get; set; }
+
+        /// <summary>
+        ///  凭证号
+        /// </summary>
+        [Description("凭证号")]
+        short VoucherNo { get; set; }
+
+        /// <summary>
+        ///  当前行
+        /// </summary>
+        [Description("当前行")]
+        short SrmRow { get; set; }
+
+        /// <summary>
+        ///  当前列
+        /// </summary>
+        [Description("当前列")]
+        short SrmTravel { get; set; }
+
+        /// <summary>
+        ///  当前层
+        /// </summary>
+        [Description("当前层")]
+        short SrmLayer { get; set; }
+
+        /// <summary>
+        ///  完成任务号
+        /// </summary>
+        [Description("完成任务号")]
+        int TaskFinishiId { get; set; }
+
+        /// <summary>
+        ///  行走当前位置 MM
+        /// </summary>
+        [Description("行走当前位置 MM")]
+        int TravelPos { get; set; }
+
+        /// <summary>
+        ///  提升当前位置 MM
+        /// </summary>
+        [Description("提升当前位置 MM")]
+        int LiftPos { get; set; }
+
+        /// <summary>
+        ///  货叉当前位置 MM
+        /// </summary>
+        [Description("货叉当前位置 MM")]
+        int ForkPos1 { get; set; }
+
+        /// <summary>
+        ///  运行速度
+        /// </summary>
+        [Description("运行速度")]
+        SrmRunSpeedEnum RunSpeed { get; set; }
+
+        /// <summary>
+        ///  任务类型
+        /// </summary>
+        [Description("任务类型")]
+        SrmTaskTypeEnum TaskType { get; set; }
+
+        /// <summary>
+        ///  运行总里程
+        /// </summary>
+        [Description("运行总里程")]
+        float TotalKm { get; set; }
+
+        /// <summary>
+        ///  货物类型
+        /// </summary>
+        [Description("货物类型")]
+        short GoodsType { get; set; }
+
+        /// <summary>
+        ///  运行总时长
+        /// </summary>
+        [Description("运行总时长")]
+        float RunTime { get; set; }
+
+        /// <summary>
+        ///  备用
+        /// </summary>
+        [Description("备用")]
+        int Res3 { get; set; }
+
+        /// <summary>
+        ///  备用
+        /// </summary>
+        [Description("备用")]
+        int Res4 { get; set; }
+
+        /// <summary>
+        ///  备用
+        /// </summary>
+        [Description("备用")]
+        int Res5 { get; set; }
+
+        /// <summary>
+        ///  备用
+        /// </summary>
+        [Description("备用")]
+        int Res6 { get; set; }
+
+    }
+}

分拣库/WCS.Entity.Protocol/SRM/ISRM523.cs

@@ -0,0 +1,16 @@
+using System.ComponentModel;
+
+namespace WCS.Entity.Protocol.SRM
+{
+    /// <summary>
+    ///  堆垛机DB523
+    /// </summary>
+    public interface ISRM523 : IProtocol
+    {
+        /// <summary>
+        ///  报警内容
+        /// </summary>
+        [Description("报警内容")]
+        long Alarm { get; set; }
+    }
+}

分拣库/WCS.Entity.Protocol/SRM/SrmEnum.cs

@@ -0,0 +1,237 @@
+using System;
+
+namespace WCS.Entity.Protocol.SRM
+{
+    /// <summary>
+    /// 运行模式
+    /// </summary>
+    public enum SrmRunSpeedEnum : short
+    {
+        /// <summary>
+        ///  默认
+        /// </summary>
+        Default = 0,
+
+        /// <summary>
+        ///  低速
+        /// </summary>
+        LowSpeed = 1,
+    }
+
+    /// <summary>
+    /// 任务类型
+    /// </summary>
+    public enum SrmTaskTypeEnum : short
+    {
+        /// <summary>
+        ///  默认 出入库移库使用该任务类型
+        /// </summary>
+        Default = 0,
+
+        /// <summary>
+        ///  完成任务
+        /// </summary>
+        FinishTask = 1,
+
+        /// <summary>
+        ///  删除任务
+        /// </summary>
+        DeleteTask = 2,
+
+        /// <summary>
+        ///  移动任务
+        /// </summary>
+        MoveTask = 3,
+    }
+
+    /// <summary>
+    /// 货叉位置
+    /// </summary>
+    public enum ForkPosition : short
+    {
+        /// <summary>
+        ///  中位
+        /// </summary>
+        Centr = 0,
+
+        /// <summary>
+        ///  一深度
+        /// </summary>
+        OneDepth = 1,
+
+        /// <summary>
+        /// 二深度
+        /// </summary>
+        TwoDepth = 2
+    }
+
+    /// <summary>
+    /// 运行模式
+    /// </summary>
+    public enum SrmAutoStatus : short
+    {
+        /// <summary>
+        ///  自动
+        /// </summary>
+        Automatic = 0,
+
+        /// <summary>
+        ///  半自动
+        /// </summary>
+        SemiAutomatic = 1,
+
+        /// <summary>
+        ///  手动
+        /// </summary>
+        Manual = 2,
+
+        /// <summary>
+        ///  保持维修
+        /// </summary>
+        KeepInRepair
+    }
+
+    /// <summary>
+    /// 运行状态
+    /// </summary>
+    public enum SrmRunStatus : short
+    {
+        /// <summary>
+        ///  空闲
+        /// </summary>
+        Idle = 1,
+
+        /// <summary>
+        ///  取货行走
+        /// </summary>
+        GetGoodsWalk = 2,
+
+        /// <summary>
+        ///  取货伸叉
+        /// </summary>
+        GetGoodsOutstretchFork = 3,
+
+        /// <summary>
+        ///  取货抬叉
+        /// </summary>
+        GetGoodsLiftFork = 4,
+
+        /// <summary>
+        ///  取货收叉
+        /// </summary>
+        GetGoodsRetractFork = 5,
+
+        /// <summary>
+        ///  放货行走
+        /// </summary>
+        PutGoodsWalk = 6,
+
+        /// <summary>
+        ///  放货伸叉
+        /// </summary>
+        PutGoodsOutstretchFork = 7,
+
+        /// <summary>
+        ///  放货降叉
+        /// </summary>
+        PutGoodsDropFork = 6,
+
+        /// <summary>
+        ///  放货收叉
+        /// </summary>
+        PutGoodsRetractFork = 7,
+    }
+
+    /// <summary>
+    /// 堆垛机状态
+    /// </summary>
+    public enum SrmStatus : ushort
+    {
+        /// <summary>
+        ///  PLC的握手信号
+        /// </summary>
+        HandshakeTowcs = 1 << 0,
+
+        /// <summary>
+        ///  完成取货信号
+        /// </summary>
+        GetFinishi = 1 << 1,
+
+        /// <summary>
+        ///  完成放货信号
+        /// </summary>
+        PutFinishi = 1 << 2,
+
+        /// <summary>
+        ///  报警信号
+        /// </summary>
+        Alarm = 1 << 3,
+
+        /// <summary>
+        ///  任务完成信号
+        /// </summary>
+        TaskFinish = 1 << 4,
+
+        /// <summary>
+        ///  设备有货
+        /// </summary>
+        Loaded = 1 << 5,
+
+        /// <summary>
+        ///  货叉在原位
+        /// </summary>
+        ForkCenter = 1 << 6,
+
+        /// <summary>
+        ///  可以下发任务
+        /// </summary>
+        CanTaskIssued = 1 << 7,
+
+        /// <summary>
+        ///  保留
+        /// </summary>
+        RES1 = 1 << 8,
+
+        /// <summary>
+        ///  保留
+        /// </summary>
+        RES2 = 1 << 9,
+
+        /// <summary>
+        ///  保留
+        /// </summary>
+        RES3 = 1 << 10,
+
+        /// <summary>
+        ///  保留
+        /// </summary>
+        RES4 = 1 << 11,
+
+        /// <summary>
+        ///  保留
+        /// </summary>
+        RES5 = 1 << 12,
+
+        /// <summary>
+        ///  保留
+        /// </summary>
+        RES6 = 1 << 13,
+
+        /// <summary>
+        ///  保留
+        /// </summary>
+        RES7 = 1 << 14,
+
+        /// <summary>
+        ///  保留
+        /// </summary>
+        RES8 = 1 << 15,
+    }
+
+    /// <summary>
+    /// 堆垛机报警项
+    /// </summary>
+    [Flags]
+    public enum SrmAlarm : ulong { 
+    }
+}

分拣库/WCS.Entity.Protocol/Station/IStation91.cs

@@ -27,5 +27,7 @@
         /// </summary>
         [IgnoreChanging]
         float Width { get; set; }
+
+
     }
 }

分拣库/WCS.Entity.Protocol/WCS.Entity.Protocol.csproj

@@ -7,11 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-<<<<<<< Updated upstream
-    <PackageReference Include="WCS.Entity" Version="1.0.0.9" />
-=======
     <PackageReference Include="WCS.Entity" Version="1.0.1.4" />
->>>>>>> Stashed changes
   </ItemGroup>
 
 </Project>

分拣库/WCS.WorkEngineering/Extensions/DeviceExtension.cs

@@ -1,4 +1,6 @@
-using WCS.Core;
+using System.Collections.Concurrent;
+using WCS.Core;
+using WCS.Entity;
 using WCS.Entity.Protocol.Station;
 
 namespace WCS.WorkEngineering.Extensions
@@ -50,8 +52,6 @@ namespace WCS.WorkEngineering.Extensions
         {
             return source.Paths.First(p => p.EndCode == addto).Path;
         }
-<<<<<<< Updated upstream
-=======
 
         #region WCS_DEVICE扩展数据
 
@@ -189,6 +189,5 @@ namespace WCS.WorkEngineering.Extensions
     public enum DF
     {
         无 = 0,
->>>>>>> Stashed changes
     }
 }

分拣库/WCS.WorkEngineering/WCS.WorkEngineering.csproj

@@ -8,11 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.5" />
-<<<<<<< Updated upstream
-    <PackageReference Include="ServiceCenter" Version="1.0.0.12" />
-=======
     <PackageReference Include="ServiceCenter" Version="1.0.1.8" />
->>>>>>> Stashed changes
   </ItemGroup>
 
   <ItemGroup>

分拣库/WCS.WorkEngineering/WebApi/Startup.cs

@@ -1,50 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace WCS.WorkEngineering.WebApi
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        public IConfiguration Configuration { get; }
-
-        // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddControllers();
-            //services.AddSwaggerGen(c =>
-            //{
-            //    c.SwaggerDoc("v1", new OpenApiInfo { Title = "WCSAPI", Version = "v1" });
-            //});
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-                //app.UseSwagger();
-                //app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "WebApplication1 v1"));
-            }
-
-            app.UseHttpsRedirection();
-
-            app.UseRouting();
-
-            app.UseAuthorization();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapControllers();
-            });
-        }
-    }
-}

分拣库/WCS.WorkEngineering/WebApi/任务.cs

@@ -0,0 +1,110 @@
+///// <summary>
+//     /// 镀铜一楼res下任务
+//     /// </summary>
+//     /// <param name="reqDto"></param>
+//     /// <returns></returns>
+//     [HttpPost]
+//     public GenAgvSchedulingTaskResponse CopperLineAgvTaskToRcs(GenAgvSchedulingTaskRequest reqDto)
+//     {
+//         var result = new GenAgvSchedulingTaskResponse();
+//         GenAgvSchedulingTaskRequest resReq = new GenAgvSchedulingTaskRequest();
+//         var apiurl = wms.util.AppSettings.GetConfig("RcsCreateTaskPushUrl");
+//         var strRes = HttpUtil.PostRequest(apiurl, JsonConvert.SerializeObject(resReq), 30000);
+//         if (string.IsNullOrEmpty(strRes))
+//         {
+//             result.message = "返回空";
+//             return result;
+//         }
+//         return JsonConvert.DeserializeObject<GenAgvSchedulingTaskResponse>(strRes);
+//     }
+//     /// <summary>
+//     /// 镀铜一楼res继续任务
+//     /// </summary>
+//     /// <param name="reqDto"></param>
+//     /// <returns></returns>
+//     [HttpPost]
+//     public GenAgvSchedulingTaskResponse CopperLineContinueTaskToRcs(GenAgvSchedulingTaskRequest reqDto)
+//     {
+//         var result = new GenAgvSchedulingTaskResponse();
+//         GenAgvSchedulingTaskRequest resReq = new GenAgvSchedulingTaskRequest()
+//         { };
+//         var apiurl = wms.util.AppSettings.GetConfig("RcsContinuePushUrl");
+//         var strRes = HttpUtil.PostRequest(apiurl, JsonConvert.SerializeObject(resReq), 30000);
+//         if (string.IsNullOrEmpty(strRes))
+//         {
+//             result.message = "返回空";
+//             return result;
+//         }
+//         return JsonConvert.DeserializeObject<GenAgvSchedulingTaskResponse>(strRes);
+//     }
+//     /// <summary>
+//     /// 镀铜二楼IWMS下发满轮出库
+//     /// </summary>
+//     /// <param name="reqDto"></param>
+//     /// <returns></returns>
+//     [HttpPost]
+//     public SRes CopperLineAgvTaskStockOutToIWms(CopperLineAgvTaskStockOutToIWmsRequest reqDto)
+//     {
+//         var result = new SRes();
+//         CopperLineAgvTaskStockOutToIWmsRequest resReq = new CopperLineAgvTaskStockOutToIWmsRequest()
+//         {
+//             matCode = "",
+//             wbCode = "满轮接驳口",
+//             inSpoolFull = "1",
+//             wetInto = true,
+//             wetIntoSpec = false,
+//             isSurplus = "",
+//             isRework = "",
+//             matNo = "",
+//             spoolNo = "",
+//             gradeCode = "",
+//             taskNo = Guid.NewGuid().ToString(),
+
+//         };
+//         var apiurl = wms.util.AppSettings.GetConfig("IWmsStockOutPushUrl");
+//         var strRes = HttpUtil.PostRequest(apiurl, JsonConvert.SerializeObject(reqDto), 30000);
+//         if (string.IsNullOrEmpty(strRes))
+//         {
+//             //result.message = "返回空";
+//             return result;
+//         }
+//         return JsonConvert.DeserializeObject<SRes>(strRes);
+//     }
+//     /// <summary>
+//     /// 镀铜二楼IWMS下发空轮/退料/余料入库
+//     /// </summary>
+//     /// <param name="reqDto"></param>
+//     /// <returns></returns>
+//     [HttpPost]
+//     public SRes CopperLineAgvTaskStockInToIWms(CopperLineAgvTaskStockInToIWmsRequest reqDto)
+//     {
+//         var result = new SRes();
+//         CopperLineAgvTaskStockInToIWmsRequest resReq = new CopperLineAgvTaskStockInToIWmsRequest()
+//         {
+//             matCode = "",
+//             workAreaCode = "11",
+//             outSpoolFull = "1",
+//             taskNo = Guid.NewGuid().ToString()
+//         };
+//         var apiurl = wms.util.AppSettings.GetConfig("IWmsStockInPushUrl");
+//         var strRes = HttpUtil.PostRequest(apiurl, JsonConvert.SerializeObject(reqDto), 30000);
+//         if (string.IsNullOrEmpty(strRes))
+//         {
+//             //result.message = "返回空";
+//             return result;
+//         }
+//         return JsonConvert.DeserializeObject<SRes>(strRes);
+//     }
+
+//     /// <summary>
+//     /// AGV执行回调
+//     /// </summary>
+//     /// <param name="reqDto"></param>
+//     /// <returns></returns>
+//     [HttpPost]
+//     public agvCallbackResponse agvCallback(agvCallbackRequest reqDto)
+//     {
+//         var res = new agvCallbackResponse() { code = "0",message = "成功" };
+
+//         return res;
+//     }

合金库/WCS.Entity.Protocol/Station/StationEunm.cs

@@ -1,381 +0,0 @@
-using System;
-
-namespace WCS.Entity.Protocol.Station
-{
-    /// <summary>
-    /// 指令类型
-    /// </summary>
-    [Flags]
-    public enum CmdTypeEnum : ushort
-    {
-        /// <summary>
-        /// AGV放货请求
-        /// </summary>
-        AGV_PUT_ASK = 1 << 0,
-
-        /// <summary>
-        /// AGV放货运行
-        /// </summary>
-        AGV_PUT_RUN = 1 << 1,
-
-        /// <summary>
-        /// AGV放货完成
-        /// </summary>
-        AGV_PUT_OK = 1 << 2,
-
-        /// <summary>
-        /// AGV取货请求
-        /// </summary>
-        AGV_GET_ASK = 1 << 3,
-
-        /// <summary>
-        /// AGV取货运行
-        /// </summary>
-        AGV_GET_RUN = 1 << 4,
-
-        /// <summary>
-        /// AGV取货完成
-        /// </summary>
-        AGV_GET_OK = 1 << 5,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES1 = 1 << 6,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES2 = 1 << 7,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES3 = 1 << 8,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES4 = 1 << 9,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES5 = 1 << 10,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES6 = 1 << 11,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES7 = 1 << 12,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES8 = 1 << 13,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES9 = 1 << 14,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES10 = 1 << 15,
-    }
-
-    /// <summary>
-    /// 指令回复
-    /// </summary>
-    [Flags]
-    public enum CmdReplyEnum : ushort
-    {
-        /// <summary>
-        /// CONV允许接货
-        /// </summary>
-        CONV_PUT_ALLOW = 1 << 0,
-
-        /// <summary>
-        /// CONV接货完成
-        /// </summary>
-        CONV_PUT_ACK = 1 << 1,
-
-        /// <summary>
-        /// CONV运行取货
-        /// </summary>
-        CONV_GET_ALLOW = 1 << 2,
-
-        /// <summary>
-        /// CONV取货完成确认
-        /// </summary>
-        CONV_GET_ACK = 1 << 3,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES11 = 1 << 4,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES12 = 1 << 5,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES1 = 1 << 6,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES2 = 1 << 7,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES3 = 1 << 8,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES4 = 1 << 9,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES5 = 1 << 10,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES6 = 1 << 11,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES7 = 1 << 12,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES8 = 1 << 13,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES9 = 1 << 14,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES10 = 1 << 15,
-    }
-
-    /// <summary>
-    /// 输送机模式
-    /// </summary>
-    public enum ModeEunm : short
-    {
-        /// <summary>
-        /// 自动
-        /// </summary>
-        Automatic = 1,
-
-        /// <summary>
-        /// 手动
-        /// </summary>
-        Manual = 2,
-
-        /// <summary>
-        /// 维修
-        /// </summary>
-        Repair = 3,
-    }
-
-    /// <summary>
-    /// 输送机警报
-    /// </summary>
-    [Flags]
-    public enum AlarmEunm
-    {
-    }
-
-    /// <summary>
-    /// 输送机状态
-    /// </summary>
-    [Flags]
-    public enum StatusEunm : ulong
-    {
-        /// <summary>
-        /// 自动
-        /// </summary>
-        Auto = 1 << 0,
-
-        /// <summary>
-        /// 选中状态位
-        /// </summary>
-        Choice_Bit = 1 << 1,
-
-        /// <summary>
-        /// 任务有货
-        /// </summary>
-        OT_Status = 1 << 2,
-
-        /// <summary>
-        /// 光电有货
-        /// </summary>
-        PH_Status = 1 << 3,
-
-        /// <summary>
-        /// 运行状态位
-        /// </summary>
-        Run = 1 << 4,
-
-        /// <summary>
-        /// 正转
-        /// </summary>
-        Fwd_1 = 1 << 5,
-
-        /// <summary>
-        /// 反转
-        /// </summary>
-        Rev_1 = 1 << 6,
-
-        /// <summary>
-        /// 上升/右转/伸出（顶升移栽升降、拆码盘机升降、提升机升降、拆码盘机拨叉伸出）
-        /// </summary>
-        Up_Right_Front_2 = 1 << 7,
-
-        /// <summary>
-        /// 下降/左转/缩回（顶升移栽升降、拆码盘机升降、提升机升降、拆码盘机拨叉缩回）
-        /// </summary>
-        Down_Left_Back_2 = 1 << 8,
-
-        /// <summary>
-        /// 高位（顶升移栽升降、拆码盘机升降、提升机升降）
-        /// </summary>
-        High_Station_2 = 1 << 9,
-
-        /// <summary>
-        /// 中位（拆码盘机升降）
-        /// </summary>
-        Mid_Station_2 = 1 << 10,
-
-        /// <summary>
-        /// 低位（顶升移栽升降、拆码盘机升降、提升机升降）
-        /// </summary>
-        Low_Station_2 = 1 << 11,
-
-        /// <summary>
-        /// 前位（拆码盘机拨叉伸出）
-        /// </summary>
-        Front_Station_2 = 1 << 12,
-
-        /// <summary>
-        /// 后位（拆码盘机拨叉缩回）
-        /// </summary>
-        Back_Station_2 = 1 << 13,
-
-        /// <summary>
-        /// 手动入库
-        /// </summary>
-        ManualStorage = 1 << 14,
-
-        /// <summary>
-        /// 上位机未分配任务
-        /// </summary>
-        UnassignedTask = 1 << 15,
-    }
-
-    /// <summary>
-    /// 外形故障
-    /// </summary>
-    [Flags]
-    public enum ShapeAlarmEunm : ushort
-    {
-        /// <summary>
-        /// 外形/条码等货物故障
-        /// </summary>
-        Goods_Err = 1 >> 0,
-
-        /// <summary>
-        /// 前超长故障
-        /// </summary>
-        F_Outside = 1 >> 1,
-
-        /// <summary>
-        /// 后超长故障
-        /// </summary>
-        B_Outside = 1 >> 2,
-
-        /// <summary>
-        /// 左超宽故障
-        /// </summary>
-        L_Outside = 1 >> 3,
-
-        /// <summary>
-        /// 右超宽故障
-        /// </summary>
-        R_Outside = 1 >> 4,
-
-        /// <summary>
-        /// 超高故障
-        /// </summary>
-        H_Outside = 1 >> 5,
-
-        /// <summary>
-        /// 条码读取失败
-        /// </summary>
-        BCR_Noread = 1 >> 6,
-
-        /// <summary>
-        /// 超重
-        /// </summary>
-        Overload = 1 >> 7,
-
-        /// <summary>
-        /// 货物严重外检故障
-        /// </summary>
-        Goods_Err_1 = 1 >> 8,
-
-        /// <summary>
-        /// 二维条码未读出
-        /// </summary>
-        BCR_Noread_1 = 1 >> 9,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES1 = 1 >> 10,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES2 = 1 >> 11,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES3 = 1 >> 12,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES4 = 1 >> 13,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES5 = 1 >> 14,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES6 = 1 >> 15,
-    }
-}

合金库/WCS.WorkEngineering/WebApi/Startup.cs

@@ -1,50 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace WCS.WorkEngineering.WebApi
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        public IConfiguration Configuration { get; }
-
-        // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddControllers();
-            //services.AddSwaggerGen(c =>
-            //{
-            //    c.SwaggerDoc("v1", new OpenApiInfo { Title = "WCSAPI", Version = "v1" });
-            //});
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-                //app.UseSwagger();
-                //app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "WebApplication1 v1"));
-            }
-
-            app.UseHttpsRedirection();
-
-            app.UseRouting();
-
-            app.UseAuthorization();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapControllers();
-            });
-        }
-    }
-}

成品库/WCS.Entity.Protocol/Station/StationEunm.cs

@@ -1,381 +0,0 @@
-using System;
-
-namespace WCS.Entity.Protocol.Station
-{
-    /// <summary>
-    /// 指令类型
-    /// </summary>
-    [Flags]
-    public enum CmdTypeEnum : ushort
-    {
-        /// <summary>
-        /// AGV放货请求
-        /// </summary>
-        AGV_PUT_ASK = 1 << 0,
-
-        /// <summary>
-        /// AGV放货运行
-        /// </summary>
-        AGV_PUT_RUN = 1 << 1,
-
-        /// <summary>
-        /// AGV放货完成
-        /// </summary>
-        AGV_PUT_OK = 1 << 2,
-
-        /// <summary>
-        /// AGV取货请求
-        /// </summary>
-        AGV_GET_ASK = 1 << 3,
-
-        /// <summary>
-        /// AGV取货运行
-        /// </summary>
-        AGV_GET_RUN = 1 << 4,
-
-        /// <summary>
-        /// AGV取货完成
-        /// </summary>
-        AGV_GET_OK = 1 << 5,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES1 = 1 << 6,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES2 = 1 << 7,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES3 = 1 << 8,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES4 = 1 << 9,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES5 = 1 << 10,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES6 = 1 << 11,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES7 = 1 << 12,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES8 = 1 << 13,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES9 = 1 << 14,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES10 = 1 << 15,
-    }
-
-    /// <summary>
-    /// 指令回复
-    /// </summary>
-    [Flags]
-    public enum CmdReplyEnum : ushort
-    {
-        /// <summary>
-        /// CONV允许接货
-        /// </summary>
-        CONV_PUT_ALLOW = 1 << 0,
-
-        /// <summary>
-        /// CONV接货完成
-        /// </summary>
-        CONV_PUT_ACK = 1 << 1,
-
-        /// <summary>
-        /// CONV运行取货
-        /// </summary>
-        CONV_GET_ALLOW = 1 << 2,
-
-        /// <summary>
-        /// CONV取货完成确认
-        /// </summary>
-        CONV_GET_ACK = 1 << 3,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES11 = 1 << 4,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES12 = 1 << 5,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES1 = 1 << 6,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES2 = 1 << 7,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES3 = 1 << 8,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES4 = 1 << 9,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES5 = 1 << 10,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES6 = 1 << 11,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES7 = 1 << 12,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES8 = 1 << 13,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES9 = 1 << 14,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES10 = 1 << 15,
-    }
-
-    /// <summary>
-    /// 输送机模式
-    /// </summary>
-    public enum ModeEunm : short
-    {
-        /// <summary>
-        /// 自动
-        /// </summary>
-        Automatic = 1,
-
-        /// <summary>
-        /// 手动
-        /// </summary>
-        Manual = 2,
-
-        /// <summary>
-        /// 维修
-        /// </summary>
-        Repair = 3,
-    }
-
-    /// <summary>
-    /// 输送机警报
-    /// </summary>
-    [Flags]
-    public enum AlarmEunm
-    {
-    }
-
-    /// <summary>
-    /// 输送机状态
-    /// </summary>
-    [Flags]
-    public enum StatusEunm : ulong
-    {
-        /// <summary>
-        /// 自动
-        /// </summary>
-        Auto = 1 << 0,
-
-        /// <summary>
-        /// 选中状态位
-        /// </summary>
-        Choice_Bit = 1 << 1,
-
-        /// <summary>
-        /// 任务有货
-        /// </summary>
-        OT_Status = 1 << 2,
-
-        /// <summary>
-        /// 光电有货
-        /// </summary>
-        PH_Status = 1 << 3,
-
-        /// <summary>
-        /// 运行状态位
-        /// </summary>
-        Run = 1 << 4,
-
-        /// <summary>
-        /// 正转
-        /// </summary>
-        Fwd_1 = 1 << 5,
-
-        /// <summary>
-        /// 反转
-        /// </summary>
-        Rev_1 = 1 << 6,
-
-        /// <summary>
-        /// 上升/右转/伸出（顶升移栽升降、拆码盘机升降、提升机升降、拆码盘机拨叉伸出）
-        /// </summary>
-        Up_Right_Front_2 = 1 << 7,
-
-        /// <summary>
-        /// 下降/左转/缩回（顶升移栽升降、拆码盘机升降、提升机升降、拆码盘机拨叉缩回）
-        /// </summary>
-        Down_Left_Back_2 = 1 << 8,
-
-        /// <summary>
-        /// 高位（顶升移栽升降、拆码盘机升降、提升机升降）
-        /// </summary>
-        High_Station_2 = 1 << 9,
-
-        /// <summary>
-        /// 中位（拆码盘机升降）
-        /// </summary>
-        Mid_Station_2 = 1 << 10,
-
-        /// <summary>
-        /// 低位（顶升移栽升降、拆码盘机升降、提升机升降）
-        /// </summary>
-        Low_Station_2 = 1 << 11,
-
-        /// <summary>
-        /// 前位（拆码盘机拨叉伸出）
-        /// </summary>
-        Front_Station_2 = 1 << 12,
-
-        /// <summary>
-        /// 后位（拆码盘机拨叉缩回）
-        /// </summary>
-        Back_Station_2 = 1 << 13,
-
-        /// <summary>
-        /// 手动入库
-        /// </summary>
-        ManualStorage = 1 << 14,
-
-        /// <summary>
-        /// 上位机未分配任务
-        /// </summary>
-        UnassignedTask = 1 << 15,
-    }
-
-    /// <summary>
-    /// 外形故障
-    /// </summary>
-    [Flags]
-    public enum ShapeAlarmEunm : ushort
-    {
-        /// <summary>
-        /// 外形/条码等货物故障
-        /// </summary>
-        Goods_Err = 1 >> 0,
-
-        /// <summary>
-        /// 前超长故障
-        /// </summary>
-        F_Outside = 1 >> 1,
-
-        /// <summary>
-        /// 后超长故障
-        /// </summary>
-        B_Outside = 1 >> 2,
-
-        /// <summary>
-        /// 左超宽故障
-        /// </summary>
-        L_Outside = 1 >> 3,
-
-        /// <summary>
-        /// 右超宽故障
-        /// </summary>
-        R_Outside = 1 >> 4,
-
-        /// <summary>
-        /// 超高故障
-        /// </summary>
-        H_Outside = 1 >> 5,
-
-        /// <summary>
-        /// 条码读取失败
-        /// </summary>
-        BCR_Noread = 1 >> 6,
-
-        /// <summary>
-        /// 超重
-        /// </summary>
-        Overload = 1 >> 7,
-
-        /// <summary>
-        /// 货物严重外检故障
-        /// </summary>
-        Goods_Err_1 = 1 >> 8,
-
-        /// <summary>
-        /// 二维条码未读出
-        /// </summary>
-        BCR_Noread_1 = 1 >> 9,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES1 = 1 >> 10,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES2 = 1 >> 11,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES3 = 1 >> 12,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES4 = 1 >> 13,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES5 = 1 >> 14,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES6 = 1 >> 15,
-    }
-}

成品库/WCS.WorkEngineering/WebApi/Startup.cs

@@ -1,50 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace WCS.WorkEngineering.WebApi
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        public IConfiguration Configuration { get; }
-
-        // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddControllers();
-            //services.AddSwaggerGen(c =>
-            //{
-            //    c.SwaggerDoc("v1", new OpenApiInfo { Title = "WCSAPI", Version = "v1" });
-            //});
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-                //app.UseSwagger();
-                //app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "WebApplication1 v1"));
-            }
-
-            app.UseHttpsRedirection();
-
-            app.UseRouting();
-
-            app.UseAuthorization();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapControllers();
-            });
-        }
-    }
-}

时效库/WCS.Entity.Protocol/Station/StationEunm.cs

@@ -1,381 +0,0 @@
-using System;
-
-namespace WCS.Entity.Protocol.Station
-{
-    /// <summary>
-    /// 指令类型
-    /// </summary>
-    [Flags]
-    public enum CmdTypeEnum : ushort
-    {
-        /// <summary>
-        /// AGV放货请求
-        /// </summary>
-        AGV_PUT_ASK = 1 << 0,
-
-        /// <summary>
-        /// AGV放货运行
-        /// </summary>
-        AGV_PUT_RUN = 1 << 1,
-
-        /// <summary>
-        /// AGV放货完成
-        /// </summary>
-        AGV_PUT_OK = 1 << 2,
-
-        /// <summary>
-        /// AGV取货请求
-        /// </summary>
-        AGV_GET_ASK = 1 << 3,
-
-        /// <summary>
-        /// AGV取货运行
-        /// </summary>
-        AGV_GET_RUN = 1 << 4,
-
-        /// <summary>
-        /// AGV取货完成
-        /// </summary>
-        AGV_GET_OK = 1 << 5,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES1 = 1 << 6,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES2 = 1 << 7,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES3 = 1 << 8,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES4 = 1 << 9,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES5 = 1 << 10,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES6 = 1 << 11,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES7 = 1 << 12,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES8 = 1 << 13,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES9 = 1 << 14,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES10 = 1 << 15,
-    }
-
-    /// <summary>
-    /// 指令回复
-    /// </summary>
-    [Flags]
-    public enum CmdReplyEnum : ushort
-    {
-        /// <summary>
-        /// CONV允许接货
-        /// </summary>
-        CONV_PUT_ALLOW = 1 << 0,
-
-        /// <summary>
-        /// CONV接货完成
-        /// </summary>
-        CONV_PUT_ACK = 1 << 1,
-
-        /// <summary>
-        /// CONV运行取货
-        /// </summary>
-        CONV_GET_ALLOW = 1 << 2,
-
-        /// <summary>
-        /// CONV取货完成确认
-        /// </summary>
-        CONV_GET_ACK = 1 << 3,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES11 = 1 << 4,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES12 = 1 << 5,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES1 = 1 << 6,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES2 = 1 << 7,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES3 = 1 << 8,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES4 = 1 << 9,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES5 = 1 << 10,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES6 = 1 << 11,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES7 = 1 << 12,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES8 = 1 << 13,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES9 = 1 << 14,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES10 = 1 << 15,
-    }
-
-    /// <summary>
-    /// 输送机模式
-    /// </summary>
-    public enum ModeEunm : short
-    {
-        /// <summary>
-        /// 自动
-        /// </summary>
-        Automatic = 1,
-
-        /// <summary>
-        /// 手动
-        /// </summary>
-        Manual = 2,
-
-        /// <summary>
-        /// 维修
-        /// </summary>
-        Repair = 3,
-    }
-
-    /// <summary>
-    /// 输送机警报
-    /// </summary>
-    [Flags]
-    public enum AlarmEunm
-    {
-    }
-
-    /// <summary>
-    /// 输送机状态
-    /// </summary>
-    [Flags]
-    public enum StatusEunm : ulong
-    {
-        /// <summary>
-        /// 自动
-        /// </summary>
-        Auto = 1 << 0,
-
-        /// <summary>
-        /// 选中状态位
-        /// </summary>
-        Choice_Bit = 1 << 1,
-
-        /// <summary>
-        /// 任务有货
-        /// </summary>
-        OT_Status = 1 << 2,
-
-        /// <summary>
-        /// 光电有货
-        /// </summary>
-        PH_Status = 1 << 3,
-
-        /// <summary>
-        /// 运行状态位
-        /// </summary>
-        Run = 1 << 4,
-
-        /// <summary>
-        /// 正转
-        /// </summary>
-        Fwd_1 = 1 << 5,
-
-        /// <summary>
-        /// 反转
-        /// </summary>
-        Rev_1 = 1 << 6,
-
-        /// <summary>
-        /// 上升/右转/伸出（顶升移栽升降、拆码盘机升降、提升机升降、拆码盘机拨叉伸出）
-        /// </summary>
-        Up_Right_Front_2 = 1 << 7,
-
-        /// <summary>
-        /// 下降/左转/缩回（顶升移栽升降、拆码盘机升降、提升机升降、拆码盘机拨叉缩回）
-        /// </summary>
-        Down_Left_Back_2 = 1 << 8,
-
-        /// <summary>
-        /// 高位（顶升移栽升降、拆码盘机升降、提升机升降）
-        /// </summary>
-        High_Station_2 = 1 << 9,
-
-        /// <summary>
-        /// 中位（拆码盘机升降）
-        /// </summary>
-        Mid_Station_2 = 1 << 10,
-
-        /// <summary>
-        /// 低位（顶升移栽升降、拆码盘机升降、提升机升降）
-        /// </summary>
-        Low_Station_2 = 1 << 11,
-
-        /// <summary>
-        /// 前位（拆码盘机拨叉伸出）
-        /// </summary>
-        Front_Station_2 = 1 << 12,
-
-        /// <summary>
-        /// 后位（拆码盘机拨叉缩回）
-        /// </summary>
-        Back_Station_2 = 1 << 13,
-
-        /// <summary>
-        /// 手动入库
-        /// </summary>
-        ManualStorage = 1 << 14,
-
-        /// <summary>
-        /// 上位机未分配任务
-        /// </summary>
-        UnassignedTask = 1 << 15,
-    }
-
-    /// <summary>
-    /// 外形故障
-    /// </summary>
-    [Flags]
-    public enum ShapeAlarmEunm : ushort
-    {
-        /// <summary>
-        /// 外形/条码等货物故障
-        /// </summary>
-        Goods_Err = 1 >> 0,
-
-        /// <summary>
-        /// 前超长故障
-        /// </summary>
-        F_Outside = 1 >> 1,
-
-        /// <summary>
-        /// 后超长故障
-        /// </summary>
-        B_Outside = 1 >> 2,
-
-        /// <summary>
-        /// 左超宽故障
-        /// </summary>
-        L_Outside = 1 >> 3,
-
-        /// <summary>
-        /// 右超宽故障
-        /// </summary>
-        R_Outside = 1 >> 4,
-
-        /// <summary>
-        /// 超高故障
-        /// </summary>
-        H_Outside = 1 >> 5,
-
-        /// <summary>
-        /// 条码读取失败
-        /// </summary>
-        BCR_Noread = 1 >> 6,
-
-        /// <summary>
-        /// 超重
-        /// </summary>
-        Overload = 1 >> 7,
-
-        /// <summary>
-        /// 货物严重外检故障
-        /// </summary>
-        Goods_Err_1 = 1 >> 8,
-
-        /// <summary>
-        /// 二维条码未读出
-        /// </summary>
-        BCR_Noread_1 = 1 >> 9,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES1 = 1 >> 10,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES2 = 1 >> 11,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES3 = 1 >> 12,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES4 = 1 >> 13,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES5 = 1 >> 14,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES6 = 1 >> 15,
-    }
-}

时效库/WCS.WorkEngineering/WebApi/Startup.cs

@@ -1,50 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace WCS.WorkEngineering.WebApi
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        public IConfiguration Configuration { get; }
-
-        // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddControllers();
-            //services.AddSwaggerGen(c =>
-            //{
-            //    c.SwaggerDoc("v1", new OpenApiInfo { Title = "WCSAPI", Version = "v1" });
-            //});
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-                //app.UseSwagger();
-                //app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "WebApplication1 v1"));
-            }
-
-            app.UseHttpsRedirection();
-
-            app.UseRouting();
-
-            app.UseAuthorization();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapControllers();
-            });
-        }
-    }
-}

盘条库/WCS.Entity.Protocol/Station/StationEunm.cs

@@ -1,381 +0,0 @@
-using System;
-
-namespace WCS.Entity.Protocol.Station
-{
-    /// <summary>
-    /// 指令类型
-    /// </summary>
-    [Flags]
-    public enum CmdTypeEnum : ushort
-    {
-        /// <summary>
-        /// AGV放货请求
-        /// </summary>
-        AGV_PUT_ASK = 1 << 0,
-
-        /// <summary>
-        /// AGV放货运行
-        /// </summary>
-        AGV_PUT_RUN = 1 << 1,
-
-        /// <summary>
-        /// AGV放货完成
-        /// </summary>
-        AGV_PUT_OK = 1 << 2,
-
-        /// <summary>
-        /// AGV取货请求
-        /// </summary>
-        AGV_GET_ASK = 1 << 3,
-
-        /// <summary>
-        /// AGV取货运行
-        /// </summary>
-        AGV_GET_RUN = 1 << 4,
-
-        /// <summary>
-        /// AGV取货完成
-        /// </summary>
-        AGV_GET_OK = 1 << 5,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES1 = 1 << 6,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES2 = 1 << 7,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES3 = 1 << 8,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES4 = 1 << 9,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES5 = 1 << 10,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES6 = 1 << 11,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES7 = 1 << 12,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES8 = 1 << 13,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES9 = 1 << 14,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES10 = 1 << 15,
-    }
-
-    /// <summary>
-    /// 指令回复
-    /// </summary>
-    [Flags]
-    public enum CmdReplyEnum : ushort
-    {
-        /// <summary>
-        /// CONV允许接货
-        /// </summary>
-        CONV_PUT_ALLOW = 1 << 0,
-
-        /// <summary>
-        /// CONV接货完成
-        /// </summary>
-        CONV_PUT_ACK = 1 << 1,
-
-        /// <summary>
-        /// CONV运行取货
-        /// </summary>
-        CONV_GET_ALLOW = 1 << 2,
-
-        /// <summary>
-        /// CONV取货完成确认
-        /// </summary>
-        CONV_GET_ACK = 1 << 3,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES11 = 1 << 4,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES12 = 1 << 5,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES1 = 1 << 6,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES2 = 1 << 7,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES3 = 1 << 8,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES4 = 1 << 9,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES5 = 1 << 10,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES6 = 1 << 11,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES7 = 1 << 12,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES8 = 1 << 13,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES9 = 1 << 14,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES10 = 1 << 15,
-    }
-
-    /// <summary>
-    /// 输送机模式
-    /// </summary>
-    public enum ModeEunm : short
-    {
-        /// <summary>
-        /// 自动
-        /// </summary>
-        Automatic = 1,
-
-        /// <summary>
-        /// 手动
-        /// </summary>
-        Manual = 2,
-
-        /// <summary>
-        /// 维修
-        /// </summary>
-        Repair = 3,
-    }
-
-    /// <summary>
-    /// 输送机警报
-    /// </summary>
-    [Flags]
-    public enum AlarmEunm
-    {
-    }
-
-    /// <summary>
-    /// 输送机状态
-    /// </summary>
-    [Flags]
-    public enum StatusEunm : ulong
-    {
-        /// <summary>
-        /// 自动
-        /// </summary>
-        Auto = 1 << 0,
-
-        /// <summary>
-        /// 选中状态位
-        /// </summary>
-        Choice_Bit = 1 << 1,
-
-        /// <summary>
-        /// 任务有货
-        /// </summary>
-        OT_Status = 1 << 2,
-
-        /// <summary>
-        /// 光电有货
-        /// </summary>
-        PH_Status = 1 << 3,
-
-        /// <summary>
-        /// 运行状态位
-        /// </summary>
-        Run = 1 << 4,
-
-        /// <summary>
-        /// 正转
-        /// </summary>
-        Fwd_1 = 1 << 5,
-
-        /// <summary>
-        /// 反转
-        /// </summary>
-        Rev_1 = 1 << 6,
-
-        /// <summary>
-        /// 上升/右转/伸出（顶升移栽升降、拆码盘机升降、提升机升降、拆码盘机拨叉伸出）
-        /// </summary>
-        Up_Right_Front_2 = 1 << 7,
-
-        /// <summary>
-        /// 下降/左转/缩回（顶升移栽升降、拆码盘机升降、提升机升降、拆码盘机拨叉缩回）
-        /// </summary>
-        Down_Left_Back_2 = 1 << 8,
-
-        /// <summary>
-        /// 高位（顶升移栽升降、拆码盘机升降、提升机升降）
-        /// </summary>
-        High_Station_2 = 1 << 9,
-
-        /// <summary>
-        /// 中位（拆码盘机升降）
-        /// </summary>
-        Mid_Station_2 = 1 << 10,
-
-        /// <summary>
-        /// 低位（顶升移栽升降、拆码盘机升降、提升机升降）
-        /// </summary>
-        Low_Station_2 = 1 << 11,
-
-        /// <summary>
-        /// 前位（拆码盘机拨叉伸出）
-        /// </summary>
-        Front_Station_2 = 1 << 12,
-
-        /// <summary>
-        /// 后位（拆码盘机拨叉缩回）
-        /// </summary>
-        Back_Station_2 = 1 << 13,
-
-        /// <summary>
-        /// 手动入库
-        /// </summary>
-        ManualStorage = 1 << 14,
-
-        /// <summary>
-        /// 上位机未分配任务
-        /// </summary>
-        UnassignedTask = 1 << 15,
-    }
-
-    /// <summary>
-    /// 外形故障
-    /// </summary>
-    [Flags]
-    public enum ShapeAlarmEunm : ushort
-    {
-        /// <summary>
-        /// 外形/条码等货物故障
-        /// </summary>
-        Goods_Err = 1 >> 0,
-
-        /// <summary>
-        /// 前超长故障
-        /// </summary>
-        F_Outside = 1 >> 1,
-
-        /// <summary>
-        /// 后超长故障
-        /// </summary>
-        B_Outside = 1 >> 2,
-
-        /// <summary>
-        /// 左超宽故障
-        /// </summary>
-        L_Outside = 1 >> 3,
-
-        /// <summary>
-        /// 右超宽故障
-        /// </summary>
-        R_Outside = 1 >> 4,
-
-        /// <summary>
-        /// 超高故障
-        /// </summary>
-        H_Outside = 1 >> 5,
-
-        /// <summary>
-        /// 条码读取失败
-        /// </summary>
-        BCR_Noread = 1 >> 6,
-
-        /// <summary>
-        /// 超重
-        /// </summary>
-        Overload = 1 >> 7,
-
-        /// <summary>
-        /// 货物严重外检故障
-        /// </summary>
-        Goods_Err_1 = 1 >> 8,
-
-        /// <summary>
-        /// 二维条码未读出
-        /// </summary>
-        BCR_Noread_1 = 1 >> 9,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES1 = 1 >> 10,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES2 = 1 >> 11,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES3 = 1 >> 12,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES4 = 1 >> 13,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES5 = 1 >> 14,
-
-        /// <summary>
-        /// 备用
-        /// </summary>
-        RES6 = 1 >> 15,
-    }
-}

盘条库/WCS.WorkEngineering/WebApi/Startup.cs

@@ -1,50 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace WCS.WorkEngineering.WebApi
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        public IConfiguration Configuration { get; }
-
-        // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddControllers();
-            //services.AddSwaggerGen(c =>
-            //{
-            //    c.SwaggerDoc("v1", new OpenApiInfo { Title = "WCSAPI", Version = "v1" });
-            //});
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-                //app.UseSwagger();
-                //app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "WebApplication1 v1"));
-            }
-
-            app.UseHttpsRedirection();
-
-            app.UseRouting();
-
-            app.UseAuthorization();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapControllers();
-            });
-        }
-    }
-}