someupdate

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

@@ -141,6 +141,8 @@ namespace Siger.ApiACC.Controllers
             var result = new ResponsePlanlFixtureInfo
             {
                 OrderNumber = monitor.ordernumber,
+                FixtureGuid=monitor.fixtureguid,
+                FixtureName=monitor.fixturename,
                 ProductCode=monitor.productCode,
                 ProductName=monitor.productName,
                 Sn=monitor.sn,
@@ -251,6 +253,7 @@ namespace Siger.ApiACC.Controllers
                 _automationFixtureMonitor.Insert(new siger_automation_fixture_tools_monitor
                 {
                      fixtureguid=fixtureToolsObj.FixtureGuid,
+                     fixturename=fixtureToolsObj.FixtureName,
                      projectId=ProjectId,
                      section=loading.section,
                      sn=sn,

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

@@ -11,6 +11,10 @@ namespace Siger.Middlelayer.AccRepository.Entities
         /// </summary>
         public string fixtureguid { get; set; }
         /// <summary>
+        /// 工装名称
+        /// </summary>
+        public string fixturename { get; set; }
+        /// <summary>
         /// 当前工站ID
         /// </summary>
         public int section { get; set; }

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

@@ -28,7 +28,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                         where q.projectId == projectId && q.productcode==productCode && q.status == (int)RowState.Valid && t.status == (int)RowState.Valid
                         select new ResponseProductFixtureInfo
                         {
-                            FixtureId=t.id,
+                            FixtureName=t.name,
                             FixtureGuid=t.guid,
                             ProductCode=q.productcode,
                             Location=l.locationid,

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

@@ -113,7 +113,8 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                         select new ResponseProductFixtureInfo
                         {
                              FixtureGuid=q.guid,
-                             FixtureId=q.id,
+                             FixtureName=q.name,
+                 
                              Location=l.locationid
                         };
             return query.FirstOrDefault();

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

@@ -7,9 +7,10 @@ namespace Siger.Middlelayer.AccRepository.Response
     public class ResponseProductFixtureInfo
     {
         /// <summary>
-        /// 工装ID
+        /// 工装名称
         /// </summary>
-        public int FixtureId { get; set; }
+        public string FixtureName { get; set; }
+
         /// <summary>
         /// GUID
         /// </summary>

Server/Infrastructure/Script/DB.script

@@ -417,6 +417,7 @@ CREATE TABLE `siger_automation_fixture_tools_moniter`  (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `projectid` int(11) NOT NULL DEFAULT 0,
   `fixtureguid`  varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '工装ID',
+  `fixturename`  varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '工装名称',
   `section` int(11) NOT NULL DEFAULT 0 COMMENT '当前工站ID',
   `sn` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '当前绑定工件',
   `route` int(1) NOT NULL DEFAULT 1 COMMENT '工序ID',