fix

Projects/永冠OPP/WCS.Service/Works/Station/一楼入库.cs

@@ -86,7 +86,7 @@ namespace WCS.Service.Works.Station
                             finishTask.Station.Data.Tasknum = task.ID;
                             finishTask.Station.Data.Goodsstart = task.ADDRFROM.ToShort();
                             finishTask.Station.Data.Goodsend = task.ADDRNEXT.ToShort();
-                            finishTask.Station.Data.Goodsnum = (short)finishTaskList.Count;
+                            finishTask.Station.Data.Goodsnum = finishTaskList.Count.ToShort();
                             finishTask.Station.Data.CmdType = IstationCmdType.扫码入库;
                             finishTask.Station.Data.VoucherNo++;
                         }
@@ -112,8 +112,8 @@ namespace WCS.Service.Works.Station
             {
                 var code = obj.Entity.CODE;
                 //两个设备都必须满足的条件
-                if (obj.Items.Any(v => v.Data.VoucherNo != v.Data2.VoucherNo)) return;
-                if (obj.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) return;
+                if (obj.Items.Any(v => v.Data.VoucherNo != v.Data2.VoucherNo)) throw new WarnException("等待任务执行，凭证号不一致");
+                if (obj.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) throw new DoException("运行中");
 
                 //成功分配巷道的任务的任务
                 var finishTaskList = new List<FinishTaskList<int>>();
@@ -256,7 +256,7 @@ namespace WCS.Service.Works.Station
                         var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.WMSTASK == finish.FinishCode);
                         if (task == null) continue;
                         finish.Station.Data.Tasknum = task.ID;
-                        finish.Station.Data.Goodsstart = obj.Entity.CODE.ToShort();
+                        finish.Station.Data.Goodsstart = finish.Station.Entity.CODE.ToShort();
                         finish.Station.Data.Goodsend = task.ADDRNEXT.ToShort();
                         finish.Station.Data.CmdType = IstationCmdType.分配目标地址;
                         finish.Station.Data.VoucherNo++;

Projects/永冠OPP/WCS.Service/Works/Station/涂布出库.cs

@@ -68,7 +68,7 @@ namespace WCS.Service.Works.Station
                         var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.WMSTASK == finish.FinishCode);
                         if (task == null) continue;
                         finish.Station.Data.Tasknum = task.ID;
-                        finish.Station.Data.Goodsstart = obj.Entity.CODE.ToShort();
+                        finish.Station.Data.Goodsstart = finish.Station.Entity.CODE.ToShort();
                         finish.Station.Data.Goodsend = task.ADDRNEXT.ToShort();
                         finish.Station.Data.Goodsnum = finishTaskList.Count.ToShort();
                         finish.Station.Data.CmdType = IstationCmdType.堆垛机放货完成请求目标地址;
@@ -144,7 +144,7 @@ namespace WCS.Service.Works.Station
                         var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.WMSTASK == finish.FinishCode);
                         if (task == null) continue;
                         finish.Station.Data.Tasknum = task.ID;
-                        finish.Station.Data.Goodsstart = obj.Entity.CODE.ToShort();
+                        finish.Station.Data.Goodsstart = finish.Station.Entity.CODE.ToShort();
                         finish.Station.Data.Goodsend = task.ADDRNEXT.Replace("G", "").ToShort();
                         finish.Station.Data.Goodsnum = finishTaskList.Count.ToShort();
                         finish.Station.Data.GoodsSize = task.Length.ToShort();
@@ -257,7 +257,7 @@ namespace WCS.Service.Works.Station
                         finish.Station.Data.Tasknum = task.ID;
                         finish.Station.Data.Goodsstart = finish.Station.Entity.CODE.ToShort();
                         finish.Station.Data.Goodsend = task.ADDRNEXT.ToShort();
-                        finish.Station.Data.GoodsSize = (short)task.Length;
+                        finish.Station.Data.GoodsSize = task.Length.ToShort();
                         finish.Station.Data.Goodsnum = finishTaskList.Count.ToShort();
                         finish.Station.Data.CmdType = IstationCmdType.分配目标地址;
                         finish.Station.Data.VoucherNo++;