someupdate

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

@@ -82,7 +82,7 @@ namespace Siger.ApiACC.Controllers
                      machineid=request.machineid,
                      projectId=PID,
                      updatetime=DateTime.Now,
-                     enable=request.enable,
+                     enable=request.enable==1?1:0,
                      status=request.status
                 });
             }else
@@ -257,34 +257,12 @@ namespace Siger.ApiACC.Controllers
                 return new ObjectResult(CommonEnum.Succefull);
             }
             //3.Tasklist 任务全部完成 ,创建自动任务
-
-            switch (request.status)
-            {
-                case (int)TaskResultStatus.Cancel:
-                case (int)TaskResultStatus.Complated:
-                    {
             var section = _sigerProjectLevelSection.Get(f => f.id == taskObj.sectionid);
             if (section != null)
             {
-                            var updownDic = stationDicts.Where(s => s.dkey == DictKeyValConst.UploadloadStation);
-                            var uploadStations = updownDic.Select(f => f.dval.ToInt()).ToList();
-                            var uploadPostion = uploadStations.Contains(taskObj.sectionid);
-                            if (uploadPostion)
-                            {
-                                Logger.WriteLineInfo($"AutoProcess 上料料工站 无需自动创建任务 ");
-                                break;
-                            }
-                            AutoProcess(section.parentid, stationDicts,taskObj);
-                        }
-                        break;
-                    }
-                case (int)TaskResultStatus.Waiting:
-                case (int)TaskResultStatus.Produce:
-                default:
-                    {
-                        break;
-                    }
+                AutoProcess(section.parentid, stationDicts, taskObj);
             }
+
             return new ObjectResult(CommonEnum.Succefull);
         }
 
@@ -324,21 +302,19 @@ namespace Siger.ApiACC.Controllers
                     }
 
                 }
-                if (monitor != null && taskObj.action != TaskAction.Step_SXLW_LK)
+                if (monitor != null && taskObj.action == TaskAction.Step_SXLW_LK)
                 {
                     monitor.section = 0;
                 }
-                var machineStatus = _automationMachineStatus.Get(f => f.section == taskObj.sectionid);
-                if (machineStatus == null)
-                {
-                    throw new BadRequestException(AccEnum.MachineDisable);
-                }
 
-                if (machineStatus!=null)
+                //上料上下料设备状态为后台控制，CNC是PLC控制
+                var machineStatus = _automationMachineStatus.Get(f => f.section == taskObj.sectionid && f.auto==0);
+                if (machineStatus != null)
                 {
                     machineStatus.status = (int)Automation.MachineStatus.Waiting;
                     _automationMachineStatus.Update(machineStatus);
                 }
+
             }
             
             if (monitor != null)
@@ -421,41 +397,6 @@ namespace Siger.ApiACC.Controllers
                 var location = SelectLocation(freeMachine.Select(s=>s.machineid).ToList());
                 if (location != null)
                 {
-                    var monitor = _automationFixtureMonitor.Get(f => f.section == location.section);
-                    if (monitor == null)
-                    {
-                        _automationFixtureMonitor.Insert(new siger_automation_fixture_tools_monitor
-                        {
-                            projectId = PID,
-                            productId=location.productId,
-                            productCode = location.productCode,
-                            productName = location.productName,
-                            fixtureguid = location.fixture,
-                            fixturename = location.fixturename,
-                            ordernumber = location.ordernumber,
-                            locationId = location.location,
-                            section = location.section,
-                            sn = location.sn,
-                            createtime = DateTime.Now,
-                            updatetime = DateTime.Now,
-                            route=location.route,
-                        });
-                    }
-                    else
-                    {
-                        monitor.productId = location.productId;
-                        monitor.productCode = location.productCode;
-                        monitor.productName = location.productName;
-                        monitor.fixtureguid = location.fixture;
-                        monitor.fixturename = location.fixturename;
-                        monitor.ordernumber = location.ordernumber;
-                        monitor.locationId = location.location;
-                        monitor.sn = location.sn;
-                        monitor.updatetime = DateTime.Now;
-                        monitor.route = location.route;
-                        _automationFixtureMonitor.Update(monitor);
-                    }
-
                     // * 更新下一个工序到储位 
                     var locationObj = _automationLocation.Get(f => f.id == location.lid);
                     if (locationObj != null)

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/AutomationTaskListRepository.cs

@@ -29,7 +29,6 @@ namespace Siger.Middlelayer.AccRepository.Repositories
         {
             //已经下发，并且任务完成
             var taskObjs = _context.siger_automation_task_list.Where(f => f.projectId == projectId && f.send==0 );
-
             if (taskObjs.Any())
             {
                 return false;