实体调整

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/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

@@ -9,12 +9,12 @@ namespace Bussiness.Model.ProductionProcess
     /// </summary>
     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

@@ -10,12 +10,12 @@ namespace Bussiness.Model.ProductionProcess
     /// </summary>
     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>