涂布入库人工入库判断优化

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

@@ -261,24 +261,50 @@ namespace WCS.Service.Works.Station
                     var infos = devise.GetWMSInTask();
 
                     WCS_AGVTask agvTask = null;
+                    var s1 = Device.Find("1394").Device<IStation520, IStation521, IStation523>();
+                    var s2 = Device.Find("1395").Device<IStation520, IStation521, IStation523>();
 
-                    if (!stationDeviceGroup.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.手动入库)))
+                    if (stationDeviceGroup.Entity.CODE == "G1435")
                     {
-                        if (stationDeviceGroup.Entity.CODE == "G1435")
+                        if (!stationDeviceGroup.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.手动入库)) && !s1.Data2.Status.HasFlag(IstationStatus.手动入库) && !s2.Data2.Status.HasFlag(IstationStatus.手动入库))
                         {
                             agvTask = db.Default.Set<WCS_AGVTask>().FirstOrDefault(v => v.Status == AGVTaskStatus.完成 && v.Station == "G1394") ?? throw new WarnException("无完成AGV任务");
                         }
-                        else
+                        if (agvTask.Status != AGVTaskStatus.完成扫码)
                         {
-                            agvTask = db.Default.Set<WCS_AGVTask>().FirstOrDefault(v => v.Status == AGVTaskStatus.完成 && v.Station == stationDeviceGroup.Entity.CODE) ?? throw new WarnException("无完成AGV任务");
+                            agvTask.Status = AGVTaskStatus.完成扫码;
+                            agvTask.UpdateTime = DateTime.Now;
                         }
-
+                    }
+                    else
+                    {
+                        if (!stationDeviceGroup.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.手动入库)))
+                        {
+                            agvTask = db.Default.Set<WCS_AGVTask>().FirstOrDefault(v => v.Status == AGVTaskStatus.完成 && v.Station == stationDeviceGroup.Entity.CODE) ?? throw new WarnException("无完成AGV任务");
+                        }                          
                         if (agvTask.Status != AGVTaskStatus.完成扫码)
                         {
                             agvTask.Status = AGVTaskStatus.完成扫码;
                             agvTask.UpdateTime = DateTime.Now;
                         }
                     }
+                    //if (!stationDeviceGroup.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.手动入库)))
+                    //{
+                    //    if (stationDeviceGroup.Entity.CODE == "G1435")
+                    //    {
+                    //        agvTask = db.Default.Set<WCS_AGVTask>().FirstOrDefault(v => v.Status == AGVTaskStatus.完成 && v.Station == "G1394") ?? throw new WarnException("无完成AGV任务");
+                    //    }
+                    //    else
+                    //    {
+                    //        agvTask = db.Default.Set<WCS_AGVTask>().FirstOrDefault(v => v.Status == AGVTaskStatus.完成 && v.Station == stationDeviceGroup.Entity.CODE) ?? throw new WarnException("无完成AGV任务");
+                    //    }
+
+                    //    if (agvTask.Status != AGVTaskStatus.完成扫码)
+                    //    {
+                    //        agvTask.Status = AGVTaskStatus.完成扫码;
+                    //        agvTask.UpdateTime = DateTime.Now;
+                    //    }
+                    //}
 
                     foreach (var item in devise)
                     {