fixedbug

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

@@ -45,10 +45,11 @@ namespace Siger.ApiACC.Controllers
         private readonly IAutomationSectionPropertyRepository _automationSectionProperty;
         private readonly IAutomationProduceHistoryRepository _automationProduceHistory;
         private readonly ISigerProjectProductReport _sigerProjectProduct;
+        private readonly IProductPlanDetails _planDetails;
 
         public AutomationController(IUnitOfWork unitOfWork, ISigerProjectLevelSectionRepository sigerProjectLevelSection, IAutomationLineMode automationLineMode, IAutomationMachineStatus automationMachineStatus, ISigerDict sigerDict, IAutomationTaskListRepository automationTaskList,
             ISigerProjectMachineAttributionRepository sigerProjectMachineAttribution, IAutomationFixtureMonitor automationFixtureMonitor, IAutomationLocationRepository automationLocation, IProductionBeatSetRepository productionBeatSet, IAutomationFixtureToolsProductRepository automationFixtureToolsProduct,
-         IAutomationFixtureToolsRepository automationFixtureTools, IProductRouteRepository productRoute, IAutomationSectionPropertyRepository automationSectionProperty, IAutomationProduceHistoryRepository automationProduceHistory, ISigerProjectProductReport sigerProjectProduct)
+         IAutomationFixtureToolsRepository automationFixtureTools, IProductRouteRepository productRoute, IAutomationSectionPropertyRepository automationSectionProperty, IAutomationProduceHistoryRepository automationProduceHistory, ISigerProjectProductReport sigerProjectProduct,IProductPlanDetails planDetails)
         {
             _unitOfWork = unitOfWork;
             _sigerProjectLevelSection = sigerProjectLevelSection;
@@ -66,6 +67,7 @@ namespace Siger.ApiACC.Controllers
             _automationSectionProperty = automationSectionProperty;
             _automationProduceHistory = automationProduceHistory;
             _sigerProjectProduct = sigerProjectProduct;
+          
         }
 
         /// <summary>
@@ -311,7 +313,7 @@ namespace Siger.ApiACC.Controllers
                 if (sectionProperty.propertytype == 1)
                 {
                     //上下料位状态 为后台控制
-                    var machineStatusObj = _automationMachineStatus.Get(f => f.section == taskObj.sectionid);
+                    var machineStatusObj = _automationMachineStatus.Get(f => f.section == taskObj.extend1.ToInt());
 
                     var download = false;
                     if (sectionProperty.down > 2)
@@ -395,7 +397,7 @@ namespace Siger.ApiACC.Controllers
                     }
                     if(taskObj.action== TaskAction.Step_JGZX_QXJ)
                     {
-                        var planDts=_
+                       
                         //插入报工记录
                         var entity = new siger_project_product_report
                         {