someupdate

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

@@ -42,10 +42,11 @@ namespace Siger.ApiACC.Controllers
         private readonly IAutomationFixtureToolsRepository _automationFixtureTools;
         private readonly IProductRouteRepository _productRoute;
         private readonly IAutomationSectionPropertyRepository _automationSectionProperty;
+        private readonly IAutomationProduceHistoryRepository _automationProduceHistory;
 
         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)
+         IAutomationFixtureToolsRepository automationFixtureTools, IProductRouteRepository productRoute, IAutomationSectionPropertyRepository automationSectionProperty,IAutomationProduceHistoryRepository automationProduceHistory)
         {
             _unitOfWork = unitOfWork;
             _sigerProjectLevelSection = sigerProjectLevelSection;
@@ -61,6 +62,7 @@ namespace Siger.ApiACC.Controllers
             _automationFixtureTools = automationFixtureTools;
             _productRoute = productRoute;
             _automationSectionProperty = automationSectionProperty;
+            _automationProduceHistory = automationProduceHistory;
         }
 
         /// <summary>
@@ -445,6 +447,25 @@ namespace Siger.ApiACC.Controllers
                 }
 
                 _automationTaskList.Update(taskObj);
+
+                //添加SN记录
+                _automationProduceHistory.Insert(new siger_automation_produce_history
+                {
+                     section=taskObj.sectionid,
+                     sn=taskObj.sn,
+                     locationid=taskObj.locationid,
+                     productcode=taskObj.productcode,
+                     productname=taskObj.productname,
+                     productid=taskObj.productid,
+                     projectId=taskObj.projectId,
+                     route=taskObj.route.ToString(),
+                     status=1,
+                     locationname=location.location_cid.ToString(),
+                     updatetime=DateTime.Now,
+                    
+                });
+
+
             }
         }
 

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

@@ -628,7 +628,12 @@ namespace Siger.ApiACC.Controllers
             {
                 throw new BadRequestException(AccEnum.MonitorNotfound);
             }
-
+            var sectionProperty = _sectionPropertyRepository.Get(f => f.propertytype == 5);
+            if (sectionProperty == null)
+            {
+                throw new BadRequestException(AccEnum.SectionPropertyNull);
+            }
+            var  unloadSection = sectionProperty.sectionid;
             var taskNo = _automationTaskList.CrateTaskNumber(Automation.TaskTrigerType.Manual);
             _automationTaskList.Insert(new siger_automation_task_list
             {
@@ -639,7 +644,7 @@ namespace Siger.ApiACC.Controllers
                 tasktype = Automation.TaskActionType.Load,
                 operater = UserId,
                 operatetime = DateTime.Now,
-                sectionid = disassemble.section,
+                sectionid = unloadSection,
                 send = 0,
                 status = 1,
                 completetime = DateTime.MinValue,
@@ -658,9 +663,6 @@ namespace Siger.ApiACC.Controllers
 
             //移出 上料位
 
-            monitor.taskno = taskNo;
-            _automationFixtureMonitor.Update(monitor);
-
             if (_unitOfWork.Commit() > 0)
             {
                 Logger.WriteLineError($"拆卸完成任务{taskNo}创建成功-{EnumHelper.GetEnumDesc(Automation.TaskAction.Step_SXLW_LK)}");