堆垛机新增货物数量返回

Projects/永冠OPP/WCS.Entity.Protocol/SRM/ISRM520.cs

@@ -12,87 +12,87 @@ namespace WCS.Entity.Protocol
         /// <summary>
         /// WCS心跳信号
         /// </summary>
-         short Handshake_1 { get; set; }
+        short Handshake_1 { get; set; }
 
         /// <summary>
-        /// 备用1
+        /// 货物数量
         /// </summary>
-         short RES1_1 { get; set; }
+        short RES1_1 { get; set; }
 
         /// <summary>
         /// 备用2
         /// </summary>
-         short RES2_1 { get; set; }
+        short RES2_1 { get; set; }
 
         /// <summary>
         /// 货物类型
         /// </summary>
-         short GoodsType_1 { get; set; }
+        short GoodsType_1 { get; set; }
 
         /// <summary>
         /// 行驶速度
         /// </summary>
-         SCSpeedMode SpeedMode_1 { get; set; }
+        SCSpeedMode SpeedMode_1 { get; set; }
 
         /// <summary>
         /// 起始行
         /// </summary>
-         short SLine_1 { get; set; }
+        short SLine_1 { get; set; }
 
         /// <summary>
         /// 起始列
         /// </summary>
-         short SCol_1 { get; set; }
+        short SCol_1 { get; set; }
 
         /// <summary>
         /// 起始层
         /// </summary>
-         short SLayer_1 { get; set; }
+        short SLayer_1 { get; set; }
 
         /// <summary>
         /// 起始深度
         /// </summary>
-         short SDepth_1 { get; set; }
+        short SDepth_1 { get; set; }
 
         /// <summary>
         /// 目标行
         /// </summary>
-         short ELine_1 { get; set; }
+        short ELine_1 { get; set; }
 
         /// <summary>
         /// 目标列
         /// </summary>
-         short ECol_1 { get; set; }
+        short ECol_1 { get; set; }
 
         /// <summary>
         /// 目标层
         /// </summary>
-         short ELayer_1 { get; set; }
+        short ELayer_1 { get; set; }
 
         /// <summary>
         /// 目标深度
         /// </summary>
-         short EDepth_1 { get; set; }
+        short EDepth_1 { get; set; }
 
         /// <summary>
         ///任务号
         /// </summary>
-         int TaskID_1 { get; set; }
+        int TaskID_1 { get; set; }
 
         /// <summary>
         /// 触发
         /// </summary>
-         short VoucherNo_1 { get; set; }
+        short VoucherNo_1 { get; set; }
 
         /// <summary>
         /// 完成任务触发
         /// </summary>
-         short FinishedACK_1 { get; set; }
+        short FinishedACK_1 { get; set; }
 
         /// <summary>
         /// 备用3
         /// </summary>
-         short RES3_1 { get; set; }
+        short RES3_1 { get; set; }
 
         /// <summary>
         /// 备用4
@@ -106,87 +106,87 @@ namespace WCS.Entity.Protocol
         /// <summary>
         /// WCS心跳信号
         /// </summary>
-         short Handshake_2 { get; set; }
+        short Handshake_2 { get; set; }
 
         /// <summary>
-        /// 备用1
+        /// 货物数量
         /// </summary>
-         short RES1_2 { get; set; }
+        short RES1_2 { get; set; }
 
         /// <summary>
         /// 备用2
         /// </summary>
-         short RES2_2 { get; set; }
+        short RES2_2 { get; set; }
 
         /// <summary>
         /// 货物类型
         /// </summary>
-         short GoodsType_2 { get; set; }
+        short GoodsType_2 { get; set; }
 
         /// <summary>
         /// 行驶速度
         /// </summary>
-         SCSpeedMode SCSpeedMode_2 { get; set; }
+        SCSpeedMode SCSpeedMode_2 { get; set; }
 
         /// <summary>
         /// 起始行
         /// </summary>
-         short SLine_2 { get; set; }
+        short SLine_2 { get; set; }
 
         /// <summary>
         /// 起始列
         /// </summary>
-         short SCol_2 { get; set; }
+        short SCol_2 { get; set; }
 
         /// <summary>
         /// 起始层
         /// </summary>
-         short SLayer_2 { get; set; }
+        short SLayer_2 { get; set; }
 
         /// <summary>
         /// 起始深度
         /// </summary>
-         short SDepth_2 { get; set; }
+        short SDepth_2 { get; set; }
 
         /// <summary>
         /// 目标行
         /// </summary>
-         short ELine_2 { get; set; }
+        short ELine_2 { get; set; }
 
         /// <summary>
         /// 目标列
         /// </summary>
-         short ECol_2 { get; set; }
+        short ECol_2 { get; set; }
 
         /// <summary>
         /// 目标层
         /// </summary>
-         short ELayer_2 { get; set; }
+        short ELayer_2 { get; set; }
 
         /// <summary>
         /// 目标深度
         /// </summary>
-         short EDepth_2 { get; set; }
+        short EDepth_2 { get; set; }
 
         /// <summary>
         ///任务号
         /// </summary>
-         int TaskID_2 { get; set; }
+        int TaskID_2 { get; set; }
 
         /// <summary>
         /// 触发
         /// </summary>
-         short VoucherNo_2 { get; set; }
+        short VoucherNo_2 { get; set; }
 
         /// <summary>
         /// 完成任务触发
         /// </summary>
-         short FinishedACK_2 { get; set; }
+        short FinishedACK_2 { get; set; }
 
         /// <summary>
         /// 备用3
         /// </summary>
-         short RES3_2 { get; set; }
+        short RES3_2 { get; set; }
 
         /// <summary>
         /// 备用4

Projects/永冠OPP/WCS.Service/Extensions/DeviceExtension.cs

@@ -814,7 +814,8 @@ namespace WCS.Service.Extensions
         /// 一工位写任务
         /// </summary>
         /// <param name="task"></param>
-        public void WriteTask1(Task task)
+        /// <param name="goodsnum">货物数量</param>
+        public void WriteTask1(Task task, short goodsnum)
         {
             InfoLog.INFO_SRMINFO($"写入堆垛机[{Entity.CODE}]1工位-开始:[{Data.TaskID_1}][{Data.SLine_1}][{Data.SCol_1}][{Data.SLayer_1}][{Data.ELine_1}][{Data.VoucherNo_1}]");
             Data.TaskID_1 = task.ID;
@@ -824,6 +825,7 @@ namespace WCS.Service.Extensions
             Data.ELine_1 = task.SRMSTATION.ToShort();
             Data.ECol_1 = 0;
             Data.ELayer_1 = 0;
+            Data.RES1_1 = goodsnum;
             Data.VoucherNo_1++;
             InfoLog.INFO_SRMINFO($"写入堆垛机[{Entity.CODE}]1工位-结束:[{Data.TaskID_1}][{Data.SLine_1}][{Data.SCol_1}][{Data.SLayer_1}][{Data.ELine_1}][{Data.VoucherNo_1}]");
         }
@@ -832,7 +834,8 @@ namespace WCS.Service.Extensions
         /// 二工位写任务
         /// </summary>
         /// <param name="task"></param>
-        public void WriteTask2(Task task)
+        /// <param name="goodsnum">货物数量</param>
+        public void WriteTask2(Task task, short goodsnum)
         {
             InfoLog.INFO_SRMINFO($"写入堆垛机[{Entity.CODE}]2工位-开始:[{Data.TaskID_2}][{Data.SLine_2}][{Data.SCol_2}][{Data.SLayer_2}][{Data.ELine_2}][{Data.VoucherNo_2}]");
             Data.TaskID_2 = task.ID;
@@ -842,6 +845,7 @@ namespace WCS.Service.Extensions
             Data.ELine_2 = task.SRMSTATION.ToShort();
             Data.ECol_2 = 0;
             Data.ELayer_2 = 0;
+            Data.RES1_2 = goodsnum;
             Data.VoucherNo_2++;
             InfoLog.INFO_SRMINFO($"写入堆垛机[{Entity.CODE}]2工位-结束:[{Data.TaskID_2}][{Data.SLine_2}][{Data.SCol_2}][{Data.SLayer_2}][{Data.ELine_2}][{Data.VoucherNo_2}]");
         }

Projects/永冠OPP/WCS.Service/Works/SRM/SRMWork.cs

@@ -212,6 +212,7 @@ namespace WCS.Service.Works.SRM
                             obj.Data.ELine_1 = loc.Row;
                             obj.Data.ECol_1 = loc.Colomn;
                             obj.Data.ELayer_1 = loc.Layer;
+                            obj.Data.RES1_1 = (short)taskCount;
                         }
                         //处理二工位
                         if (dev2IsThereATask)
@@ -238,6 +239,7 @@ namespace WCS.Service.Works.SRM
                             obj.Data.ELine_2 = loc.Row;
                             obj.Data.ECol_2 = loc.Colomn;
                             obj.Data.ELayer_2 = loc.Layer;
+                            obj.Data.RES1_2 = (short)taskCount;
                         }
                         if (dev1IsThereATask) obj.Data.VoucherNo_1++;
                         if (dev2IsThereATask) obj.Data.VoucherNo_2++;
@@ -378,11 +380,11 @@ namespace WCS.Service.Works.SRM
                             item.SRMSTATION = task.SRMSTATION;
                             if (fork == SrmFork.货叉1) // 列数较小的放一工位
                             {
-                                obj.WriteTask1(item);
+                                obj.WriteTask1(item, (short)tasks.Length);
                             }
                             else if (fork == SrmFork.货叉2) //列数较大的放二工位
                             {
-                                obj.WriteTask2(item);
+                                obj.WriteTask2(item, (short)tasks.Length);
                             }
                         }
                     });