someupdate

Server/Apis/Siger.ApiACC/Controllers/AutomationController.cs

@@ -10,7 +10,7 @@ using Siger.Middlelayer.AccRepository.Request;
 using Siger.Middlelayer.Common;
 using Siger.ApiCommon.Filters;
 using Siger.Middlelayer.Common.Extensions;
-using Siger.Middlelayer.Common.Log;
+using Siger.Middlelayer.Log;
 using Siger.Middlelayer.Common.ModuleEnum;
 using Siger.Middlelayer.Repository;
 using Siger.Middlelayer.Repository.Repositories.Interface;
@@ -389,7 +389,7 @@ namespace Siger.ApiACC.Controllers
                     var monitor = _automationFixtureMonitor.Get(f => f.section == cleanMachine.section);
                     if (monitor != null)
                     {
-                        CreateTask(cleanMachine.section, TaskActionType.Unload, TaskAction.Step_QXJ_LK, monitor.fixtureguid, monitor.ordernumber, monitor.sn, "无程序",monitor.productId, monitor.productCode, monitor.locationId);
+                        CreateTask(cleanMachine.section, TaskActionType.Unload, TaskAction.Step_QXJ_LK, monitor.fixtureguid, monitor.ordernumber, monitor.sn, "无程序",monitor.productId, monitor.productCode, monitor.locationId,monitor.route);
                         return; //完成当前任务 退出
                     }
                 }
@@ -459,7 +459,7 @@ namespace Siger.ApiACC.Controllers
                         }
                         _automationLocation.Update(locationObj);
 
-                        CreateTask(location.section, TaskActionType.Load, TaskAction.Step_LK_JGZX, location.fixture, location.ordernumber, location.sn, location.pn, location.productId, location.productCode, location.location);
+                        CreateTask(location.section, TaskActionType.Load, TaskAction.Step_LK_JGZX, location.fixture, location.ordernumber, location.sn, location.pn, location.productId, location.productCode, location.location,location.route);
                         return; //完成当前任务 退出
                     }
                 }
@@ -478,7 +478,7 @@ namespace Siger.ApiACC.Controllers
                         Logger.WriteLineError($"AutoProcess 找不到CNC监控信息");
                         return;
                     }
-                    CreateTask(fullMachine.section,TaskActionType.Unload, TaskAction.Step_JGZX_QXJ, monitor.fixtureguid, monitor.ordernumber, monitor.sn,"无程序",monitor.productId, monitor.productCode, monitor.locationId);
+                    CreateTask(fullMachine.section,TaskActionType.Unload, TaskAction.Step_JGZX_QXJ, monitor.fixtureguid, monitor.ordernumber, monitor.sn,"无程序",monitor.productId, monitor.productCode, monitor.locationId,monitor.route);
 
                     return; //完成当前任务 退出
                 }
@@ -497,7 +497,7 @@ namespace Siger.ApiACC.Controllers
         /// <param name="sn">工件</param>
         /// <param name="productCode">产品CODE</param>
         /// <param name="locationid">储位ID</param>
-        void CreateTask(int section,TaskActionType actionType, TaskAction taskAction,string guid,string orderno,string sn,string program,int productId,string productCode,int locationid)
+        void CreateTask(int section,TaskActionType actionType, TaskAction taskAction,string guid,string orderno,string sn,string program,int productId,string productCode,int locationid,int route)
         {
             var taskNo = _automationTaskList.CrateTaskNumber(Automation.TaskTrigerType.Auto);
             _automationTaskList.Insert(new siger_automation_task_list
@@ -522,7 +522,8 @@ namespace Siger.ApiACC.Controllers
                 locationid= locationid,
                 ordercode= orderno,
                 sn= sn, 
-                remark= EnumHelper.GetEnumDesc(taskAction)
+                remark= EnumHelper.GetEnumDesc(taskAction),
+                route=route
 
             });