fix

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

@@ -50,7 +50,7 @@ namespace WCS.Service.Works.Station
                     }
 
                     if (!devs.Any()) return;
-                    var maxGoodsnum = devs.Select(v => v.Item1.Data.Goodsnum).OrderByDescending(v => v).FirstOrDefault();
+                    var maxGoodsnum = devs.Select(v => v.Item1.Data2.Goodsnum).OrderByDescending(v => v).FirstOrDefault();
                     if (devs.Count != maxGoodsnum) throw new WarnException($"可用货物数{devs.Count},实际货物数{maxGoodsnum}");
                     var items = devs.ToArray();
                     List<I_WCS_GetInTaskResponseItem> Infos = items.Length switch

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

@@ -96,6 +96,7 @@ namespace WCS.Service.Works.Station
                             else if (agvtask.AGVStatus == AGVTaskStatus.取放完成)
                             {
                                 if (obj.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.AGV放货完成信号))) throw new WarnException("顶升下降信号未清除");
+                                if (obj.Items.Any(v => !v.Data2.Status.HasFlag(IstationStatus.光电状态))) throw new WarnException("放货完成设备无光电");
 
                                 agvtask.Status = agvtask.AGVStatus;
                                 agvtask.UpdateTime = DateTime.Now;
@@ -111,6 +112,8 @@ namespace WCS.Service.Works.Station
                             }
                             else if (Ltc.Do(agvtask, v => v.AGVStatus == AGVTaskStatus.完成))
                             {
+                                //if (agvtask.Status != AGVTaskStatus.取放完成) throw new WarnException("RGV未上报取放完成状态，不允许跳状态");
+
                                 agvtask.Status = agvtask.AGVStatus;
                                 agvtask.UpdateTime = DateTime.Now;
                                 db.Default.SaveChanges();
@@ -187,7 +190,7 @@ namespace WCS.Service.Works.Station
                         2 => WMS.I_WCS_GetInTask(items[0].Item2, items[0].Item1.Entity.CODE, items[1].Item2, items[1].Item1.Entity.CODE),
                         _ => throw new WarnException($"一组任务数量最大为2,当前{items.Length}"),
                     };
-                    var agvTask = db.Default.Set<WCS_AGVTask>().Where(v => v.ID == items[0].Item1.Data.Goodscode).FirstOrDefault() ?? throw new WarnException("无完成AGV任务");
+                    var agvTask = db.Default.Set<WCS_AGVTask>().Where(v => v.Status == AGVTaskStatus.完成 && v.AGVStatus == AGVTaskStatus.完成 && v.).FirstOrDefault() ?? throw new WarnException("无完成AGV任务");
 
                     if (agvTask.Status != AGVTaskStatus.完成扫码)
                     {