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

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

@@ -85,6 +85,7 @@ namespace Business.ResourceExamineManagement
         /// </summary>
         private readonly IMongoDB<ic_item> _ic_item;
         private IBasicRepository<ic_item, long> _mysql_ic_item;
+
         /// <summary>
         /// 物料BOM
         /// </summary>
@@ -121,6 +122,7 @@ namespace Business.ResourceExamineManagement
         /// 生产工单主表
         /// </summary>
         private readonly IMongoDB<mes_morder> _mes_morder;
+
         /// <summary>
         /// 在制工单占用记录表
         /// </summary>

MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/BusinessDbContext.cs

@@ -24,6 +24,89 @@ namespace Business.EntityFrameworkCore
 
         public DbSet<wms_prdprogress> wms_Prdprogresses { get; set; }
 
+        /// <summary>
+        /// 物料详情
+        /// </summary>
+        public DbSet<ic_item> ic_Item { get; set; }
+
+        /// <summary>
+        /// 物料BOM
+        /// </summary>
+        public DbSet<ic_bom> ic_bom { get; set; }
+
+        /// <summary>
+        /// 物料BOM明细
+        /// </summary>
+        public DbSet<ic_bom_child> ic_bom_child { get; set; }
+
+        #region 工艺路径
+
+        /// <summary>
+        /// 工序
+        /// </summary>
+        public DbSet<mes_process> mes_process { get; set; }
+
+        /// <summary>
+        /// 治具表
+        /// </summary>
+        public DbSet<mes_tech_proc_accessory> mes_tech_proc_accessory { get; set; }
+
+        /// <summary>
+        /// 工序作业指导书表
+        /// </summary>
+        public DbSet<mes_tech_proc_document> mes_tech_proc_document { get; set; }
+
+        /// <summary>
+        /// 工序关联设备表
+        /// </summary>
+        public DbSet<mes_tech_proc_equipment> mes_tech_proc_equipment { get; set; }
+
+        /// <summary>
+        /// 发料到工序表
+        /// </summary>
+        public DbSet<mes_tech_proc_icitem> mes_tech_proc_icitem { get; set; }
+
+        /// <summary>
+        /// 工艺路径关联工位表
+        /// </summary>
+        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
+
         //Code generation...
         public BusinessDbContext(DbContextOptions<BusinessDbContext> options)
             : base(options)