some update

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

@@ -150,6 +150,11 @@ namespace Siger.Middlelayer.AccRepository
 
         public DbSet<siger_automation_fixture_tools_category> siger_automation_fixture_tools_category { get; set; }
         public DbSet<siger_automation_fixture_tools_assembly> siger_automation_fixture_tools_assembly { get; set; }
-
+        public DbSet<siger_automation_fixture_tools> siger_automation_fixture_tools { get; set; }
+        public DbSet<siger_automation_fixture_tools_product> siger_automation_fixture_tools_product { get; set; }
+        public DbSet<siger_automation_tray> siger_automation_tray { get; set; }
+        public DbSet<siger_automation_section_property> siger_automation_section_property { get; set; }
+        public DbSet<siger_automation_section_route> siger_automation_section_route { get; set; }
+        public DbSet<siger_automation_task_list> siger_automation_task_list { get; set; }
     }
 }

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

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Siger.Middlelayer.AccRepository.Entities
+{
+    /// <summary>
+    /// 工装台账信息
+    /// </summary>
+    public class siger_automation_fixture_tools : AccEntityBase
+    {
+        public string guid { get; set; }
+        /// <summary>
+        /// 工装类别
+        /// </summary>
+        public string category { get; set; }
+        /// <summary>
+        /// 管理类型
+        /// </summary>
+        public int managetype { get; set; }
+        /// <summary>
+        /// 工装料号
+        /// </summary>
+        public string partnumber { get; set; }
+        /// <summary>
+        /// 工装名称
+        /// </summary>
+        public string name { get; set; }
+        /// <summary>
+        /// 规格型号
+        /// </summary>
+        public string specifition { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public int number { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string remark { get; set; }
+        /// <summary>
+        /// 附件
+        /// </summary>
+        public string attachment { get; set; }
+        /// <summary>
+        /// 工装编号
+        /// </summary>
+        public string code { get; set; }
+
+        public DateTime createtime { get; set; }
+
+        public int creator { get; set; }
+
+        public int updator { get; set; }
+
+        public DateTime? updatetime { get; set; }
+
+        public string extend1 { get; set; }
+    }
+}

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

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Siger.Middlelayer.AccRepository.Entities
+{
+    /// <summary>
+    /// 工装对应产品
+    /// </summary>
+    public class siger_automation_fixture_tools_product : AccEntityBase
+    {
+        public string guid { get; set; }
+        /// <summary>
+        /// 工装GUID
+        /// </summary>
+        public string fixturetools { get; set; }
+        /// <summary>
+        /// 产品ID
+        /// </summary>
+        public int productid { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string remark { get; set; }
+
+        public DateTime createtime { get; set; }
+
+        public int creator { get; set; }
+
+        public int updator { get; set; }
+
+        public DateTime? updatetime { get; set; }
+
+        public string extend1 { get; set; }
+    }
+}

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

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Siger.Middlelayer.AccRepository.Entities
+{
+    /// <summary>
+    /// 工位属性
+    /// </summary>
+    public class siger_automation_section_property : AccEntityBase
+    {
+        public string guid { get; set; }
+        /// <summary>
+        /// 工位ID
+        /// </summary>
+        public int sectionid { get; set; }
+        /// <summary>
+        /// 1:上下料工位2:加工工位3:检验工位4:装配工位5:存储工位
+        /// </summary>
+        public int propertytype { get; set; }
+        /// <summary>
+        /// 0:不是上料1:是上料
+        /// </summary>
+        public string upload { get; set; }
+        /// <summary>
+        /// 0:不是下料1:是下料
+        /// </summary>
+        public string down { get; set; }
+
+        public DateTime createtime { get; set; }
+
+        public DateTime? updatetime { get; set; }
+
+        public string extend1 { get; set; }
+    }
+}

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

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Siger.Middlelayer.AccRepository.Entities
+{
+    /// <summary>
+    /// 自动线路径
+    /// </summary>
+    public class siger_automation_section_route : AccEntityBase
+    {
+        public string guid { get; set; }
+        /// <summary>
+        /// 产线
+        /// </summary>
+        public int sectionid { get; set; }
+        /// <summary>
+        /// 开始工位
+        /// </summary>
+        public int startsection { get; set; }
+        /// <summary>
+        /// 目标工位
+        /// </summary>
+        public int endsection { get; set; }
+
+        public DateTime createtime { get; set; }
+
+        public DateTime? updatetime { get; set; }
+
+        public string extend1 { get; set; }
+    }
+}

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

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Siger.Middlelayer.AccRepository.Entities
+{
+    /// <summary>
+    /// 工装台账信息
+    /// </summary>
+    public class siger_automation_task_list : AccEntityBase
+    {
+        public string guid { get; set; }
+        /// <summary>
+        /// 工位ID
+        /// </summary>
+        public string sectionid { get; set; }
+        /// <summary>
+        /// 触发方
+        /// </summary>
+        public int trigger { get; set; }
+        /// <summary>
+        /// 任务类型
+        /// </summary>
+        public string tasktype { get; set; }
+        /// <summary>
+        /// 发起工位
+        /// </summary>
+        public int startsection { get; set; }
+        /// <summary>
+        /// 工件ID
+        /// </summary>
+        public int materialid { get; set; }
+        /// <summary>
+        /// 工单号
+        /// </summary>
+        public string ordercode { get; set; }
+        /// <summary>
+        /// 产品ID
+        /// </summary>
+        public int productid { get; set; }
+        /// <summary>
+        /// 工序ID
+        /// </summary>
+        public int processid { get; set; }
+        /// <summary>
+        /// 程序号
+        /// </summary>
+        public string programnumber { get; set; }
+        /// <summary>
+        /// 储位位置
+        /// </summary>
+        public int locationid { get; set; }
+        /// <summary>
+        /// 工装GUID
+        /// </summary>
+        public int fixturetools { get; set; }
+        /// <summary>
+        /// 动作
+        /// </summary>
+        public int action { get; set; }
+        /// <summary>
+        /// 动作类型
+        /// </summary>
+        public DateTime? actiontype { get; set; }
+        /// <summary>
+        /// 触发时间
+        /// </summary>
+        public string triggertime { get; set; }
+        /// <summary>
+        /// 完成时间
+        /// </summary>
+        public string completetime { get; set; }
+        /// <summary>
+        /// 操作人
+        /// </summary>
+        public string operater { get; set; }
+        /// <summary>
+        /// 操作时间
+        /// </summary>
+        public string operatetime { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string remark { get; set; }
+
+        public string extend1 { get; set; }
+    }
+}

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

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Siger.Middlelayer.AccRepository.Entities
+{
+    /// <summary>
+    /// 托盘台账列表
+    /// </summary>
+    public class siger_automation_tray : AccEntityBase
+    {
+        public string guid { get; set; }
+        /// <summary>
+        /// 储位位置
+        /// </summary>
+        public int locationid { get; set; }
+        /// <summary>
+        /// 工装GUID
+        /// </summary>
+        public string fixturetools { get; set; }
+        /// <summary>
+        /// 物料ID
+        /// </summary>
+        public int materialid { get; set; }
+        /// <summary>
+        /// 工序ID
+        /// </summary>
+        public int processid { get; set; }
+        /// <summary>
+        /// 物料状态
+        /// </summary>
+        public int materialstate { get; set; }
+        /// <summary>
+        /// 附件
+        /// </summary>
+        public int attachment { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string remark { get; set; }
+
+        public int updator { get; set; }
+
+        public DateTime? updatetime { get; set; }
+
+        public string extend1 { get; set; }
+    }
+}

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

+using System;
+using System.Linq;
+using System.Linq.Expressions;
+using Microsoft.EntityFrameworkCore;
+using Siger.Middlelayer.AccRepository.Entities;
+using Siger.Middlelayer.AccRepository.Repositories.Interface;
+using Siger.Middlelayer.Repository.Data.Acc;
+using Siger.Middlelayer.Repository.Paged;
+
+namespace Siger.Middlelayer.AccRepository.Repositories
+{
+    internal class AutomationFixtureToolsProductRepository : AccRepositoryBase<siger_automation_fixture_tools_product>, IAutomationFixtureToolsProductRepository
+    {
+        private ApiAccDbContext _context;
+        public AutomationFixtureToolsProductRepository(ApiAccDbContext context) : base(context)
+        {
+            _context = context;
+        }
+    }
+}

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

+using System;
+using System.Linq;
+using System.Linq.Expressions;
+using Microsoft.EntityFrameworkCore;
+using Siger.Middlelayer.AccRepository.Entities;
+using Siger.Middlelayer.AccRepository.Repositories.Interface;
+using Siger.Middlelayer.Repository.Data.Acc;
+using Siger.Middlelayer.Repository.Paged;
+
+namespace Siger.Middlelayer.AccRepository.Repositories
+{
+    internal class AutomationFixtureToolsRepository : AccRepositoryBase<siger_automation_fixture_tools>, IAutomationFixtureToolsRepository
+    {
+        private ApiAccDbContext _context;
+        public AutomationFixtureToolsRepository(ApiAccDbContext context) : base(context)
+        {
+            _context = context;
+        }
+    }
+}

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

+using System;
+using System.Linq;
+using System.Linq.Expressions;
+using Microsoft.EntityFrameworkCore;
+using Siger.Middlelayer.AccRepository.Entities;
+using Siger.Middlelayer.AccRepository.Repositories.Interface;
+using Siger.Middlelayer.Repository.Data.Acc;
+using Siger.Middlelayer.Repository.Paged;
+
+namespace Siger.Middlelayer.AccRepository.Repositories
+{
+    internal class AutomationSectionPropertyRepository : AccRepositoryBase<siger_automation_section_property>, IAutomationSectionPropertyRepository
+    {
+        private ApiAccDbContext _context;
+        public AutomationSectionPropertyRepository(ApiAccDbContext context) : base(context)
+        {
+            _context = context;
+        }
+    }
+}

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

+using System;
+using System.Linq;
+using System.Linq.Expressions;
+using Microsoft.EntityFrameworkCore;
+using Siger.Middlelayer.AccRepository.Entities;
+using Siger.Middlelayer.AccRepository.Repositories.Interface;
+using Siger.Middlelayer.Repository.Data.Acc;
+using Siger.Middlelayer.Repository.Paged;
+
+namespace Siger.Middlelayer.AccRepository.Repositories
+{
+    internal class AutomationSectionRouteRepository : AccRepositoryBase<siger_automation_section_route>, IAutomationSectionRouteRepository
+    {
+        private ApiAccDbContext _context;
+        public AutomationSectionRouteRepository(ApiAccDbContext context) : base(context)
+        {
+            _context = context;
+        }
+    }
+}

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

+using System;
+using System.Linq;
+using System.Linq.Expressions;
+using Microsoft.EntityFrameworkCore;
+using Siger.Middlelayer.AccRepository.Entities;
+using Siger.Middlelayer.AccRepository.Repositories.Interface;
+using Siger.Middlelayer.Repository.Data.Acc;
+using Siger.Middlelayer.Repository.Paged;
+
+namespace Siger.Middlelayer.AccRepository.Repositories
+{
+    internal class AutomationTaskListRepository : AccRepositoryBase<siger_automation_task_list>, IAutomationTaskListRepository
+    {
+        private ApiAccDbContext _context;
+        public AutomationTaskListRepository(ApiAccDbContext context) : base(context)
+        {
+            _context = context;
+        }
+    }
+}

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

+using System;
+using System.Linq;
+using System.Linq.Expressions;
+using Microsoft.EntityFrameworkCore;
+using Siger.Middlelayer.AccRepository.Entities;
+using Siger.Middlelayer.AccRepository.Repositories.Interface;
+using Siger.Middlelayer.Repository.Data.Acc;
+using Siger.Middlelayer.Repository.Paged;
+
+namespace Siger.Middlelayer.AccRepository.Repositories
+{
+    internal class AutomationTrayRepository : AccRepositoryBase<siger_automation_tray>, IAutomationTrayRepository
+    {
+        private ApiAccDbContext _context;
+        public AutomationTrayRepository(ApiAccDbContext context) : base(context)
+        {
+            _context = context;
+        }
+    }
+}

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/Interface/IAutomationFixtureToolsProductRepository.cs

+using Siger.Middlelayer.AccRepository.Entities;
+using Siger.Middlelayer.Repository.Data.Acc;
+using Siger.Middlelayer.Repository.Paged;
+
+namespace Siger.Middlelayer.AccRepository.Repositories.Interface
+{
+    public interface IAutomationFixtureToolsProductRepository : IAccRepositoryBase<siger_automation_fixture_tools_product>
+    {
+        
+    }
+}

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/Interface/IAutomationFixtureToolsRepository.cs

+using Siger.Middlelayer.AccRepository.Entities;
+using Siger.Middlelayer.Repository.Data.Acc;
+using Siger.Middlelayer.Repository.Paged;
+
+namespace Siger.Middlelayer.AccRepository.Repositories.Interface
+{
+    public interface IAutomationFixtureToolsRepository : IAccRepositoryBase<siger_automation_fixture_tools>
+    {
+        
+    }
+}

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/Interface/IAutomationSectionPropertyRepository.cs

+using Siger.Middlelayer.AccRepository.Entities;
+using Siger.Middlelayer.Repository.Data.Acc;
+using Siger.Middlelayer.Repository.Paged;
+
+namespace Siger.Middlelayer.AccRepository.Repositories.Interface
+{
+    public interface IAutomationSectionPropertyRepository : IAccRepositoryBase<siger_automation_section_property>
+    {
+        
+    }
+}

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/Interface/IAutomationSectionRouteRepository.cs

+using Siger.Middlelayer.AccRepository.Entities;
+using Siger.Middlelayer.Repository.Data.Acc;
+using Siger.Middlelayer.Repository.Paged;
+
+namespace Siger.Middlelayer.AccRepository.Repositories.Interface
+{
+    public interface IAutomationSectionRouteRepository : IAccRepositoryBase<siger_automation_section_route>
+    {
+        
+    }
+}

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/Interface/IAutomationTaskListRepository.cs

+using Siger.Middlelayer.AccRepository.Entities;
+using Siger.Middlelayer.Repository.Data.Acc;
+using Siger.Middlelayer.Repository.Paged;
+
+namespace Siger.Middlelayer.AccRepository.Repositories.Interface
+{
+    public interface IAutomationTaskListRepository : IAccRepositoryBase<siger_automation_task_list>
+    {
+        
+    }
+}

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/Interface/IAutomationTrayRepository.cs

+using Siger.Middlelayer.AccRepository.Entities;
+using Siger.Middlelayer.Repository.Data.Acc;
+using Siger.Middlelayer.Repository.Paged;
+
+namespace Siger.Middlelayer.AccRepository.Repositories.Interface
+{
+    public interface IAutomationTrayRepository : IAccRepositoryBase<siger_automation_tray>
+    {
+        
+    }
+}

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

@@ -18,7 +18,7 @@ namespace Siger.Middlelayer.AccRepository.Response
 
         public string parent { get; set; }
 
-        public DateTime time { get; set; }s
+        public DateTime time { get; set; }
         public string createtime { get; set; }
 
         public string updatetime { get; set; }

Server/Infrastructure/Script/DB.script

@@ -280,7 +280,7 @@ CREATE TABLE IF NOT EXSIT `siger_automation_tray`  (
 CREATE TABLE IF NOT EXSIT `siger_automation_machine_property`  (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `guid` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `machineid` int(11) NOT NULL DEFAULT 0 COMMENT '设备ID',
+  `sectionid` int(11) NOT NULL DEFAULT 0 COMMENT '工位ID',
   `propertytype` int(11) NOT NULL DEFAULT 0 COMMENT '1:上下料工位2:加工工位3:检验工位4:装配工位5:存储工位',
   `upload` int(11) NOT NULL DEFAULT 0 COMMENT '0:不是上料1:是上料',
   `down` int(11) NOT NULL DEFAULT 0 COMMENT '0:不是下料1:是下料',
@@ -300,8 +300,8 @@ CREATE TABLE IF NOT EXSIT `siger_automation_section_route`  (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `guid` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
   `sectionid` int(11) NOT NULL DEFAULT 0 COMMENT '产线',
-  `startmachine` int(11) NOT NULL DEFAULT 0 COMMENT '开始设备ID',
-  `endmachine` int(11) NOT NULL DEFAULT 0 COMMENT '目标设备ID',
+  `startsection` int(11) NOT NULL DEFAULT 0 COMMENT '开始工位',
+  `endsection` int(11) NOT NULL DEFAULT 0 COMMENT '目标工位',
   `projectid` int(11) NOT NULL DEFAULT 0,
   `status` int(11) NOT NULL DEFAULT 1,
   `createtime` datetime(0) NOT NULL,
@@ -317,10 +317,10 @@ CREATE TABLE IF NOT EXSIT `siger_automation_section_route`  (
 CREATE TABLE IF NOT EXSIT `siger_automation_task_list`  (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `guid` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `machineid` int(11) NOT NULL DEFAULT 0 COMMENT '设备ID',
+  `sectionid` int(11) NOT NULL DEFAULT 0 COMMENT '工位ID',
   `trigger` int(11) NOT NULL DEFAULT 0 COMMENT '触发方',
   `tasktype` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '任务类型',
-  `startmachine` int(11) NOT NULL DEFAULT 0 COMMENT '发起地',
+  `startsection` int(11) NOT NULL DEFAULT 0 COMMENT '发起工位',
   `materialid` 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',
@@ -334,8 +334,8 @@ CREATE TABLE IF NOT EXSIT `siger_automation_task_list`  (
   `status` int(11) NOT NULL DEFAULT 1 COMMENT '状态',
   `triggertime` datetime(0) NOT NULL COMMENT '触发时间',
   `completetime` datetime(0) NULL DEFAULT NULL COMMENT '完成时间',
-  `oprator` int(11) NOT NULL DEFAULT 0 COMMENT '操作人',
-  `opratetime` datetime(0) NULL DEFAULT NULL COMMENT '操作时间',
+  `operater` int(11) NOT NULL DEFAULT 0 COMMENT '操作人',
+  `operatetime` datetime(0) NULL DEFAULT NULL COMMENT '操作时间',
   `remark` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
   `extend1` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE