someupdate

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

@@ -386,7 +386,7 @@ namespace Siger.ApiACC.Controllers
                         var machineMonitor = _automationFixtureMonitor.Get(f => f.section == cleanMachine.section);
                         if (machineMonitor == null)
                         {
-                            Logger.WriteLineError($"AutoProcess Tasklist 为空");
+                            Logger.WriteLineError($"AutoProcess 清洗机{cleanMachine.section}machineMonitor 为空");
                             return;
                         }
                         CreateTask(cleanMachine.section, TaskActionType.Unload, TaskAction.Step_JGZX_QXJ, machineMonitor.fixtureguid, machineMonitor.ordernumber, machineMonitor.sn, "", machineMonitor.productId, machineMonitor.productCode, machineMonitor.locationId, machineMonitor.route);
@@ -449,25 +449,52 @@ namespace Siger.ApiACC.Controllers
             if (cleanMachine != null)
             {
                 var fullMachine = machineStatusList.FirstOrDefault(f => f.status == (int)Automation.MachineStatus.Complated);
-                if (fullMachine != null && cleanMachine.status==(int)Automation.MachineStatus.Waiting)
+                if (fullMachine != null && cleanMachine.status == (int)Automation.MachineStatus.Waiting)
                 {
                     Logger.WriteLineError($"AutoProcess 清洗机空闲，创建普通设备下料到清洗机Task ");
-                    if (tasklist==null)
+
+                    //更新清洗机监控
+                    var monitor = _automationFixtureMonitor.Get(cleanMachine.section);
+                    if (monitor == null)
                     {
-                        Logger.WriteLineError($"AutoProcess Tasklist 为空，查找设备Monitor{fullMachine.section }状态");
-                        var machineMonitor = _automationFixtureMonitor.Get(f => f.section == fullMachine.section);
-                        if(machineMonitor==null)
+                        _automationFixtureMonitor.Insert(new siger_automation_fixture_tools_monitor
                         {
-                            Logger.WriteLineError($"AutoProcess Tasklist 为空");
-                            return;
-                        }
-                        CreateTask(fullMachine.section, TaskActionType.Unload, TaskAction.Step_JGZX_QXJ, machineMonitor.fixtureguid, machineMonitor.ordernumber, machineMonitor.sn,"", machineMonitor.productId, machineMonitor.productCode, machineMonitor.locationId, machineMonitor.route);
+                            section = cleanMachine.section,
+                            fixtureguid = tasklist.fixtureguid,
+                            fixturename = tasklist.fixturename,
+                            productCode = tasklist.productcode,
+                            productId = tasklist.productid,
+                            locationId = tasklist.locationid,
+                            ordernumber = tasklist.ordercode,
+                            productName = tasklist.productname,
+                            projectId = tasklist.projectId,
+                            taskno = tasklist.no,
+                            route = tasklist.route,
+                            sn = tasklist.sn,
+                            updatetime = DateTime.Now,
+                            status = 1,
+                            createtime = DateTime.Now,
+
+                        });
                     }
                     else
                     {
-                        CreateTask(fullMachine.section, TaskActionType.Unload, TaskAction.Step_JGZX_QXJ, tasklist.fixtureguid, tasklist.ordercode, tasklist.sn, tasklist.programnumber, tasklist.productid, tasklist.productcode, tasklist.locationid, tasklist.route);
+                        monitor.fixtureguid = tasklist.fixtureguid;
+                        monitor.fixturename = tasklist.fixturename;
+                        monitor.productCode = tasklist.productcode;
+                        monitor.productId = tasklist.productid;
+                        monitor.locationId = tasklist.locationid;
+                        monitor.ordernumber = tasklist.ordercode;
+                        monitor.productName = tasklist.productname;
+                        monitor.projectId = tasklist.projectId;
+                        monitor.taskno = tasklist.no;
+                        monitor.route = tasklist.route;
+                        monitor.sn = tasklist.sn;
+                        monitor.updatetime = DateTime.Now;
+                        monitor.status = tasklist.status;
                     }
-                   
+                    //创建CNC 下料到清洗机
+                    CreateTask(fullMachine.section, TaskActionType.Unload, TaskAction.Step_JGZX_QXJ, tasklist.fixtureguid, tasklist.ordercode, tasklist.sn, tasklist.programnumber, tasklist.productid, tasklist.productcode, tasklist.locationid, tasklist.route);
 
                     return; //完成当前任务 退出
                 }
@@ -512,8 +539,7 @@ namespace Siger.ApiACC.Controllers
                 ordercode= orderno,
                 sn= sn, 
                 remark= EnumHelper.GetEnumDesc(taskAction),
-                route=route
-
+                route=route,
             });
             var monitor = _automationFixtureMonitor.Get(f => f.section == section);
             if (monitor == null)
@@ -531,7 +557,7 @@ namespace Siger.ApiACC.Controllers
                     route=route,
                     status=1,
                     sn=sn,
-                    taskno=taskNo,
+                    taskno=taskNo, 
                 });
             }
             else
@@ -582,7 +608,7 @@ namespace Siger.ApiACC.Controllers
                         Logger.WriteLineError($"SelectLocation 设备{b.machineID} routeid:{b.route_number}-{b.route_name}productId:{b.product_name} 储位{autoLocation.locationid}工件Sn:{autoLocation.sn}不在储位上");
                         continue;
                     }
-                    Logger.WriteLineError($"SelectLocation  beasetId:{b.id}标准节拍{b.route_number}{b.route_name} 有效订单");
+                    Logger.WriteLineError($"SelectLocation 有效订单号{autoLocation.ordernumber} beasetId:{b.id}工序{b.route_number}-{b.route_name}");
                     TempList.Add(new ResponseAutoRouteInfo
                     {
                         FixtureGuid = autoLocation.fixturetools,

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Entities/siger_automation_task_list.cs

@@ -102,6 +102,9 @@ namespace Siger.Middlelayer.AccRepository.Entities
         /// </summary>
         public string remark { get; set; }
 
+        /// <summary>
+        /// 准备前往下一个工站ID
+        /// </summary>
         public string extend1 { get; set; }
 
         public int route { get; set; }