Merge branch 'master' of http://test.siger-data.com:9000/jiawei.su/Laisi_AutoMES2

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

@@ -183,18 +183,32 @@ namespace Siger.ApiACC.Controllers
             {
                 throw new BadRequestException(CommonEnum.RecordNotFound);
             }
-            var machineStatus = _automationMachineStatus.Get(f => f.machineid==machineAttr.machine);
-            if (machineStatus==null)
+            var machineStatus = _automationMachineStatus.Get(f => f.machineid == machineAttr.machine);
+            if (machineStatus == null)
             {
-                throw new BadRequestException(CommonEnum.RecordNotFound);
-            }
-            if (machineStatus.enable==0)
-            {
-                throw new BadRequestException(AccEnum.MachineDisable);
+                // throw new BadRequestException(CommonEnum.RecordNotFound);
+                //上料设备状态与PLC 无关，
+                //需要手动插入
+                _automationMachineStatus.Insert(new siger_automation_machine_status
+                {
+                    enable = 1,
+                    section = loading.section,
+                    machineid = machineAttr.machine,
+                    projectId = ProjectId,
+                    status = (int)Automation.MachineStatus.Produce,
+                    updatetime = DateTime.Now
+                });
             }
-            if(machineStatus.status!=(int)Automation.MachineStatus.Waiting)
+            else
             {
-                throw new BadRequestException(AccEnum.MachineBusy);
+                if (machineStatus.enable == 0)
+                {
+                    throw new BadRequestException(AccEnum.MachineDisable);
+                }
+                if (machineStatus.status != (int)Automation.MachineStatus.Waiting)
+                {
+                    throw new BadRequestException(AccEnum.MachineBusy);
+                }
             }
             if (!_automationTaskList.CanTask(ProjectId,loading.section))
             {