库左入子母托

成品库/WCS.WorkEngineering/Systems/NoInteractionSystems.cs

@@ -126,7 +126,7 @@ namespace WCS.WorkEngineering.Systems
                                         db.Default.Updateable(task).ExecuteCommand();
                                         task.AddWCS_TASK_DTL(db, task.Device, $"初始化出库任务信息,放货站台:{task.SrmStation}");
                                     }
-                                    else if (task.Type == TaskType.Delivery)
+                                    else if (task.Type == TaskType.Delivery && task.AddrFrom != "8050")
                                     {
                                         task.Status = Entity.TaskStatus.WaitingToExecute;
                                         db.Default.Updateable(task).ExecuteCommand();

成品库/WCS.WorkEngineering/Systems/装箱区扫码.cs

@@ -52,21 +52,30 @@ namespace WCS.WorkEngineering.Systems
                 //找到对应任务
                 if (obj.Entity.Code == "8050")
                 {
-                    var taskInfo = db.Queryable<WCS_TaskInfo>().First(x => x.BarCode == bcr);
+                    var taskInfo = db.Queryable<WCS_TaskInfo>().First(x => (x.AddrFrom == "8050" || x.BusType == "间隔板出库") && x.Status == Entity.TaskStatus.WaitingToExecute);
                     if (taskInfo == null)
                     {
-                        //向WMS申请入库任务
-                        var res = WmsApi.I_WCS_GetInTask(bcr, obj.Entity.Code);
                         return;
+                        //向WMS申请入库任务
+                        //var res = WmsApi.I_WCS_GetInTask(bcr, obj.Entity.Code);
+                        //return;
+                        //throw new KnownException($"未找到条码{bcr}对应WCS任务", LogLevelEnum.High);
                     }
                     if (taskInfo.Status == Entity.TaskStatus.WaitingToExecute)
                     {
-                        taskInfo.AddrNext = "8058";
+                        if (taskInfo.Type == TaskType.Delivery)
+                        {
+                            taskInfo.AddrNext = "8058";
+                        }
+                        else if (taskInfo.Type == TaskType.OutDepot && taskInfo.BusType == "间隔板出库")
+                        {
+                            taskInfo.AddrNext = taskInfo.AddrTo;
+                        }  
                         taskInfo.Status = Entity.TaskStatus.ConveyorExecution;
                         taskInfo.EditWho = "WCS";
                         taskInfo.EditTime = DateTime.Now;
                         db.Updateable(taskInfo).ExecuteCommand();
-                        taskInfo.AddWCS_TASK_DTL(_db, obj.Entity.Code, taskInfo.AddrNext, $"8050扫码入库");
+                        taskInfo.AddWCS_TASK_DTL(_db, obj.Entity.Code, taskInfo.AddrNext, $"8050扫码");
                         //taskInfo.updateRedisHash();
                         task = taskInfo;
                     }
@@ -164,7 +173,7 @@ namespace WCS.WorkEngineering.Systems
         }
         public override bool Select(Device dev)
         {
-            return dev.Code == "8050"|| dev.Code == "8058"; ;
+            return dev.Code == "8050"|| dev.Code == "8058";
         }
     }
 }