someupdate

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

@@ -556,7 +556,12 @@ namespace Siger.ApiACC.Controllers
             var taskNo = _automationTaskList.CrateTaskNumber(Automation.TaskTrigerType.Manual);
             var action = lineMode.inspect == 1 ? Automation.TaskAction.Step_LK_CJT : Automation.TaskAction.Step_LK_SXLW;
        
-            var toSection = 0;
+            var invenSection= _sectionPropertyRepository.Get(f => f.propertytype == 5);
+            if (invenSection==null)
+            {
+                throw new BadRequestException(AccEnum.SectionPropertyNull);
+            }
+            var toSection = upload.sectionid;
             if (lineMode.inspect==1)
             {
                 var QcProperty = _sectionPropertyRepository.Get(f => f.propertytype == 3);
@@ -567,6 +572,9 @@ namespace Siger.ApiACC.Controllers
 
                 toSection = QcProperty.sectionid; 
             }
+
+
+
             var tasklst = _automationTaskList.GetList(f => f.sectionid == unloading.section && f.action == action && f.status!=(int)TaskResultStatus.Complated);
             if (tasklst.Any())
             {
@@ -592,12 +600,13 @@ namespace Siger.ApiACC.Controllers
                 sn = location.sn,
                 ordercode = location.ordernumber,
                 fixtureguid = location.fixturetools,
+                fixturename=location.fixturename,
                 locationid = location.locationid,
                 productcode = location.productcode,
                 processid = 0,
                 programnumber = "",
                 remark =lineMode.inspect==1? "准备下料-》抽检台":"准备下料",
-                extend1 = unloading.section.ToStr()
+                extend1 = upload.sectionid.ToString()
 
             });
 

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

@@ -73,6 +73,10 @@ namespace Siger.ApiACC.Controllers
             {
                 throw new BadRequestException(CommonEnum.Fail);
             }
+            if (tasklist.status!=(int)Automation.TaskResultStatus.Complated)
+            {
+                throw new BadRequestException(Siger.Middlelayer.Common.ModuleEnum.AccEnum.TaskProcessing);
+            }
             var res = new ResponseMonitorSnProduct();
             //var monitor = _fixtureMonitor.Get(q => q.section == sectionid);