Murphy 3 лет назад
Родитель
Сommit
c3049a108c
26 измененных файлов с 147 добавлено и 174 удалено
  1. 74 149
      MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/BusinessDbContext.cs
  2. 1 1
      MicroServices/Business/Business.Host/BusinessHostModule.cs
  3. 3 1
      MicroServices/Business/Bussiness.Model/SIM/sim_base.cs
  4. 3 1
      MicroServices/Business/Bussiness.Model/SIM/sim_issue_type.cs
  5. 3 1
      MicroServices/Business/Bussiness.Model/SIM/sim_plant.cs
  6. 3 1
      MicroServices/Business/Bussiness.Model/SIM/sim_user_relation.cs
  7. 3 1
      MicroServices/Business/Bussiness.Model/Sale/crm_seorderprog.cs
  8. 3 1
      MicroServices/Business/Bussiness.Model/Sale/crm_seorderreview.cs
  9. 3 1
      MicroServices/Business/Bussiness.Model/Sale/wms_prdprogress.cs
  10. 3 1
      MicroServices/Business/Bussiness.Model/Sale/wms_shipnotice.cs
  11. 3 1
      MicroServices/Business/Bussiness.Model/Sale/wms_shipnoticelist.cs
  12. 3 1
      MicroServices/Business/Bussiness.Model/Sale/wms_shipplan.cs
  13. 3 1
      MicroServices/Business/Bussiness.Model/Sale/wms_shipplanlist.cs
  14. 3 1
      MicroServices/Business/Bussiness.Model/SystemData/crm_customer.cs
  15. 3 1
      MicroServices/Business/Bussiness.Model/SystemData/sys_code.cs
  16. 3 1
      MicroServices/Business/Bussiness.Model/SystemData/sys_code_pre.cs
  17. 3 1
      MicroServices/Business/Bussiness.Model/SystemData/sys_config.cs
  18. 3 1
      MicroServices/Business/Bussiness.Model/SystemData/sys_measure_unit.cs
  19. 3 1
      MicroServices/Business/Bussiness.Model/SystemData/sys_post.cs
  20. 3 1
      MicroServices/Business/Bussiness.Model/SystemData/sys_post_staff.cs
  21. 3 1
      MicroServices/Business/Bussiness.Model/SystemData/sys_schedule.cs
  22. 3 1
      MicroServices/Business/Bussiness.Model/SystemData/sys_shift.cs
  23. 3 1
      MicroServices/Business/Bussiness.Model/SystemData/sys_shift_invalid_time.cs
  24. 3 1
      MicroServices/Business/Bussiness.Model/SystemData/sys_shift_schedule.cs
  25. 3 1
      MicroServices/Business/Bussiness.Model/SystemData/sys_staff.cs
  26. 3 1
      MicroServices/Business/Bussiness.Model/SystemData/sys_upload.cs

+ 74 - 149
MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/BusinessDbContext.cs

@@ -2,7 +2,9 @@ using Business.Model;
 using Business.Models;
 using Bussiness.Model.MES.IC;
 using Bussiness.Model.Production;
+using Bussiness.Model.ProductionProcess;
 using Bussiness.Model.Sale;
+using Bussiness.Model.SIM;
 using Bussiness.Model.SRM;
 using Bussiness.Model.SystemData;
 using Bussiness.Model.Tech;
@@ -23,185 +25,108 @@ namespace Business.EntityFrameworkCore
 
         public DbSet<PrintTemplate> PrintTemplate { get; set; }
 
-        public DbSet<ic_bom> ic_Bom { get; set; }
-
-        public DbSet<wms_prdprogress> wms_Prdprogresses { get; set; }
-
-        /// <summary>
-        /// 销售订单
-        /// </summary>
-        public DbSet<crm_seorder> crm_seorder { get; set; }
-        /// <summary>
-        /// 销售订单子表
-        /// </summary>
-        public DbSet<crm_seorderentry> crm_seorderentry { get; set; }
-        #region 工单
-        /// <summary>
-        /// 在制工单占用记录表
-        /// </summary>
-        public DbSet<mes_mooccupy> mes_mooccupy { get; set; }
-        /// <summary>
-        /// 工单主表
-        /// </summary>
-        public DbSet<mes_morder> mes_morder { get; set; }
-        /// <summary>
-        /// 工单子表
-        /// </summary>
-        public DbSet<mes_moentry> mes_moentry { get; set; }
-        #endregion
-        #region 物料
-        /// <summary>
-        /// 物料详情
-        /// </summary>
-        public DbSet<ic_item> ic_Item { get; set; }
-
-        /// <summary>
-        /// 物料BOM
-        /// </summary>
+        #region MES/IC
         public DbSet<ic_bom> ic_bom { get; set; }
-
-        /// <summary>
-        /// 物料BOM明细
-        /// </summary>
         public DbSet<ic_bom_child> ic_bom_child { get; set; }
-
-        /// <summary>
-        /// 物料质检
-        /// </summary>
         public DbSet<ic_check> ic_check { get; set; }
-
-        /// <summary>
-        /// 工厂物料明细表
-        /// </summary>
         public DbSet<ic_factory_details> ic_factory_details { get; set; }
-
-        /// <summary>
-        /// 物料IE信息
-        /// </summary>
+        public DbSet<ic_item> ic_item { get; set; }
         public DbSet<ic_item_ie> ic_item_ie { get; set; }
-
-        /// <summary>
-        /// 物料库存明细表
-        /// </summary>
         public DbSet<ic_item_inventory> ic_item_inventory { get; set; }
-
-        /// <summary>
-        /// 物料采购报价单
-        /// </summary>
         public DbSet<ic_item_pur> ic_item_pur { get; set; }
-
-        /// <summary>
-        /// 物料库存表
-        /// </summary>
         public DbSet<ic_item_stock> ic_item_stock { get; set; }
-
-        /// <summary>
-        /// 物料计量表
-        /// </summary>
+        public DbSet<ic_item_stockoccupy> ic_item_stockoccupy { get; set; }
         public DbSet<ic_metering_unit> ic_metering_unit { get; set; }
-
-        /// <summary>
-        /// 物料采购计划表
-        /// </summary>
         public DbSet<ic_plan> ic_plan { get; set; }
-
-        /// <summary>
-        /// 替代群组
-        /// </summary>
         public DbSet<ic_substitute> ic_substitute { get; set; }
-
-        /// <summary>
-        /// 物料替代多群组
-        /// </summary>
         public DbSet<ic_substitute_all> ic_substitute_all { get; set; }
-
-        /// <summary>
-        /// 物料替代多群组明细
-        /// </summary>
         public DbSet<ic_substitute_all_dtl> ic_substitute_all_dtl { get; set; }
         #endregion
 
-        #region 工艺路径
+        #region Production
+        public DbSet<mes_moentry> mes_moentry { get; set; }
+        public DbSet<mes_mooccupy> mes_mooccupy { get; set; }
+        public DbSet<mes_morder> mes_morder { get; set; }
+        public DbSet<mes_morder_loss_time> mes_morder_loss_time { get; set; }
+        public DbSet<mes_oorder> mes_oorder { get; set; }
+        public DbSet<mes_schedule_occupy> mes_schedule_occupy { get; set; }
+        public DbSet<mes_stockoccupy> mes_stockoccupy { get; set; }
+        #endregion
 
-        /// <summary>
-        /// 工序
-        /// </summary>
-        public DbSet<mes_process> mes_process { get; set; }
+        #region ProductionProcess
+        public DbSet<mes_loss_time_record> mes_loss_time_record { get; set; }
+        public DbSet<mes_meaction> mes_meaction { get; set; }
+        public DbSet<mes_mebycard> mes_mebycard { get; set; }
+        public DbSet<mes_merecheck> mes_merecheck { get; set; }
+        public DbSet<mes_mereport> mes_mereport { get; set; }
+        public DbSet<mes_prd_sendmat> mes_prd_sendmat { get; set; }
+        public DbSet<mes_prd_sendmat_list> mes_prd_sendmat_list { get; set; }
+        public DbSet<mes_prdlog> mes_prdlog { get; set; }
+        public DbSet<mes_product_work_time> mes_product_work_time { get; set; }
+        public DbSet<mes_stock_enter> mes_stock_enter { get; set; }
+        public DbSet<mes_stock_out> mes_stock_out { get; set; }
+        public DbSet<mes_swipe_card> mes_swipe_card { get; set; }
+        #endregion
 
-        /// <summary>
-        /// 治具表
-        /// </summary>
-        public DbSet<mes_tech_proc_accessory> mes_tech_proc_accessory { get; set; }
+        #region Sale
+        public DbSet<crm_seorder> crm_seorder { get; set; }
+        public DbSet<crm_seorderentry> crm_seorderentry { get; set; }
+        public DbSet<crm_seorderprog> crm_seorderprog { get; set; }
+        public DbSet<crm_seorderreview> crm_seorderreview { get; set; }
+        public DbSet<wms_prdprogress> wms_prdprogress { get; set; }
+        public DbSet<wms_shipnotice> wms_shipnotice { get; set; }
+        public DbSet<wms_shipnoticelist> wms_shipnoticelist { get; set; }
+        public DbSet<wms_shipplan> wms_shipplan { get; set; }
+        public DbSet<wms_shipplanlist> wms_shipplanlist { get; set; }
+        #endregion
 
-        /// <summary>
-        /// 工序作业指导书表
-        /// </summary>
-        public DbSet<mes_tech_proc_document> mes_tech_proc_document { get; set; }
+        #region SIM
+        public DbSet<sim_base> sim_base { get; set; }
+        public DbSet<sim_issue_type> sim_issue_type { get; set; }
+        public DbSet<sim_plant> sim_plant { get; set; }
+        public DbSet<sim_user_relation> sim_user_relation { get; set; }
+        #endregion
 
-        /// <summary>
-        /// 工序关联设备表
-        /// </summary>
-        public DbSet<mes_tech_proc_equipment> mes_tech_proc_equipment { get; set; }
+        #region SRM
+        public DbSet<srm_po_list> srm_po_list { get; set; }
+        public DbSet<srm_po_main> srm_po_main { get; set; }
+        public DbSet<srm_po_occupy> srm_po_occupy { get; set; }
+        public DbSet<srm_pr_main> srm_pr_main { get; set; }
+        public DbSet<srm_purchase> srm_purchase { get; set; }
+        #endregion
 
-        /// <summary>
-        /// 发料到工序表
-        /// </summary>
-        public DbSet<mes_tech_proc_icitem> mes_tech_proc_icitem { get; set; }
+        #region SystemData
+        public DbSet<crm_customer> crm_customer { get; set; }
+        public DbSet<srm_supplier> srm_supplier { get; set; }
+        public DbSet<sys_code> sys_code { get; set; }
+        public DbSet<sys_code_pre> sys_code_pre { get; set; }
+        public DbSet<sys_config> sys_config { get; set; }
+        public DbSet<sys_measure_unit> sys_measure_unit { get; set; }
+        public DbSet<sys_post> sys_post { get; set; }
+        public DbSet<sys_post_staff> sys_post_staff { get; set; }
+        public DbSet<sys_schedule> sys_schedule { get; set; }
+        public DbSet<sys_shift> sys_shift { get; set; }
+        public DbSet<sys_shift_invalid_time> sys_shift_invalid_time { get; set; }
+        public DbSet<sys_shift_schedule> sys_shift_schedule { get; set; }
+        public DbSet<sys_staff> sys_staff { get; set; }
+        public DbSet<sys_upload> sys_upload { get; set; }
+        #endregion
 
-        /// <summary>
-        /// 工艺路径关联工位表
-        /// </summary>
+        #region Tech
+        public DbSet<mes_process> mes_process { get; set; }
+        public DbSet<mes_tech_proc_accessory> mes_tech_proc_accessory { get; set; }
+        public DbSet<mes_tech_proc_document> mes_tech_proc_document { get; set; }
+        public DbSet<mes_tech_proc_equipment> mes_tech_proc_equipment { get; set; }
+        public DbSet<mes_tech_proc_icitem> mes_tech_proc_icitem { get; set; }
         public DbSet<mes_tech_proc_workshop> mes_tech_proc_workshop { get; set; }
-
-        /// <summary>
-        /// 工序工位员工信息表
-        /// </summary>
         public DbSet<mes_tech_proc_workshop_staff> mes_tech_proc_workshop_staff { get; set; }
-
-        /// <summary>
-        /// 工艺关联工序表
-        /// </summary>
         public DbSet<mes_tech_process> mes_tech_process { get; set; }
-
-        /// <summary>
-        /// 工艺路径表
-        /// </summary>
         public DbSet<mes_technique> mes_technique { get; set; }
-
-        /// <summary>
-        /// 工作日历
-        /// </summary>
         public DbSet<mes_work_calendar> mes_work_calendar { get; set; }
-
-        /// <summary>
-        /// 工作日历明细表
-        /// </summary>
         public DbSet<mes_work_calendar_list> mes_work_calendar_list { get; set; }
-
-        /// <summary>
-        /// 工位表
-        /// </summary>
         public DbSet<mes_workshop> mes_workshop { get; set; }
-
-        /// <summary>
-        /// 工位关联线边仓表
-        /// </summary>
         public DbSet<mes_workshop_shelf> mes_workshop_shelf { get; set; }
         #endregion
-
-        #region SRM
-        public DbSet<srm_pr_main> srm_pr_main { get; set; }
-        public DbSet<mes_oorder> mes_oorder { get; set; }
-        public DbSet<srm_po_main> srm_po_main { get; set; }
-        public DbSet<srm_po_list> srm_po_list { get; set; }
-
-        public DbSet<srm_po_occupy> srm_po_occupy { get; set; }
-
-        /// <summary>
-        /// 供应商
-        /// </summary>
-        public DbSet<srm_supplier> srm_supplier { get; set; }
-        #endregion
         //Code generation...
         public BusinessDbContext(DbContextOptions<BusinessDbContext> options)
             : base(options)

+ 1 - 1
MicroServices/Business/Business.Host/BusinessHostModule.cs

@@ -316,7 +316,7 @@ namespace Business
                 DashboardTitle = "任务调度中心"
             });
 
-            RecurringJob.AddOrUpdate<IHangFireJobService>(a=>a.SyncDataMySQLData(),CronType.Day(0,0,1));
+            RecurringJob.AddOrUpdate<IHangFireJobService>(a=>a.SyncDataMySQLData(),CronType.Day(0,0,1),TimeZoneInfo.Local);
             AsyncHelper.RunSync(async () =>
             {
                 using (var scope = context.ServiceProvider.CreateScope())

+ 3 - 1
MicroServices/Business/Bussiness.Model/SIM/sim_base.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;
@@ -9,6 +10,7 @@ namespace Bussiness.Model.SIM
     /// sim基本表
     /// </summary>
     [Comment("sim基本表")]
+    [CollectionName("dopbase", "sim_base")]
     public class sim_base:BaseEntity
     {
         ///// <summary>

+ 3 - 1
MicroServices/Business/Bussiness.Model/SIM/sim_issue_type.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;
@@ -9,6 +10,7 @@ namespace Bussiness.Model.SIM
     /// sim事项类别表
     /// </summary>
     [Comment("上升时间")]
+    [CollectionName("dopbase", "sim_issue_type")]
     public class sim_issue_type: BaseEntity
     {
         ///// <summary>

+ 3 - 1
MicroServices/Business/Bussiness.Model/SIM/sim_plant.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;
@@ -9,6 +10,7 @@ namespace Bussiness.Model.SIM
     /// sim事项表
     /// </summary>
     [Comment("sim事项表")]
+    [CollectionName("dopbase", "sim_plant")]
     public class sim_plant:BaseEntity
     {
         ///// <summary>

+ 3 - 1
MicroServices/Business/Bussiness.Model/SIM/sim_user_relation.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;
@@ -9,6 +10,7 @@ namespace Bussiness.Model.SIM
     /// sim用户关联表
     /// </summary>
     [Comment("sim用户关联表")]
+    [CollectionName("dopbase", "sim_user_relation")]
     public class sim_user_relation: BaseEntity
     {
         ///// <summary>

+ 3 - 1
MicroServices/Business/Bussiness.Model/Sale/crm_seorderprog.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;
@@ -9,6 +10,7 @@ namespace Bussiness.Model.Sale
     ///销售订单进度表
     /// </summary>
     [Comment("销售订单进度表")]
+    [CollectionName("dopbase", "crm_seorderprog")]
     public class crm_seorderprog : BaseEntity
     {
         ///// <summary>

+ 3 - 1
MicroServices/Business/Bussiness.Model/Sale/crm_seorderreview.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;
@@ -9,6 +10,7 @@ namespace Bussiness.Model.Sale
     ///销售订单评审表
     /// </summary>
     [Comment("销售订单评审表")]
+    [CollectionName("dopbase", "crm_seorderreview")]
     public class crm_seorderreview : BaseEntity
     {
         ///// <summary>

+ 3 - 1
MicroServices/Business/Bussiness.Model/Sale/wms_prdprogress.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;
@@ -9,6 +10,7 @@ namespace Bussiness.Model.Sale
     ///进度字典
     /// </summary>
     [Comment("进度字典表")]
+    [CollectionName("dopbase", "wms_prdprogress")]
     public class wms_prdprogress: BaseEntity
     {
         ///// <summary>

+ 3 - 1
MicroServices/Business/Bussiness.Model/Sale/wms_shipnotice.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;
@@ -9,6 +10,7 @@ namespace Bussiness.Model.Sale
     /// 发运通知单
     /// </summary>
     [Comment("发运通知单")]
+    [CollectionName("dopbase", "wms_shipnotice")]
     public class wms_shipnotice : BaseEntity
     {
         ///// <summary>

+ 3 - 1
MicroServices/Business/Bussiness.Model/Sale/wms_shipnoticelist.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;
@@ -9,6 +10,7 @@ namespace Bussiness.Model.Sale
     /// 发运通知单详情清单
     /// </summary>
     [Comment("发运通知单详情清单")]
+    [CollectionName("dopbase", "wms_shipnoticelist")]
     public class wms_shipnoticelist : BaseEntity
     {
         ///// <summary>

+ 3 - 1
MicroServices/Business/Bussiness.Model/Sale/wms_shipplan.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;
@@ -9,6 +10,7 @@ namespace Bussiness.Model.Sale
     /// 发货计划表
     /// </summary>
     [Comment("发货计划表")]
+    [CollectionName("dopbase", "wms_shipplan")]
     public class wms_shipplan : BaseEntity
     {
         ///// <summary>

+ 3 - 1
MicroServices/Business/Bussiness.Model/Sale/wms_shipplanlist.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;
@@ -9,6 +10,7 @@ namespace Bussiness.Model.Sale
     /// 发货计划详情清单
     /// </summary>
     [Comment("发货计划详情清单")]
+    [CollectionName("dopbase", "wms_shipplanlist")]
     public class wms_shipplanlist : BaseEntity
     {
         ///// <summary>

+ 3 - 1
MicroServices/Business/Bussiness.Model/SystemData/crm_customer.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;
@@ -9,6 +10,7 @@ namespace Bussiness.Model.SystemData
     /// 客户
     /// </summary>
     [Comment("客户")]
+    [CollectionName("dopbase", "crm_customer")]
     public class crm_customer:BaseEntity
     {
         ///// <summary>

+ 3 - 1
MicroServices/Business/Bussiness.Model/SystemData/sys_code.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;
@@ -11,6 +12,7 @@ namespace Bussiness.Model.SystemData
     /// 系统编码表
     /// </summary>
     [Comment("系统编码表")]
+    [CollectionName("dopbase", "sys_code")]
     public class sys_code:Entity<long>
     {
         ///// <summary>

+ 3 - 1
MicroServices/Business/Bussiness.Model/SystemData/sys_code_pre.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;
@@ -10,6 +11,7 @@ namespace Bussiness.Model.SystemData
     /// 系统编码前置表
     /// </summary>
     [Comment("系统编码前置表")]
+    [CollectionName("dopbase", "sys_code_pre")]
     public class sys_code_pre:Entity<long>
     {
         ///// <summary>

+ 3 - 1
MicroServices/Business/Bussiness.Model/SystemData/sys_config.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;
@@ -10,6 +11,7 @@ namespace Bussiness.Model.SystemData
     /// 系统配置表
     /// </summary>
     [Comment("系统配置表")]
+    [CollectionName("dopbase", "sys_config")]
     public class sys_config:Entity<long>
     {
         ///// <summary>

+ 3 - 1
MicroServices/Business/Bussiness.Model/SystemData/sys_measure_unit.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;
@@ -10,6 +11,7 @@ namespace Bussiness.Model.SystemData
     /// 计量单位信息表
     /// </summary>
     [Comment("计量单位信息表")]
+    [CollectionName("dopbase", "sys_measure_unit")]
     public class sys_measure_unit:Entity<long>
     {
         ///// <summary>

+ 3 - 1
MicroServices/Business/Bussiness.Model/SystemData/sys_post.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;
@@ -9,6 +10,7 @@ namespace Bussiness.Model.SystemData
     /// 岗位表
     /// </summary>
     [Comment("岗位表")]
+    [CollectionName("dopbase", "sys_post")]
     public class sys_post: BaseEntity
     {
         ///// <summary>

+ 3 - 1
MicroServices/Business/Bussiness.Model/SystemData/sys_post_staff.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;
@@ -9,6 +10,7 @@ namespace Bussiness.Model.SystemData
     /// 员工岗位关联表
     /// </summary>
     [Comment("员工岗位关联表")]
+    [CollectionName("dopbase", "sys_post_staff")]
     public class sys_post_staff: BaseEntity
     {
         ///// <summary>

+ 3 - 1
MicroServices/Business/Bussiness.Model/SystemData/sys_schedule.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;
@@ -9,6 +10,7 @@ namespace Bussiness.Model.SystemData
     /// 班次表
     /// </summary>
     [Comment("班次表")]
+    [CollectionName("dopbase", "sys_schedule")]
     public class sys_schedule: BaseEntity
     {
         ///// <summary>

+ 3 - 1
MicroServices/Business/Bussiness.Model/SystemData/sys_shift.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;
@@ -9,6 +10,7 @@ namespace Bussiness.Model.SystemData
     /// 班制表
     /// </summary>
     [Comment("班制表")]
+    [CollectionName("dopbase", "sys_shift")]
     public class sys_shift: BaseEntity
     {
         ///// <summary>

+ 3 - 1
MicroServices/Business/Bussiness.Model/SystemData/sys_shift_invalid_time.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;
@@ -9,6 +10,7 @@ namespace Bussiness.Model.SystemData
     /// 班次无效时间表
     /// </summary>
     [Comment("班次无效时间表")]
+    [CollectionName("dopbase", "sys_shift_invalid_time")]
     public class sys_shift_invalid_time:BaseEntity
     {
         ///// <summary>

+ 3 - 1
MicroServices/Business/Bussiness.Model/SystemData/sys_shift_schedule.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;
@@ -9,6 +10,7 @@ namespace Bussiness.Model.SystemData
     /// 班制班次关联表
     /// </summary>
     [Comment("班制班次关联表")]
+    [CollectionName("dopbase", "sys_shift_schedule")]
     public class sys_shift_schedule:BaseEntity
     {
         ///// <summary>

+ 3 - 1
MicroServices/Business/Bussiness.Model/SystemData/sys_staff.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;
@@ -9,6 +10,7 @@ namespace Bussiness.Model.SystemData
     /// 员工表
     /// </summary>
     [Comment("员工表")]
+    [CollectionName("dopbase", "sys_staff")]
     public class sys_staff:BaseEntity
     {
         ///// <summary>

+ 3 - 1
MicroServices/Business/Bussiness.Model/SystemData/sys_upload.cs

@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using Business.Core.Attributes;
+using Microsoft.EntityFrameworkCore;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Domain.Entities;
@@ -9,6 +10,7 @@ namespace Bussiness.Model.SystemData
     /// 文件上传表
     /// </summary>
     [Comment("文件上传表")]
+    [CollectionName("dopbase", "sys_upload")]
     public class sys_upload:Entity<long>
     {
         ///// <summary>