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

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

@@ -357,9 +357,6 @@ namespace Siger.ApiACC.Controllers
             }
             //移出 上料位
             monitor.status = (int)Automation.MachineStatus.Waiting;
-
-       
-
             var taskNo = _automationTaskList.CrateTaskNumber(Automation.TaskTrigerType.Manual);
             _automationTaskList.Insert(new siger_automation_task_list
             {

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

@@ -22,9 +22,11 @@ namespace Siger.Middlelayer.AccRepository.Entities
         /// 工装GUID
         /// </summary>
         public string fixturetools { get; set; }
+
+        public string fixturename { get; set; }
         public int productid { get; set; }
         public string productcode { get; set; }
-
+        public string productname { get; set; }
         /// <summary>
         /// 工件对应的工单号
         /// </summary>

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

@@ -20,6 +20,10 @@ namespace Siger.Middlelayer.AccRepository.Entities
         /// </summary>
         public string fixtureguid { get; set; }
         /// <summary>
+        /// 工装Name
+        /// </summary>
+        public string fixturename { get; set; }
+        /// <summary>
         /// 工位ID
         /// </summary>
         public int sectionid { get; set; }
@@ -47,6 +51,7 @@ namespace Siger.Middlelayer.AccRepository.Entities
         /// 产品code
         /// </summary>
         public string productcode { get; set; }
+        public string productname { get; set; }
         /// <summary>
         /// 工序ID
         /// </summary>

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

@@ -32,10 +32,13 @@ namespace Siger.Middlelayer.AccRepository.Response
     public class ResponseAutomationLocationRouteInfo
     {
         public string fixture { get; set; }
+        public string fixturename { get; set; }
         public string ordernumber { get; set; }
         public string sn { get; set; }
         public int location { get; set; }
+        public int productId { get; set; }
         public string productCode { get; set; }
+        public string productName { get; set; }
         public string route { get; set; }
         public string pn { get; set; }
 

Server/Infrastructure/Script/DB.script

@@ -270,8 +270,11 @@ CREATE TABLE IF NOT EXISTS `siger_automation_location`  (
    `guid` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
   `locationid` int(11) NOT NULL DEFAULT 0 COMMENT '储位位置',
   `fixturetools` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '工装GUID',
+  `fixturename` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '工装GUID',
+  `productid` int(11) NULL DEFAULT 0 COMMENT '产品ID',
   `productid` int(11) NULL DEFAULT 0 COMMENT '产品ID',
   `productcode` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '产品CODE',
+  `productname` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '产品name',
   `ordernumber` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '工件对应工单号',
   `sn` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '工件',
   `routeid` int(11) NULL DEFAULT 0,
@@ -333,6 +336,7 @@ CREATE TABLE IF NOT EXISTS `siger_automation_task_list`  (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `no` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
   `fixtureguid` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '工装GUID',
+  `fixturename` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '工装name',
   `sectionid` int(11) NOT NULL DEFAULT 0 COMMENT '工位ID',
   `trigger` int(1) NOT NULL DEFAULT 0 COMMENT '触发方',
   `tasktype` int(1)  NOT NULL DEFAULT 0 COMMENT '任务类型',
@@ -340,6 +344,7 @@ CREATE TABLE IF NOT EXISTS `siger_automation_task_list`  (
   `ordercode` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '工单号',
   `productid` int(11) NOT NULL DEFAULT 0 COMMENT '产品ID',
   `productcode` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '产品CODE',
+  `productname` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '产品NAME',
   `processid` int(11) NOT NULL DEFAULT 0 COMMENT '工序ID',
   `programnumber` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '程序号',
   `locationid` int(11) NOT NULL COMMENT '储位位置',