fixedbug

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

@@ -243,6 +243,7 @@ namespace Siger.ApiACC.Controllers
                 Logger.WriteLineInfo($"AutoProcess 未配置设备类型字典");
                 throw new BadRequestException(AccEnum.AutomationDictNotfound);
             }
+
             //更新Tasklist
             PlCfeeback(taskObj, request.status, stationDicts);
 
@@ -295,6 +296,7 @@ namespace Siger.ApiACC.Controllers
             taskObj.completetime = DateTime.Now;
             _automationTaskList.Update(taskObj);
 
+            var monitor = _automationFixtureMonitor.Get(f => f.section == taskObj.sectionid);
             //PLC 反馈结束. 
             if (status == (int)TaskResultStatus.Complated)
             {
@@ -320,18 +322,19 @@ namespace Siger.ApiACC.Controllers
                         location.routeid = taskObj.route;
                         location.sn = taskObj.sn;
                         _automationLocation.Update(location);
-
-                        var monitor = _automationFixtureMonitor.Get(f => f.section == taskObj.sectionid);
-                        if (monitor != null)
-                        {
-                            monitor.section = 0;
-                            _automationFixtureMonitor.Update(monitor);
-                        }
-
-                       
                     }
+                   
                 }
-               
+                if (monitor != null)
+                {
+                    monitor.section = 0;
+                }
+            }
+           
+            if (monitor != null)
+            {
+                monitor.status = status;
+                _automationFixtureMonitor.Update(monitor);
             }
 
         }
@@ -440,7 +443,7 @@ namespace Siger.ApiACC.Controllers
                     }
 
                     // * 更新下一个工序到储位 
-                    var locationObj = _automationLocation.Get(f => f.locationid == location.lid);
+                    var locationObj = _automationLocation.Get(f => f.id == location.lid);
                     if (locationObj != null)
                     {
                         var doneRoute = _productRoute.Get(f => f.id == location.route);
@@ -554,7 +557,7 @@ namespace Siger.ApiACC.Controllers
                      Machine=b.machineID,
                      Pn=b.process_number,
                      ProductId=b.product_name.ToInt(),
-                     ProductName=b.product_name,
+                     ProductName=b.product_name_text,
                      Location=autoLocation.locationid,
                      Route=b.route_number.ToInt(),
                      RouteName=b.route_name,

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

@@ -58,7 +58,7 @@ namespace Siger.ApiACC.Controllers
                      fixtureCode="",
                      fixtureName="",
                      lastupdate="",
-                     status=(int)Automation.MachineStatus.Waiting,
+                     machineStatus=d.status,
                      linemode=d.linemode
 
                 };
@@ -71,6 +71,7 @@ namespace Siger.ApiACC.Controllers
                     item.fixtureCode = fixture.fixtureguid;
                  
                     item.fixtureName = fixture.fixturename;
+                    item.machineStatus = d.status;
                     item.status = fixture.status;
                 }
                 result.Add(item);
@@ -80,9 +81,9 @@ namespace Siger.ApiACC.Controllers
             {
            
                  sum=new ResponseAutomationMachineStatusTotal { 
-                  waittingTotal =result.Where(f=>f.status==(int)Automation.MachineStatus.Waiting).Count(),
-                  produceTotal= result.Where(f => f.status == (int)Automation.MachineStatus.Produce).Count(),
-                  complateTotal= result.Where(f => f.status == (int)Automation.MachineStatus.Complated).Count(),
+                  waittingTotal =result.Where(f=>f.machineStatus == (int)Automation.MachineStatus.Waiting).Count(),
+                  produceTotal= result.Where(f => f.machineStatus == (int)Automation.MachineStatus.Produce).Count(),
+                  complateTotal= result.Where(f => f.machineStatus == (int)Automation.MachineStatus.Complated).Count(),
                   disableTotal= result.Where(f => f.enable ==0).Count(),
                  },
                  dts=result

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Response/ResponseAutomationMachineStatus.cs

@@ -15,6 +15,13 @@ namespace Siger.Middlelayer.AccRepository.Response
         public int location { get; set; }
         public string sn { get; set; }
         public int enable { get; set; }
+        /// <summary>
+        /// 设备状态
+        /// </summary>
+        public int machineStatus { get; set; }
+        /// <summary>
+        /// 任务状态
+        /// </summary>
         public int status { get; set; }
         public string lastupdate { get; set; }
         public string linemode { get; set; }