fix

Projects/永冠/WCS.Service/Works/RGV/RGVWork.cs

@@ -356,25 +356,13 @@ namespace WCS.Service.Works
                         var task = db.Default.Set<WCS_TASK>().Find(station_3060.Data.TASKNUM);
                         if (task == null)
                             throw new Exception($"任务号{station_3060.Data.TASKNUM}不存在");
-                        if (task.TYPE == TaskType.出库) return;
-                        //if (task.TYPE == TaskType.出库)
-                        //{
-                        //    task.UPDATETIME = DateTime.Now;
-                        //    db.Default.SaveChanges();
-                        //    //station_3060.Data2.TASKNUM = station_3060.Data.TASKNUM;
-                        //    station_3060.Data2.GOODSEND = 3001;
-                        //    station_3060.Data2.CONFIRM = true;
-                        //}
-                        //else
-                        //{
+                        if (task.TYPE == TaskType.出库) return;                      
                         task.ADDRNEXT = station_3060.Entity.CODE;
                         task.ADDRTO = "2017";
                         task.UPDATETIME = DateTime.Now;
-                        db.Default.SaveChanges();
-                        //station_3060.Data2.TASKNUM = station_3060.Data.TASKNUM;
+                        db.Default.SaveChanges();                       
                         station_3060.Data2.GOODSEND = 3013;
                         station_3060.Data2.CONFIRM = true;
-                        //}
                     });
                 }
             }
@@ -401,9 +389,7 @@ namespace WCS.Service.Works
                         station.Data2.GOODSTYPE = 2;
                         station.Data2.CONFIRM = true;
                     });
-                }
-                //throw new Exception("交通管制,提升机被入库任务占用");
-
+                }              
             }
             if (station_3028.Data.PH_STATUS && station_3028.Data.GOODSEND == 3028 && station_3028.Data.TASKNUM > 10000)
             {

Projects/永冠/WCS.Service/Works/Stations/AGV交互.cs

@@ -149,6 +149,12 @@ namespace WCS.Service.Works.Stations
                     pld.TaskList.Add(agvtask);
                     try
                     {
+                        if (Ltc.Do(agvtask, agvtask => agvtask.Status == AGVTaskStatus.新建 && agvtask.AGVStatus == AGVTaskStatus.取消))
+                        {
+                            agvtask.Status = agvtask.AGVStatus;
+                            agvtask.UpdateTime = DateTime.Now;
+                            db.Default.SaveChanges();
+                        }
                         if (Ltc.Do(agvtask, agvtask => agvtask.Status == AGVTaskStatus.新建))
                         {
                             //相关错误会在入库扫码位报出，此处只做拦截处理