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

Server/Apis/Siger.ApiACC/Siger.ApiACC.csproj

@@ -32,6 +32,7 @@
     <ProjectReference Include="..\..\Common\Siger.Middlelayer.Common\Siger.Middlelayer.Common.csproj" />
     <ProjectReference Include="..\..\Common\Siger.Middlelayer.Log\Siger.Middlelayer.Log.csproj" />
     <ProjectReference Include="..\..\Infrastructure\Repositories\Siger.Middlelayer.AccRepository\Siger.Middlelayer.AccRepository.csproj" />
+    <ProjectReference Include="..\..\Infrastructure\Repositories\Siger.Middlelayer.CncRepository\Siger.Middlelayer.CncRepository.csproj" />
     <ProjectReference Include="..\..\Infrastructure\Siger.Middlelayer.Dapper\Siger.Middlelayer.Dapper.csproj" />
     <ProjectReference Include="..\Siger.ApiCommon\Siger.ApiCommon.csproj" />
   </ItemGroup>

Server/Apis/Siger.ApiACC/Tasks/AccRegistry.cs

@@ -9,7 +9,7 @@ namespace Siger.ApiACC.Tasks
         public AccRegistry()
         {
             //Logger.RegisterLogEngine(Module.Acc);
-            Schedule<AccCalculateTraceJob>().ToRunNow().AndEvery(30).Minutes();
+            //Schedule<AccCalculateTraceJob>().ToRunNow().AndEvery(30).Minutes();
 
            
         }

Server/Apis/Siger.ApiACC/Tasks/AutoMES.cs

+using FluentScheduler;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Siger.ApiACC.Tasks
+{
+    public class AutoMES : IJob, IDisposable
+    {
+      
+
+        public void Execute()
+        {
+            throw new NotImplementedException();
+        }
+        public void Dispose()
+        {
+            throw new NotImplementedException();
+        }
+
+
+        //获取TaskList 
+        private List<int>GetTaskList()
+        {
+
+            return new List<int>();
+        }
+    }
+}

Server/Apis/Siger.ApiACC/Tasks/DBhelper.cs

+using Siger.Middlelayer.AccRepository;
+using Siger.Middlelayer.CncRepository;
+using Siger.Middlelayer.Repository;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Siger.ApiACC.Tasks
+{
+    public class DBhelper 
+    {
+        private static DBhelper _helper;
+        public static DBhelper Instance = _helper ?? (_helper = new DBhelper());
+
+        public ApiCncDbContext CncDbContext;
+        public ApiAccDbContext AccDbContext;
+        public ApiConfigDbContext ConfigDbContext;
+
+        static DBhelper()
+        {
+        }
+        public void LoadDbContext()
+        {
+            CncDbContext = new ApiCncDbContext();
+            AccDbContext = new ApiAccDbContext();
+            ConfigDbContext = new ApiConfigDbContext();
+        }
+
+        public List<int> GetTaskList()
+        {
+            return new List<int>();
+        }
+        public void Dispose()
+        {
+            CncDbContext?.Dispose();
+            AccDbContext?.Dispose();
+            ConfigDbContext?.Dispose();
+        }
+    }
+}

Server/Common/Siger.Middlelayer.Share/Enum/ModuleEnum/Automation.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Siger.Middlelayer.Share.Enum.ModuleEnum
+{
+    public class Automation
+    {
+        /// <summary>
+        /// 任务触发类型
+        /// </summary>
+        public enum TaskTrigerType
+        {
+            /// <summary>
+            /// 手动任务
+            /// </summary>
+            Manual=1,
+            /// <summary>
+            ///  自动任务
+            /// </summary>
+            Auto=2
+        }
+        /// <summary>
+        /// Task任务状态结果
+        /// </summary>
+        public enum TaskResultStatus
+        {
+            /// <summary>
+            /// 取消
+            /// </summary>
+            Cancel=0,
+            /// <summary>
+            /// 待生产
+            /// </summary>
+            Waiting=1,
+            /// <summary>
+            /// 生产中
+            /// </summary>
+            Produce=2,
+            /// <summary>
+            /// 生产完成
+            /// </summary>
+            Complated=3
+        }
+        /// <summary>
+        /// 设备状态 （自动任务）
+        /// </summary>
+        public enum MachineStatus
+        {
+            /// <summary>
+            /// 待生产
+            /// </summary>
+            Waiting = 1,
+            /// <summary>
+            /// 生产中
+            /// </summary>
+            Produce = 2,
+            /// <summary>
+            /// 生产完成
+            /// </summary>
+            Complated = 3
+        }
+    }
+}

Server/Infrastructure/Script/DB.script

@@ -154,3 +154,215 @@ ALTER TABLE siger_projectId_plan_machine_route ADD COLUMN debugEndTime int NOT N
 
 ALTER TABLE siger_project_repair_report ADD COLUMN repeat_time int(11) DEFAULT 5 COMMENT '应急维护推送间隔';
 ALTER TABLE siger_project_plan_report ADD COLUMN repeat_time int(11) DEFAULT 5 COMMENT '计划维护推送间隔';
+
+
+
+
+/*
+ Navicat Premium Data Transfer
+
+ -- ----------------------------
+-- 徕斯 自动化生产线
+-- 家伟
+-- 日期20210119
+-- ----------------------------
+
+ Date: 19/01/2021 14:43:24
+*/
+
+
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- 工装类型维护
+-- Table structure for siger_automation_fixture_tools_category
+-- ----------------------------
+DROP TABLE IF EXISTS `siger_automation_fixture_tools_category`;
+CREATE TABLE `siger_automation_fixture_tools_category`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称',
+  `guid` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+  `parent` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'siger_automation_fixture_tools_category.guid',
+  `projectid` int(11) NOT NULL,
+  `status` int(11) NOT NULL,
+  `createTime` datetime(0) NOT NULL,
+  `updateTime` datetime(0) NULL DEFAULT NULL,
+  `extend1` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- 工装台账信息
+-- Table structure for siger_automation_fixture_tools
+-- ----------------------------
+DROP TABLE IF EXISTS `siger_automation_fixture_tools`;
+CREATE TABLE `siger_automation_fixture_tools`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `guid` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+  `category` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '工装类别siger_automation_fixture_tools_category.guid',
+  `managetype` int(11) NOT NULL DEFAULT 0 COMMENT '管理类型',
+  `partnumber` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '工装料号',
+  `name` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '工装名称',
+  `specifition` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '规格型号',
+  `number` int(11) NOT NULL DEFAULT 0 COMMENT '数量',
+  `remark` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `attachment` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '附件',
+  `code` varchar(150) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '工装编号',
+  `status` int(11) NOT NULL DEFAULT 1 COMMENT '状态',
+  `createtime` datetime(0) NOT NULL,
+  `creator` int(11) NOT NULL DEFAULT 0,
+  `updator` int(11) NOT NULL DEFAULT 0,
+  `updatetime` datetime(0) NULL DEFAULT NULL,
+  `extend1` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- 工装装配信息
+-- Table structure for siger_automation_fixture_tools_assembly
+-- ----------------------------
+DROP TABLE IF EXISTS `siger_automation_fixture_tools_assembly`;
+CREATE TABLE `siger_automation_fixture_tools_assembly`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `guid` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+  `parent` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '父类工装GUID',
+  `son` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '子类工装GUID',
+  `projectid` int(11) NOT NULL DEFAULT 0,
+  `status` int(11) NOT NULL DEFAULT 1,
+  `creator` int(11) NOT NULL DEFAULT 0,
+  `createtime` datetime(0) NOT NULL,
+  `updator` int(11) NOT NULL DEFAULT 0,
+  `updateTime` datetime(0) NULL DEFAULT NULL,
+  `extend1` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- 工装类型应产品
+-- Table structure for siger_automation_fixture_tools_product
+-- ----------------------------
+DROP TABLE IF EXISTS `siger_automation_fixture_tools_product`;
+CREATE TABLE `siger_automation_fixture_tools_product`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `guid` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+  `fixturetools` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'siger_automation_fixture_tools.guid',
+  `productid` int(11) NOT NULL DEFAULT 0 COMMENT '产品ID',
+  `remark` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `projectid` int(11) NOT NULL DEFAULT 0,
+  `status` int(11) NOT NULL DEFAULT 1,
+  `creator` int(11) NOT NULL DEFAULT 0,
+  `createtime` datetime(0) NOT NULL,
+  `updator` int(11) NOT NULL DEFAULT 0,
+  `updatetime` datetime(0) NULL DEFAULT NULL,
+  `extend1` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- 托盘台账列表
+-- Table structure for siger_automation_tray
+-- ----------------------------
+DROP TABLE IF EXISTS `siger_automation_tray`;
+CREATE TABLE `siger_automation_tray`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `locationid` int(11) NOT NULL DEFAULT 0 COMMENT '储位位置',
+  `fixturetools` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '工装GUID',
+  `materialid` int(11) NOT NULL DEFAULT 0 COMMENT '物料ID',
+  `processid` int(11) NOT NULL DEFAULT 0 COMMENT '工序ID',
+  `materialstate` int(11) NOT NULL DEFAULT 0 COMMENT '物料状态',
+  `attachment` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '附件',
+  `remark` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `updator` int(11) NOT NULL DEFAULT 0,
+  `updatetime` datetime(0) NULL DEFAULT NULL,
+  `extend1` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- 工位属性
+-- Table structure for siger_automation_machine_property
+-- ----------------------------
+DROP TABLE IF EXISTS `siger_automation_machine_property`;
+CREATE TABLE `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',
+  `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:是下料',
+  `projectid` int(11) NOT NULL DEFAULT 0,
+  `status` int(11) NOT NULL DEFAULT 1,
+  `createtime` datetime(0) NOT NULL,
+  `updatetime` datetime(0) NULL DEFAULT NULL,
+  `extend1` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- 自动线路径
+-- Table structure for siger_automation_section_route
+-- ----------------------------
+DROP TABLE IF EXISTS `siger_automation_section_route`;
+CREATE TABLE `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',
+  `projectid` int(11) NOT NULL DEFAULT 0,
+  `status` int(11) NOT NULL DEFAULT 1,
+  `createtime` datetime(0) NOT NULL,
+  `updatetime` datetime(0) NULL DEFAULT NULL,
+  `extend1` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- 任务清单管理
+-- Table structure for siger_automation_task_list
+-- ----------------------------
+DROP TABLE IF EXISTS `siger_automation_task_list`;
+CREATE TABLE `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',
+  `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 '发起地',
+  `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',
+  `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` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '动作',
+  `actiontype` int(11) NOT NULL DEFAULT 0 COMMENT '动作类型',
+  `projectid` int(11) NOT NULL DEFAULT 0,
+  `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 '操作时间',
+  `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
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- 设备可用状态
+-- Table structure for siger_automation_task_list
+-- ----------------------------
+DROP TABLE IF EXISTS `siger_automation_machine_status`;
+CREATE TABLE `siger_automation_machine_status`  (
+  `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',,
+  `projectid` int(11) NOT NULL DEFAULT 0,
+  `enable` int(11) NOT NULL DEFAULT 1 COMMENT '设备可用状态 0:不可用 1:可用',
+  `status` int(11) NOT NULL DEFAULT 1 COMMENT '完工状态 0：取消 1:待生产 2:生产中 3:生产完成 ',
+  `updatetime` datetime(0) NULL DEFAULT NULL COMMENT '操作时间'
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;