fixedubug 添加起始工站

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

@@ -185,11 +185,11 @@ namespace Siger.ApiACC.Controllers
             {
                 throw new BadRequestException(AccEnum.LineIsAutoMode);
             }
-            var section = taskobj.sectionid;
+            var section = taskobj.extend1.ToInt();
             //抽检台-》上料位特殊逻辑
             if (taskobj.action == Automation.TaskAction.Step_CJT_SXLW)
             {
-                section = taskobj.extend1.ToInt();
+                section = taskobj.sectionid;
             }
 
             var attr = _sigerProjectMachineAttribution.Get(f => f.station == section && f.status == 1);
@@ -354,6 +354,11 @@ namespace Siger.ApiACC.Controllers
             {
                 throw new BadRequestException(AccEnum.ProductRouteMissing);
             }
+            var invenProperty = _sectionPropertyRepository.Get(f => f.propertytype == 5);
+            if (invenProperty==null)
+            {
+                throw new BadRequestException(AccEnum.SectionPropertyNull);
+            }
             var unixtime = UnixTimeHelper.GetNow();
             _automationTaskList.Insert(new siger_automation_task_list
             {
@@ -381,7 +386,7 @@ namespace Siger.ApiACC.Controllers
                  programnumber="",
                  remark ="手动任务-准备上料",
                  route=route.id,
-                 extend1=""
+                 extend1= loading.section.ToStr(),
 
             });
 
@@ -404,7 +409,12 @@ namespace Siger.ApiACC.Controllers
         [HttpPost]
         public IActionResult CompalateAssemble([FromBody]requestAutoCompalateAssemble assemble)
         {
-          
+
+            var invenProperty = _sectionPropertyRepository.Get(f => f.propertytype == 5);
+            if (invenProperty == null)
+            {
+                throw new BadRequestException(AccEnum.SectionPropertyNull);
+            }
             var upload = _sectionPropertyRepository.Get(f => f.sectionid == assemble.section);
             if (upload == null)
             {
@@ -447,7 +457,7 @@ namespace Siger.ApiACC.Controllers
                 tasktype = Automation.TaskActionType.Load,
                 operater = UserId,
                 operatetime = DateTime.Now,
-                sectionid = assemble.section,
+                sectionid = invenProperty.sectionid,
                 send = 0,
                 status = 1,
                 completetime = DateTime.MinValue,
@@ -464,7 +474,8 @@ namespace Siger.ApiACC.Controllers
                 processid = 0,
                 programnumber = "",
                 remark = "手动任务-安装完成",
-                route=monitor.route
+                route=monitor.route,
+                extend1=assemble.section.ToStr()
 
             });
             monitor.taskno = taskNo;
@@ -489,7 +500,11 @@ namespace Siger.ApiACC.Controllers
         [HttpPost]
         public IActionResult Unloading([FromBody]requestAutomationUnloading unloading)
         {
-
+            var invenProperty = _sectionPropertyRepository.Get(f => f.propertytype == 5);
+            if (invenProperty == null)
+            {
+                throw new BadRequestException(AccEnum.SectionPropertyNull);
+            }
             var upload = _sectionPropertyRepository.Get(f => f.sectionid == unloading.section);
             if (upload == null)
             {
@@ -541,6 +556,8 @@ 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 section = unloading.section;
+
+            var fromSection = unloading.section ;
             if (lineMode.inspect==1)
             {
                 var sectionProperty = _sectionPropertyRepository.Get(f => f.propertytype == 3);
@@ -549,6 +566,7 @@ namespace Siger.ApiACC.Controllers
                     throw new BadRequestException(AccEnum.SectionPropertyNull);
                 }
                 section = sectionProperty.sectionid;
+                fromSection= sectionProperty.sectionid; 
             }
             var tasklst = _automationTaskList.GetList(f => f.sectionid == unloading.section && f.action == action && f.status!=(int)TaskResultStatus.Complated);
             if (tasklst.Any())
@@ -565,7 +583,7 @@ namespace Siger.ApiACC.Controllers
                 tasktype = Automation.TaskActionType.Load,
                 operater = UserId,
                 operatetime = DateTime.MinValue,
-                sectionid = unloading.section,
+                sectionid = section,
                 send = 0,
                 status = 1,
                 completetime = DateTime.MinValue,
@@ -580,7 +598,7 @@ namespace Siger.ApiACC.Controllers
                 processid = 0,
                 programnumber = "",
                 remark =lineMode.inspect==1? "准备下料-》抽检台":"准备下料",
-                extend1= section.ToStr()
+                extend1= fromSection.ToString()
 
             });
 
@@ -603,9 +621,7 @@ namespace Siger.ApiACC.Controllers
         [HttpPost]
         public IActionResult Disassemble([FromBody]Requestdisassemble disassemble)
         {
-          
 
- 
             var upload = _sectionPropertyRepository.Get(f => f.sectionid == disassemble.section);
             if (upload == null)
             {
@@ -644,7 +660,7 @@ namespace Siger.ApiACC.Controllers
                 tasktype = Automation.TaskActionType.Load,
                 operater = UserId,
                 operatetime = DateTime.Now,
-                sectionid = unloadSection,
+                sectionid = sectionProperty.sectionid,
                 send = 0,
                 status = 1,
                 completetime = DateTime.MinValue,
@@ -659,10 +675,9 @@ namespace Siger.ApiACC.Controllers
                 processid = 0,
                 programnumber = "",
                 remark = "手动任务-拆卸完成",
+                extend1= disassemble.section.ToStr()
             });
 
-            //移出 上料位
-
             if (_unitOfWork.Commit() > 0)
             {
                 Logger.WriteLineError($"拆卸完成任务{taskNo}创建成功-{EnumHelper.GetEnumDesc(Automation.TaskAction.Step_SXLW_LK)}");

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

@@ -329,7 +329,7 @@ namespace Siger.ApiACC.Controllers
 
         private void CreateTaskList(int section, int productid, string productcode, string sn, int routeid)
         {
-            var tasklist = _automationTaskList.GetList(f => f.extend1 == section.ToString() && f.action == Automation.TaskAction.Step_LK_CJT).LastOrDefault();
+            var tasklist = _automationTaskList.GetList(f => f.sectionid == section && f.action == Automation.TaskAction.Step_LK_CJT).LastOrDefault();
             if (tasklist == null)
             {
                 throw new BadRequestException(CommonEnum.Fail);
@@ -347,7 +347,7 @@ namespace Siger.ApiACC.Controllers
                 tasktype = Automation.TaskActionType.Unload,
                 operater = UserId,
                 operatetime = DateTime.Now,
-                sectionid = section,
+                sectionid = tasklist.extend1.ToInt(),
                 send = 0,
                 status = 1,
                 completetime = DateTime.MinValue,
@@ -365,7 +365,7 @@ namespace Siger.ApiACC.Controllers
                 processid = routeid,
                 programnumber = "",
                 remark = "质量检验->上下料位置",
-                extend1="",//上下料位发起到检验的工站
+                extend1=section.ToStr(),//上下料位发起到检验的工站
             });
             
 

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

@@ -68,7 +68,7 @@ namespace Siger.ApiACC.Controllers
         [HttpGet]
         public IActionResult GetMonitorSnProduct(int sectionid)
         {
-            var tasklist = _taskListRepository.GetList(f => f.extend1 == sectionid.ToString() && f.action == Automation.TaskAction.Step_LK_CJT).LastOrDefault();
+            var tasklist = _taskListRepository.GetList(f => f.sectionid == sectionid && f.action == Automation.TaskAction.Step_LK_CJT).LastOrDefault();
             if (tasklist == null)
             {
                 throw new BadRequestException(CommonEnum.Fail);

Server/Apis/Siger.ApiACC/Tasks/AutoMES.cs

@@ -46,11 +46,11 @@ namespace Siger.ApiACC.Tasks
                 if (task.send == 1)
                     return;
 
-                var section = task.sectionid;
+                var section = task.extend1.ToInt();
                 //抽检台-》上料位特殊逻辑
-                if (task.action== Automation.TaskAction.Step_CJT_SXLW)
+                if (task.action== Automation.TaskAction.Step_CJT_SXLW )
                 {
-                    section = dbhelper.GetPreStation(task);
+                    section = task.sectionid;
                 }
                 var levelsction = dbhelper.GetLevelsection(section);
                 if (levelsction == null)

Server/Apis/Siger.ApiACC/Tasks/DBhelper.cs

@@ -70,15 +70,15 @@ namespace Siger.ApiACC.Tasks
         {
             return AccDbContext.siger_project_machine_attribution.FirstOrDefault(f => f.station==section && f.status==1);
         }
-        public int GetPreStation(siger_automation_task_list task )
-        {
-            //取抽检工位发起的上料位ID
-            var preTask = AccDbContext.siger_automation_task_list.Where(f => f.sn == task.sn && f.extend1 == task.sectionid.ToString() && f.action == TaskAction.Step_LK_CJT).OrderByDescending(d => d.id).FirstOrDefault();
-            if (preTask != null)
-                return preTask.sectionid;
-            else
-                return 0;
-        }
+        //public int GetPreStation(siger_automation_task_list task )
+        //{
+        //    //取抽检工位发起的上料位ID
+        //    var preTask = AccDbContext.siger_automation_task_list.Where(f => f.sn == task.sn && f.extend1 == task.sectionid.ToString() && f.action == TaskAction.Step_LK_CJT).OrderByDescending(d => d.id).FirstOrDefault();
+        //    if (preTask != null)
+        //        return preTask.sectionid;
+        //    else
+        //        return 0;
+        //}
         public siger_automation_fixture_tools GetFixture(string guid)
         {
             return AccDbContext.siger_automation_fixture_tools.FirstOrDefault(f => f.guid==guid && f.status == 1);

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

@@ -24,7 +24,7 @@ namespace Siger.Middlelayer.AccRepository.Entities
         /// </summary>
         public string fixturename { get; set; }
         /// <summary>
-        /// 工位ID
+        /// 工位ID 目的
         /// </summary>
         public int sectionid { get; set; }
         /// <summary>
@@ -103,7 +103,7 @@ namespace Siger.Middlelayer.AccRepository.Entities
         public string remark { get; set; }
 
         /// <summary>
-        /// 准备前往下一个工站ID
+        /// 发起工站ID
         /// </summary>
         public string extend1 { get; set; }
 

Server/PC/Siger.Middlelayer.License/obj/Debug/Siger.Middlelayer.License_MarkupCompile.cache

@@ -4,15 +4,15 @@
 winexe
 C#
 .cs
-E:\gitlabcode\Laisi_AutoMES2\Server\PC\Siger.Middlelayer.License\obj\Debug\
+D:\Code\20210208\Laisi_AutoMES2\Server\PC\Siger.Middlelayer.License\obj\Debug\
 Siger.Middlelayer.License
 none
 false
 DEBUG;TRACE
-E:\gitlabcode\Laisi_AutoMES2\Server\PC\Siger.Middlelayer.License\App.xaml
+D:\Code\20210208\Laisi_AutoMES2\Server\PC\Siger.Middlelayer.License\App.xaml
 11151548125
 
-13876510470
+13-917883170
 121654848548
 MainWindow.xaml;