Merge branch 'master' of http://test.siger-data.com:9000/jiawei.su/Laisi_AutoMES2

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

@@ -361,6 +361,7 @@ namespace Siger.ApiACC.Controllers
                  sn=sn,
                  ordercode=plandts.OrderNumber,
                  fixtureguid= fixtureToolsObj.FixtureGuid,
+                 fixturename=fixtureToolsObj.FixtureCode,
                  locationid=fixtureToolsObj.Location,
                  productcode=plan.product_code,
                  processid=0,

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

@@ -50,7 +50,7 @@ namespace Siger.ApiACC.Controllers
                 var item = new ResponseAutomationMachineStatus
                 {
                      sectionid=d.sectionid,
-                     section=d.section,
+                     section=$"{ d.section}({d.linemode})",
                      enable=d.enable,
                      product="",
                      location=0,
@@ -59,6 +59,7 @@ namespace Siger.ApiACC.Controllers
                      fixtureName="",
                      lastupdate="",
                      status=(int)Automation.MachineStatus.Waiting,
+                     linemode=d.linemode
 
                 };
                 var fixture = _automationFixtureMonitor.Get(f => f.section == d.sectionid);
@@ -68,6 +69,7 @@ namespace Siger.ApiACC.Controllers
                     item.location = fixture.locationId;
                     item.sn = fixture.sn;
                     item.fixtureCode = fixture.fixtureguid;
+                 
                     item.fixtureName = fixture.fixturename;
                     item.status = fixture.status;
                 }
@@ -76,6 +78,7 @@ namespace Siger.ApiACC.Controllers
             }
             var output = new ResponseMachineMonitor
             {
+           
                  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(),

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

@@ -20,7 +20,7 @@ namespace Siger.Middlelayer.AccRepository.Entities
         /// </summary>
         public string fixtureguid { get; set; }
         /// <summary>
-        /// 工装Name
+        /// 工装CODE
         /// </summary>
         public string fixturename { get; set; }
         /// <summary>

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/AutomationFixtureToolsRepository.cs

@@ -125,7 +125,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                         {
                              FixtureGuid=q.guid,
                              FixtureName=q.name,
-                 
+                             FixtureCode=q.code,
                              Location=l.locationid
                         };
             return query.FirstOrDefault();

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/AutomationMachineStatusRepository.cs

@@ -20,18 +20,20 @@ namespace Siger.Middlelayer.AccRepository.Repositories
 
         public IEnumerable<ResponseAutomationMachineStatus> GetSectionStatus(int projectId, int section,List<int>sections)
         {
-            var data = from atr in _context.siger_project_machine_attribution 
+            var data = from atr in _context.siger_project_machine_attribution
                        join lv in _context.siger_project_level_section on atr.station equals lv.id
+                       join lm in _context.siger_automation_line_mode on lv.parentid equals lm.id
                        join ms in _context.siger_automation_machine_status on lv.id equals ms.section into mstemp
                        join plv in _context.siger_project_level_section on lv.parentid equals plv.id
                        from ms in mstemp.DefaultIfEmpty()
                        select new ResponseAutomationMachineStatus
                        {
                            sectionid = lv.id,
-                           section =$"{ plv.title}-{lv.title}",
-                           lastupdate = ms!=null? ms.updatetime.ToString():"",
-                           enable =ms!=null? ms.enable:1,
-                           status =ms!=null? ms.status:1,
+                           section = $"{ plv.title}-{lv.title}",
+                           lastupdate = ms != null ? ms.updatetime.ToString() : "",
+                           enable = ms != null ? ms.enable : 1,
+                           status = ms != null ? ms.status : 1,
+                           linemode = lm.mode == 0 ? "手动模式" : "自动模式",
                        };
 
             Expression<Func<ResponseAutomationMachineStatus, bool>> sectionsExpression = f => true;

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

@@ -17,6 +17,7 @@ namespace Siger.Middlelayer.AccRepository.Response
         public int enable { get; set; }
         public int status { get; set; }
         public string lastupdate { get; set; }
+        public string linemode { get; set; }
     }
 
     public class ResponseAutomationMachineStatusTotal
@@ -28,6 +29,7 @@ namespace Siger.Middlelayer.AccRepository.Response
     }
     public class ResponseMachineMonitor
     {
+        public int linemode { get; set; }
         public ResponseAutomationMachineStatusTotal sum { get; set; }
 
         public List<ResponseAutomationMachineStatus> dts { get; set; } 

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

@@ -16,6 +16,10 @@ namespace Siger.Middlelayer.AccRepository.Response
         /// </summary>
         public string FixtureGuid { get; set; }
         /// <summary>
+        /// 工装编号
+        /// </summary>
+        public string FixtureCode { get; set; }
+        /// <summary>
         /// 产品名称
         /// </summary>
         public string ProductCode { get; set; }