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

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

@@ -16,6 +16,10 @@ namespace Siger.Middlelayer.AccRepository.Entities
         public string no { get; set; }
 
         /// <summary>
+        /// 工装GUID
+        /// </summary>
+        public string fixtureguid { get; set; }
+        /// <summary>
         /// 工位ID
         /// </summary>
         public int sectionid { get; set; }
@@ -55,10 +59,7 @@ namespace Siger.Middlelayer.AccRepository.Entities
         /// 储位位置
         /// </summary>
         public int locationid { get; set; }
-        /// <summary>
-        /// 工装GUID
-        /// </summary>
-        public string fixtureguid { get; set; }
+   
 
         /// <summary>
         /// Task 执行动作类型 1 手动 2 自动

Server/Infrastructure/Script/DB.script

@@ -324,17 +324,17 @@ CREATE TABLE IF NOT EXISTS `siger_automation_section_route`  (
 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,
+  `fixtureguid` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '工装GUID',
   `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 '任务类型',
-  `materialid` int(11) NOT NULL DEFAULT 0 COMMENT '工件ID',
+  `sn` int(11) NOT NULL DEFAULT 0 COMMENT '工件ID',
   `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',
   `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 '储位位置',
-  `fixturetools` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '工装GUID',
   `action` int(1) NOT NULL DEFAULT 0 COMMENT '动作',
   `actiontype` int(11) NOT NULL DEFAULT 0 COMMENT '动作类型',
   `projectid` int(11) NOT NULL DEFAULT 0,