Merge branch 'master' of http://123.60.180.165:4647/ZZYDOP/DOPCore

# Conflicts:
#	MicroServices/Business/Bussiness.Model/Base/BaseEntity.cs

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -87,9 +87,9 @@ namespace Business.ResourceExamineManagement
         /// <exception cref="NotImplementedException"></exception>
         public async Task<PschedDto> ReceiveResult(SeorderentryDto input)
         {
-            mes_technique info = new mes_technique();
+            mes_technique info = new mes_technique() { };
             SnowFlake snow = new SnowFlake();
-            info.tech_id = snow.NextId();
+            info.Id = snow.NextId();
             info.tech_name = "ceshi4444";
             info.level = 4;
             await _mes_technique.InsertOne(info);

MicroServices/Business/Business.Core/MongoDBHelper/MongoDBTools.cs

@@ -1,5 +1,6 @@
 using Business.Core.Attributes;
 using Microsoft.Extensions.Options;
+using MongoDB.Bson;
 using MongoDB.Driver;
 using System;
 using System.Collections.Generic;

MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/BusinessDbContextModelCreatingExtensions.cs

@@ -573,14 +573,14 @@ namespace Business.EntityFrameworkCore
 
             builder.Entity<mes_work_calendar>(b =>
             {
-                b.ToTable("work_calendar").HasComment("工作日历表");
+                b.ToTable("mes_work_calendar").HasComment("工作日历表");
 
                 b.ConfigureByConvention();
             });
 
             builder.Entity<mes_work_calendar_list>(b =>
             {
-                b.ToTable("work_calendar_list").HasComment("工作日历明细表");
+                b.ToTable("mes_work_calendar_list").HasComment("工作日历明细表");
 
                 b.ConfigureByConvention();
             });

MicroServices/Business/Bussiness.Model/Production/mes_moentry.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
@@ -13,14 +14,15 @@ namespace Bussiness.Model.Production
     /// <summary>
     /// 生成工单子表
     /// </summary>
+    [CollectionName("dopbase", "mes_moentry")]
     public class mes_moentry : BaseEntity
     {
-        /// <summary>
-        /// 生产工单子表id
-        /// </summary>
-        [Key]
-        [Description("生产工单子表id")]
-        public long moentry_id { get; set; }
+        ///// <summary>
+        ///// 生产工单子表id
+        ///// </summary>
+        //[Key]
+        //[Description("生产工单子表id")]
+        //public long moentry_id { get; set; }
         /// <summary>
         /// 工单主表id
         /// </summary>

MicroServices/Business/Bussiness.Model/Production/mes_mooccupy.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
@@ -13,14 +14,15 @@ namespace Bussiness.Model.Production
     /// <summary>
     /// 在制工单占用记录表
     /// </summary>
+    [CollectionName("dopbase", "mes_mooccupy")]
     public class mes_mooccupy :BaseEntity
     {
-        /// <summary>
-        /// 工单占用ID
-        /// </summary>
-        [Key]
-        [Description("工单占用ID")]
-        public long moo_id { get; set; }
+        ///// <summary>
+        ///// 工单占用ID
+        ///// </summary>
+        //[Key]
+        //[Description("工单占用ID")]
+        //public long moo_id { get; set; }
 
         /// <summary>
         /// 类型--原始,分配

MicroServices/Business/Bussiness.Model/Production/mes_morder.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
@@ -14,14 +15,15 @@ namespace Bussiness.Model.Production
     /// <summary>
     /// 工单主表
     /// </summary>
+    [CollectionName("dopbase", "mes_morder")]
     public class mes_morder : BaseEntity
     {
-        /// <summary>
-        /// 生产工单id
-        /// </summary>
-        [Key]
-        [Description("生产工单id")]
-        public long morder_id { get; set; }
+        ///// <summary>
+        ///// 生产工单id
+        ///// </summary>
+        //[Key]
+        //[Description("生产工单id")]
+        //public long morder_id { get; set; }
         /// <summary>
         /// 上级工单id
         /// </summary>

MicroServices/Business/Bussiness.Model/Production/mes_morder_loss_time.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
@@ -13,14 +14,15 @@ namespace Bussiness.Model.Production
     /// <summary>
     /// 工单损失时间表
     /// </summary>
+    [CollectionName("dopbase", "mes_morder_loss_time")]
     public class mes_morder_loss_time : BaseEntity
     {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        [Key]
-        [Description("工单损失时间主键")]
-        public long id { get; set; }
+        ///// <summary>
+        ///// 主键
+        ///// </summary>
+        //[Key]
+        //[Description("工单损失时间主键")]
+        //public long id { get; set; }
         /// <summary>
         /// 生产工单id
         /// </summary>

MicroServices/Business/Bussiness.Model/Production/mes_oorder.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
@@ -13,14 +14,15 @@ namespace Bussiness.Model.Production
     /// <summary>
     /// 委外订单表
     /// </summary>
+    [CollectionName("dopbase", "mes_oorder")]
     public class mes_oorder : BaseEntity
     {
-        /// <summary>
-        /// 委外订单id
-        /// </summary>
-        [Key]
-        [Description("委外订单id")]
-        public long oorder_id { get; set; }
+        ///// <summary>
+        ///// 委外订单id
+        ///// </summary>
+        //[Key]
+        //[Description("委外订单id")]
+        //public long oorder_id { get; set; }
         /// <summary>
         /// 生产工单编号
         /// </summary>

MicroServices/Business/Bussiness.Model/Production/mes_schedule_occupy.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
@@ -13,14 +14,15 @@ namespace Bussiness.Model.Production
     /// <summary>
     /// 排程时间占用记录表
     /// </summary>
+    [CollectionName("dopbase", "mes_schedule_occupy")]
     public class mes_schedule_occupy : BaseEntity
     {
-        /// <summary>
-        /// 排程时间占用记录id
-        /// </summary>
-        [Key]
-        [Description("排程时间占用记录id")]
-        public long id { get; set; }
+        ///// <summary>
+        ///// 排程时间占用记录id
+        ///// </summary>
+        //[Key]
+        //[Description("排程时间占用记录id")]
+        //public long id { get; set; }
         /// <summary>
         /// 开始时间
         /// </summary>

MicroServices/Business/Bussiness.Model/Production/mes_stockoccupy.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
@@ -13,14 +14,15 @@ namespace Bussiness.Model.Production
     /// <summary>
     /// 成品库存占用表
     /// </summary>
+    [CollectionName("dopbase", "mes_stockoccupy")]
     public class mes_stockoccupy : BaseEntity
     {
-        /// <summary>
-        /// 成品库存占用id
-        /// </summary>
-        [Key]
-        [Description("成品库存占用id")]
-        public long soccupy_id { get; set; }
+        ///// <summary>
+        ///// 成品库存占用id
+        ///// </summary>
+        //[Key]
+        //[Description("成品库存占用id")]
+        //public long soccupy_id { get; set; }
         /// <summary>
         /// 类型
         /// </summary>

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_loss_time_record.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
@@ -7,14 +8,15 @@ namespace Bussiness.Model.ProductionProcess
     /// <summary>
     /// 损失时间记录表
     /// </summary>
+    [CollectionName("dopbase", "mes_loss_time_record")]
     public class mes_loss_time_record : BaseEntity
     {
-        /// <summary>
-        /// 主键ID
-        /// </summary>
-        [Key]
-        [Description("主键ID")]
-        public long loss_time_record_id { get; set; }
+        ///// <summary>
+        ///// 主键ID
+        ///// </summary>
+        //[Key]
+        //[Description("主键ID")]
+        //public long loss_time_record_id { get; set; }
         /// <summary>
         /// 工单id
         /// </summary>

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_meaction.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
@@ -7,14 +8,15 @@ namespace Bussiness.Model.ProductionProcess
     /// <summary>
     /// 生产动作表
     /// </summary>
+    [CollectionName("dopbase", "mes_meaction")]
     public class mes_meaction : BaseEntity
     {
-        /// <summary>
-        /// 主键Id
-        /// </summary>
-        [Key]
-        [Description("生产动作Id")]
-        public long meaction_id { get; set; }
+        ///// <summary>
+        ///// 主键Id
+        ///// </summary>
+        //[Key]
+        //[Description("生产动作Id")]
+        //public long meaction_id { get; set; }
         /// <summary>
         /// 生产工单id
         /// </summary>

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_mebycard.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
@@ -7,14 +8,15 @@ namespace Bussiness.Model.ProductionProcess
     /// <summary>
     /// 产线刷卡记录
     /// </summary>
+    [CollectionName("dopbase", "mes_mebycard")]
     public class mes_mebycard : BaseEntity
     {
-        /// <summary>
-        /// 刷卡id
-        /// </summary>
-        [Key]
-        [Description("刷卡id")]
-        public long mebycard_id { get; set; }
+        ///// <summary>
+        ///// 刷卡id
+        ///// </summary>
+        //[Key]
+        //[Description("刷卡id")]
+        //public long mebycard_id { get; set; }
         /// <summary>
         /// 生产工单号id
         /// </summary>

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_merecheck.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
@@ -8,14 +9,15 @@ namespace Bussiness.Model.ProductionProcess
     /// <summary>
     /// 生产报检记录表
     /// </summary>
+    [CollectionName("dopbase", "mes_merecheck")]
     public class mes_merecheck : BaseEntity
     {
-        /// <summary>
-        /// 主键Id
-        /// </summary>
-        [Key]
-        [Description("生产报检记录Id")]
-        public long merecheck_id { get; set; }
+        ///// <summary>
+        ///// 主键Id
+        ///// </summary>
+        //[Key]
+        //[Description("生产报检记录Id")]
+        //public long merecheck_id { get; set; }
         /// <summary>
         /// 生产工单id
         /// </summary>

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_mereport.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
@@ -8,14 +9,15 @@ namespace Bussiness.Model.ProductionProcess
     /// <summary>
     /// 生产报工记录表
     /// </summary>
+    [CollectionName("dopbase", "mes_mereport")]
     public class mes_mereport :BaseEntity
     {
-        /// <summary>
-        /// 主键ID
-        /// </summary>
-        [Key]
-        [Description("生产报工记录Id")]
-        public long mereport_id { get; set; }
+        ///// <summary>
+        ///// 主键ID
+        ///// </summary>
+        //[Key]
+        //[Description("生产报工记录Id")]
+        //public long mereport_id { get; set; }
         /// <summary>
         /// 生产工单id
         /// </summary>

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_prd_sendmat.cs

@@ -1,17 +1,23 @@
-using Microsoft.EntityFrameworkCore;
+using Business.Core.Attributes;
+using Business.Model;
+using Microsoft.EntityFrameworkCore;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.ProductionProcess
 {
-    public class mes_prd_sendmat
+    /// <summary>
+    /// 发料单
+    /// </summary>
+    [CollectionName("dopbase", "mes_prd_sendmat")]
+    public class mes_prd_sendmat :BaseEntity
     {
-        /// <summary>
-        /// 发料单id
-        /// </summary>
-        [Key]
-        [Description("发料单id")]
-        public long prdsm_id { get; set; }
+        ///// <summary>
+        ///// 发料单id
+        ///// </summary>
+        //[Key]
+        //[Description("发料单id")]
+        //public long prdsm_id { get; set; }
         /// <summary>
         /// 单据类型 (发料、叫料、补料、退料)
         /// </summary>

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_prd_sendmat_list.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
@@ -8,14 +9,15 @@ namespace Bussiness.Model.ProductionProcess
     /// <summary>
     /// 发料单详情
     /// </summary>
+    [CollectionName("dopbase", "mes_prd_sendmat_list")]
     public class mes_prd_sendmat_list : BaseEntity
     {
-        /// <summary>
-        /// 发料单详情id
-        /// </summary>
-        [Key]
-        [Description("发料单详情id")]
-        public long prdsml_id { get; set; }
+        ///// <summary>
+        ///// 发料单详情id
+        ///// </summary>
+        //[Key]
+        //[Description("发料单详情id")]
+        //public long prdsml_id { get; set; }
         /// <summary>
         /// 发料单id
         /// </summary>

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_prdlog.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
@@ -7,14 +8,15 @@ namespace Bussiness.Model.ProductionProcess
     /// <summary>
     /// 生产操作日志
     /// </summary>
+    [CollectionName("dopbase", "mes_prdlog")]
     public class mes_prdlog :BaseEntity
     {
-        /// <summary>
-        /// 生产操作日志id
-        /// </summary>
-        [Key]
-        [Description("生产操作日志id")]
-        public long prdlog_id { get; set; }
+        ///// <summary>
+        ///// 生产操作日志id
+        ///// </summary>
+        //[Key]
+        //[Description("生产操作日志id")]
+        //public long prdlog_id { get; set; }
 
         /// <summary>
         /// 业务类型

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_product_work_time.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
@@ -7,14 +8,15 @@ namespace Bussiness.Model.ProductionProcess
     /// <summary>
     /// mo的生产时间记录
     /// </summary>
+    [CollectionName("dopbase", "mes_product_work_time")]
     public class mes_product_work_time : BaseEntity
     {
-        /// <summary>
-        /// 生产时间记录id
-        /// </summary>
-        [Key]
-        [Description("生产时间记录id")]
-        public long id { get; set; }
+        ///// <summary>
+        ///// 生产时间记录id
+        ///// </summary>
+        //[Key]
+        //[Description("生产时间记录id")]
+        //public long id { get; set; }
         /// <summary>
         /// 日期
         /// </summary>

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_stock_enter.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
@@ -7,14 +8,15 @@ namespace Bussiness.Model.ProductionProcess
     /// <summary>
     /// 入库单
     /// </summary>
+    [CollectionName("dopbase", "mes_stock_enter")]
     public class mes_stock_enter : BaseEntity
     {
-        /// <summary>
-        /// 主键id
-        /// </summary>
-        [Key]
-        [Description("入库单id")]
-        public long id { get; set; }
+        ///// <summary>
+        ///// 主键id
+        ///// </summary>
+        //[Key]
+        //[Description("入库单id")]
+        //public long id { get; set; }
         /// <summary>
         /// 物料编码
         /// </summary>

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_stock_out.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
@@ -7,14 +8,15 @@ namespace Bussiness.Model.ProductionProcess
     /// <summary>
     /// 出库单
     /// </summary>
+    [CollectionName("dopbase", "mes_stock_out")]
     public class mes_stock_out : BaseEntity
     {
-        /// <summary>
-        /// 主键Id
-        /// </summary>
-        [Key]
-        [Description("出库单Id")]
-        public long id { get; set; }
+        ///// <summary>
+        ///// 主键Id
+        ///// </summary>
+        //[Key]
+        //[Description("出库单Id")]
+        //public long id { get; set; }
 
         /// <summary>
         /// 出库单号

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_swipe_card.cs

@@ -1,4 +1,6 @@
-using System.ComponentModel;
+using Business.Core.Attributes;
+using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.ProductionProcess
@@ -6,14 +8,15 @@ namespace Bussiness.Model.ProductionProcess
     /// <summary>
     /// mes打卡记录表
     /// </summary>
-    public class mes_swipe_card
+    [CollectionName("dopbase", "mes_swipe_card")]
+    public class mes_swipe_card : BaseEntity
     {
-        /// <summary>
-        /// mes打卡记录id
-        /// </summary>
-        [Key]
-        [Description("mes打卡记录id")]
-        public long id { get; set; }
+        ///// <summary>
+        ///// mes打卡记录id
+        ///// </summary>
+        //[Key]
+        //[Description("mes打卡记录id")]
+        //public long id { get; set; }
         /// <summary>
         /// 生产车间
         /// </summary>

MicroServices/Business/Bussiness.Model/Tech/mes_process.cs

@@ -18,12 +18,12 @@ namespace Bussiness.Model.Tech
     [CollectionName("dopbase", "mes_process")]
     public class mes_process : BaseEntity
     {
-        /// <summary>
-        /// 工序主键
-        /// </summary>
-        [Key]
-        [Description("工序主键")]
-        public long proc_id { get; set; }
+        ///// <summary>
+        ///// 工序主键
+        ///// </summary>
+        //[Key]
+        //[Description("工序主键")]
+        //public long proc_id { get; set; }
 
         /// <summary>
         /// 工序名称

MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_accessory.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
@@ -7,14 +8,15 @@ namespace Bussiness.Model.Tech
     /// <summary>
     /// 治具表(工装表)
     /// </summary>
+    [CollectionName("dopbase", "mes_tech_proc_accessory")]
     public class mes_tech_proc_accessory : BaseEntity
     {
-        /// <summary>
-        /// 治具主键
-        /// </summary>
-        [Key]
-        [Description("治具主键")]
-        public long tech_proc_acc_id { get; set; }
+        ///// <summary>
+        ///// 治具主键
+        ///// </summary>
+        //[Key]
+        //[Description("治具主键")]
+        //public long tech_proc_acc_id { get; set; }
 
         /// <summary>
         /// 工艺工序主键

MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_document.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
@@ -7,14 +8,15 @@ namespace Bussiness.Model.Tech
     /// <summary>
     /// 工序作业指导书表
     /// </summary>
+    [CollectionName("dopbase", "mes_tech_proc_document")]
     public class mes_tech_proc_document : BaseEntity
     {
-        /// <summary>
-        /// 工序作业指导书主键
-        /// </summary>
-        [Key]
-        [Description("工序作业指导书主键")]
-        public long tech_proc_doc_id { get; set; }
+        ///// <summary>
+        ///// 工序作业指导书主键
+        ///// </summary>
+        //[Key]
+        //[Description("工序作业指导书主键")]
+        //public long tech_proc_doc_id { get; set; }
 
         /// <summary>
         /// 工艺工序主键

MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_equipment.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
@@ -7,14 +8,15 @@ namespace Bussiness.Model.Tech
     /// <summary>
     /// 工序关联设备表
     /// </summary>
+    [CollectionName("dopbase", "mes_tech_proc_equipment")]
     public class mes_tech_proc_equipment : BaseEntity
     {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long tech_proc_equip_id { get; set; }
+        ///// <summary>
+        ///// 主键
+        ///// </summary>
+        //[Key]
+        //[Description("主键")]
+        //public long tech_proc_equip_id { get; set; }
 
         /// <summary>
         /// 设备id

MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_icitem.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
@@ -7,14 +8,15 @@ namespace Bussiness.Model.Tech
     /// <summary>
     /// 发料到工序表
     /// </summary>
+    [CollectionName("dopbase", "mes_tech_proc_icitem")]
     public class mes_tech_proc_icitem : BaseEntity
     {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long tech_proc_icitem_id { get; set; }
+        ///// <summary>
+        ///// 主键
+        ///// </summary>
+        ////[Key]
+        ////[Description("主键")]
+        ////public long tech_proc_icitem_id { get; set; }
 
         /// <summary>
         /// 工艺工序id

MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_workshop.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
@@ -7,14 +8,15 @@ namespace Bussiness.Model.Tech
     /// <summary>
     /// 工艺路径关联工位表
     /// </summary>
+    [CollectionName("dopbase", "mes_tech_proc_workshop")]
     public class mes_tech_proc_workshop : BaseEntity
     {
-        /// <summary>
-        /// 工位表主键
-        /// </summary>
-        [Key]
-        [Description("工位表主键")]
-        public long tech_proc_workshop_id { get; set; }
+        ///// <summary>
+        ///// 工位表主键
+        ///// </summary>
+        //[Key]
+        //[Description("工位表主键")]
+        //public long tech_proc_workshop_id { get; set; }
 
         /// <summary>
         /// 工艺工序id

MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_workshop_staff.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
@@ -7,14 +8,15 @@ namespace Bussiness.Model.Tech
     /// <summary>
     /// 工序工位员工信息表
     /// </summary>
+    [CollectionName("dopbase", "mes_tech_proc_workshop_staff")]
     public class mes_tech_proc_workshop_staff : BaseEntity
     {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long tech_proc_workshop_equip_id { get; set; }
+        ///// <summary>
+        ///// 主键
+        ///// </summary>
+        //[Key]
+        //[Description("主键")]
+        //public long tech_proc_workshop_equip_id { get; set; }
 
         /// <summary>
         /// 工艺工位id

MicroServices/Business/Bussiness.Model/Tech/mes_tech_process.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
@@ -8,14 +9,15 @@ namespace Bussiness.Model.Tech
     /// <summary>
     /// 工艺关联工序表
     /// </summary>
+    [CollectionName("dopbase", "mes_tech_process")]
     public class mes_tech_process:BaseEntity
     {
-        /// <summary>
-        /// 工艺工序主键
-        /// </summary>
-        [Key]
-        [Description("工艺工序主键")]
-        public long tech_proc_id { get; set; }
+        ///// <summary>
+        ///// 工艺工序主键
+        ///// </summary>
+        //[Key]
+        //[Description("工艺工序主键")]
+        //public long tech_proc_id { get; set; }
 
         /// <summary>
         /// 工艺主键

MicroServices/Business/Bussiness.Model/Tech/mes_technique.cs

@@ -11,12 +11,12 @@ namespace Bussiness.Model.Tech
     [CollectionName("dopbase", "mes_technique")]
     public class mes_technique : BaseEntity
     {
-        /// <summary>
-        /// 工艺路径主键
-        /// </summary>
-        [Key]
-        [Description("工艺路径主键")]
-        public long tech_id { get; set; }
+        ///// <summary>
+        ///// 工艺路径主键
+        ///// </summary>
+        //[Key]
+        //[Description("工艺路径主键")]
+        //public long tech_id { get; set; }
 
         /// <summary>
         /// 工艺路径名称

MicroServices/Business/Bussiness.Model/Tech/mes_work_calendar.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
@@ -7,14 +8,15 @@ namespace Bussiness.Model.Tech
     /// <summary>
     /// 工作日历
     /// </summary>
+    [CollectionName("dopbase", "mes_work_calendar")]
     public class mes_work_calendar : BaseEntity
     {
-        /// <summary>
-        /// 工作日历主键
-        /// </summary>
-        [Key]
-        [Description("工作日历主键")]
-        public long work_calendar_id { get; set; }
+        ///// <summary>
+        ///// 工作日历主键
+        ///// </summary>
+        //[Key]
+        //[Description("工作日历主键")]
+        //public long work_calendar_id { get; set; }
 
         /// <summary>
         /// 工作日历编码

MicroServices/Business/Bussiness.Model/Tech/mes_work_calendar_list.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
@@ -7,14 +8,15 @@ namespace Bussiness.Model.Tech
     /// <summary>
     /// 工作日历明细表
     /// </summary>
+    [CollectionName("dopbase", "mes_work_calendar_list")]
     public class mes_work_calendar_list : BaseEntity
     {
-        /// <summary>
-        /// 工作日历明细主键
-        /// </summary>
-        [Key]
-        [Description("工作日历明细主键")]
-        public long work_cal_list_id { get; set; }
+        ///// <summary>
+        ///// 工作日历明细主键
+        ///// </summary>
+        //[Key]
+        //[Description("工作日历明细主键")]
+        //public long work_cal_list_id { get; set; }
 
         /// <summary>
         /// 工作日历id

MicroServices/Business/Bussiness.Model/Tech/mes_workshop.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
@@ -7,14 +8,15 @@ namespace Bussiness.Model.Tech
     /// <summary>
     /// 工位表(工作中心)
     /// </summary>
+    [CollectionName("dopbase", "mes_workshop")]
     public class mes_workshop : BaseEntity
     {
-        /// <summary>
-        /// 工位表主键
-        /// </summary>
-        [Key]
-        [Description("工位表主键")]
-        public long workshop_id { get; set; }
+        ///// <summary>
+        ///// 工位表主键
+        ///// </summary>
+        //[Key]
+        //[Description("工位表主键")]
+        //public long workshop_id { get; set; }
 
         /// <summary>
         /// 工位名称

MicroServices/Business/Bussiness.Model/Tech/mes_workshop_shelf.cs

@@ -1,4 +1,5 @@
-using Business.Model;
+using Business.Core.Attributes;
+using Business.Model;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
@@ -7,14 +8,15 @@ namespace Bussiness.Model.Tech
     /// <summary>
     /// 工位关联线边仓表
     /// </summary>
+    [CollectionName("dopbase", "mes_workshop_shelf")]
     public class mes_workshop_shelf : BaseEntity
     {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long workshop_shelf_id { get; set; }
+        ///// <summary>
+        ///// 主键
+        ///// </summary>
+        //[Key]
+        //[Description("主键")]
+        //public long workshop_shelf_id { get; set; }
 
         /// <summary>
         /// 工位id