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

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

@@ -326,10 +326,6 @@ namespace Siger.ApiACC.Controllers
                     updatetime = DateTime.Now
                 });
             }
-            if (machineStatus.auto==1)
-            {
-                throw new BadRequestException(AccEnum.MachineDisable);
-            }
 
             var plandts = _planDetails.Get(f => f.projectId == ProjectId && f.OrderNumber == loading.code);
             if (plandts==null)
@@ -348,10 +344,15 @@ namespace Siger.ApiACC.Controllers
             {
                 throw new BadRequestException(AccEnum.FixtureToolsIsNone);
             }
-            var exitsUpload = _automationTaskList.Get(f => f.send == 0 && f.locationid == loading.locationid);
-            if (exitsUpload!=null)
+            var monitor = _automationFixtureMonitor.Get(f => f.section == loading.section);
+            if (monitor != null)
             {
-                throw new BadRequestException(AccEnum.FixtureOrderNulll);
+                var exitsUpload = _automationTaskList.Get(f =>f.no==monitor.taskno);
+                if (exitsUpload != null)
+                {
+                    if (exitsUpload.status != (int)Automation.TaskResultStatus.Complated)
+                        throw new BadRequestException(AccEnum.TaskProcessing);
+                }
             }
             var taskNo = _automationTaskList.CrateTaskNumber(Automation.TaskTrigerType.Manual);
             var sn = _automationTaskList.CreateRandonSn(plan.product_code);
@@ -394,7 +395,6 @@ namespace Siger.ApiACC.Controllers
             });
 
 
-            var monitor = _automationFixtureMonitor.Get(f =>f.section==loading.section);
             if (monitor==null)
             {
                 _automationFixtureMonitor.Insert(new siger_automation_fixture_tools_monitor

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

@@ -21,11 +21,11 @@ namespace Siger.Middlelayer.AccRepository.Entities
         /// <summary>
         /// 0:不是上料1:是上料
         /// </summary>
-        public string upload { get; set; }
+        public int upload { get; set; }
         /// <summary>
         /// 0:不是下料1:是下料
         /// </summary>
-        public string down { get; set; }
+        public int down { get; set; }
 
         public DateTime createtime { get; set; }