空托任务完成优化

成品库/WCS.WorkEngineering/Systems/装箱区码垛工位任务处理.cs

@@ -33,11 +33,7 @@ namespace WCS.WorkEngineering.Systems
             SqlSugarHelper.Do(db =>
             {
                 //找到对应任务
-                var taskInfo = db.Default.Queryable<WCS_TaskInfo>().First(v => v.ID == obj.Data2.TaskNumber);
-                if (obj.Entity.Code == "8307")
-                {
-                    World.Log($"{obj.Entity.Code}id{obj.Data2.TaskNumber}");
-                }
+                var taskInfo = db.Default.Queryable<WCS_TaskInfo>().First(v => v.ID == obj.Data2.TaskNumber);              
                 
                 if (taskInfo != null && taskInfo.AddrTo == obj.Entity.Code && taskInfo.Status != Entity.TaskStatus.Finish)
                 {
@@ -47,6 +43,13 @@ namespace WCS.WorkEngineering.Systems
                     db.Default.Updateable(taskInfo).ExecuteCommand();
                     taskInfo.AddWCS_TASK_DTL(db, obj.Entity.Code, taskInfo.AddrNext, $"任务完成");
                     taskInfo.CompleteTasks(db);
+
+                    var taskInfo1 = db.Default.Queryable<WCS_TaskInfo>().First(v => v.ID == obj.Data2.TaskNumber);
+                    if (taskInfo1 != null && taskInfo1.AddrTo == obj.Entity.Code && taskInfo1.Status == Entity.TaskStatus.Finish)
+                    {
+                        WmsApi.CompleteTask(taskInfo1.ID);
+                        taskInfo1.CancelTasks(db);
+                    }
                 }
                 else
                 {
@@ -72,13 +75,13 @@ namespace WCS.WorkEngineering.Systems
             });
             SqlSugarHelper.Do(db =>
             {
-                var taskInfo = db.Default.Queryable<WCS_TaskInfo>().First(v => v.ID == obj.Data2.TaskNumber);
-                if (taskInfo != null && taskInfo.AddrTo == obj.Entity.Code && taskInfo.Status == Entity.TaskStatus.Finish)
-                {
-                    WmsApi.CompleteTask(taskInfo.ID);
-                    taskInfo.CancelTasks(db);
+                //var taskInfo = db.Default.Queryable<WCS_TaskInfo>().First(v => v.ID == obj.Data2.TaskNumber);
+                //if (taskInfo != null && taskInfo.AddrTo == obj.Entity.Code && taskInfo.Status == Entity.TaskStatus.Finish)
+                //{
+                //    WmsApi.CompleteTask(taskInfo.ID);
+                //    taskInfo.CancelTasks(db);
 
-                }
+                //}
                if (task == null)
                     return;
                 obj.Data.TaskNumber = task.ID;