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

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

@@ -2,9 +2,9 @@ using Business.Core.Extensions;
 using Business.Model;
 using Business.Models;
 using Bussiness.Model.MES.IC;
-using Bussiness.Model.MES.PO;
 using Bussiness.Model.Production;
 using Bussiness.Model.ProductionProcess;
+using Bussiness.Model.SRM;
 using Bussiness.Model.SystemData;
 using Bussiness.Model.Tech;
 using Microsoft.EntityFrameworkCore;
@@ -121,9 +121,9 @@ namespace Business.EntityFrameworkCore
                 b.ConfigureByConvention();
             });
 
-            builder.Entity<ic_purchase>(b =>
+            builder.Entity<srm_purchase>(b =>
             {
-                b.ToTable("ic_purchase").HasComment("昜蹋粒劃陓洘桶");
+                b.ToTable("srm_purchase").HasComment("昜蹋粒劃陓洘桶");
 
                 b.ConfigureByConvention();
             });
@@ -149,30 +149,30 @@ namespace Business.EntityFrameworkCore
                 b.ConfigureByConvention();
             });
 
-            builder.Entity<po_list>(b =>
+            builder.Entity<srm_po_list>(b =>
             {
-                b.ToTable("po_list").HasComment("粒劃隆等隴牉砆ロ");
+                b.ToTable("srm_po_list").HasComment("粒劃隆等隴牉砆ロ");
 
                 b.ConfigureByConvention();
             });
 
-            builder.Entity<po_main>(b =>
+            builder.Entity<srm_po_main>(b =>
             {
-                b.ToTable("po_main").HasComment("粒劃隆等");
+                b.ToTable("srm_po_main").HasComment("粒劃隆等");
 
                 b.ConfigureByConvention();
             });
 
-            builder.Entity<po_occupy>(b =>
+            builder.Entity<srm_po_occupy>(b =>
             {
-                b.ToTable("po_occupy").HasComment("粒劃隆等梩蚚砆ロ");
+                b.ToTable("srm_po_occupy").HasComment("粒劃隆等梩蚚砆ロ");
 
                 b.ConfigureByConvention();
             });
 
-            builder.Entity<pr_main>(b =>
+            builder.Entity<srm_pr_main>(b =>
             {
-                b.ToTable("pr_main").HasComment("粒劃扠ワ等");
+                b.ToTable("srm_pr_main").HasComment("粒劃扠ワ等");
 
                 b.ConfigureByConvention();
             });

MicroServices/Business/Bussiness.Model/MES/IC/ic_bom.cs

@@ -30,6 +30,24 @@ namespace Bussiness.Model.MES.IC
         [Description("bom单编号")]
         public string? bom_number { get; set; }
         /// <summary>
+        /// 物料id
+        /// </summary>
+        [Required]
+        [Description("物料id")]
+        public long icitem_id { get; set; }
+        /// <summary>
+        /// 物料代码
+        /// </summary>
+        [StringLength(80)]
+        [Description("物料代码")]
+        public string? item_number { get; set; }
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        [StringLength(200)]
+        [Description("物料名称")]
+        public string? item_name { get; set; }
+        /// <summary>
         /// 序号
         /// </summary>
         [Description("序号")]

MicroServices/Business/Bussiness.Model/MES/IC/ic_bom_child.cs

@@ -29,11 +29,11 @@ namespace Bussiness.Model.MES.IC
         [Description("bom单编号")]
         public string? bom_number { get; set; }
         /// <summary>
-        /// 父级id
+        /// 是否是BOM
         /// </summary>
         [Required]
-        [Description("父级id")]
-        public long parent_child_id { get; set; }
+        [Description("是否是BOM")]
+        public int is_bom { get; set; }
         /// <summary>
         /// 物料id
         /// </summary>
@@ -41,6 +41,18 @@ namespace Bussiness.Model.MES.IC
         [Description("物料id")]
         public long icitem_id { get; set; }
         /// <summary>
+        /// 物料代码
+        /// </summary>
+        [StringLength(80)]
+        [Description("物料代码")]
+        public string? item_number { get; set; }
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        [StringLength(200)]
+        [Description("物料名称")]
+        public string? item_name { get; set; }
+        /// <summary>
         /// 单位
         /// </summary>
         [StringLength(20)]
@@ -131,6 +143,11 @@ namespace Bussiness.Model.MES.IC
         /// </summary>
         [Description("操作时间")]
         public DateTime? op_time { get; set; }
+        /// <summary>
+        /// 序号
+        /// </summary>
+        [Description("序号")]
+        public int child_num { get; set; }
     }
 }
 

MicroServices/Business/Bussiness.Model/MES/PO/po_list.cs → MicroServices/Business/Bussiness.Model/SRM/srm_po_list.cs

@@ -3,12 +3,12 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Bussiness.Model.MES.PO
+namespace Bussiness.Model.SRM
 {
     /// <summary>
     /// 采购订单明细详情
     /// </summary>
-    public class po_list : BaseEntity
+    public class srm_po_list : BaseEntity
     {
         /// <summary>
         /// 主键

MicroServices/Business/Bussiness.Model/MES/PO/po_main.cs → MicroServices/Business/Bussiness.Model/SRM/srm_po_main.cs

@@ -3,12 +3,12 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Bussiness.Model.MES.PO
+namespace Bussiness.Model.SRM
 {
     /// <summary>
     /// 采购订单
     /// </summary>
-    public class po_main : BaseEntity
+    public class srm_po_main : BaseEntity
     {
         /// <summary>
         /// 主键

MicroServices/Business/Bussiness.Model/MES/PO/po_occupy.cs → MicroServices/Business/Bussiness.Model/SRM/srm_po_occupy.cs

@@ -3,12 +3,12 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Bussiness.Model.MES.PO
+namespace Bussiness.Model.SRM
 {
     /// <summary>
     /// 采购订单占用详情
     /// </summary>
-    public class po_occupy : BaseEntity
+    public class srm_po_occupy : BaseEntity
     {
         /// <summary>
         /// 主键

MicroServices/Business/Bussiness.Model/MES/PO/pr_main.cs → MicroServices/Business/Bussiness.Model/SRM/srm_pr_main.cs

@@ -3,12 +3,12 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Bussiness.Model.MES.PO
+namespace Bussiness.Model.SRM
 {
     /// <summary>
     /// 采购申请单
     /// </summary>
-    public class pr_main : BaseEntity
+    public class srm_pr_main : BaseEntity
     {
         /// <summary>
         /// 主键

MicroServices/Business/Bussiness.Model/MES/IC/ic_purchase.cs → MicroServices/Business/Bussiness.Model/SRM/srm_purchase.cs

@@ -3,12 +3,12 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Bussiness.Model.MES.IC
+namespace Bussiness.Model.SRM
 {
     /// <summary>
     /// 物料采购信息表
     /// </summary>
-    public class ic_purchase : BaseEntity
+    public class srm_purchase : BaseEntity
     {
         /// <summary>
         /// 主键

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

@@ -5,16 +5,16 @@ using System.ComponentModel.DataAnnotations;
 namespace Bussiness.Model.Tech
 {
     /// <summary>
-    /// 工艺工位关联设备表
+    /// 工序关联设备表
     /// </summary>
-    public class mes_tech_proc_workshop_equipment : BaseEntity
+    public class mes_tech_proc_equipment : BaseEntity
     {
         /// <summary>
         /// 主键
         /// </summary>
         [Key]
         [Description("主键")]
-        public long tech_proc_workshop_equip_id { get; set; }
+        public long tech_proc_equip_id { get; set; }
 
         /// <summary>
         /// 设备id
@@ -31,11 +31,11 @@ namespace Bussiness.Model.Tech
         public string? equip_name { get; set; }
 
         /// <summary>
-        /// 工艺工位id
+        /// 工艺工序id
         /// </summary>
         [Required]
-        [Description("工艺工位id")]
-        public long tech_proc_workshop_id { get; set; }
+        [Description("工艺工序id")]
+        public long tech_proc_id { get; set; }
 
         /// <summary>
         /// 工作日历id

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

@@ -5,23 +5,23 @@ using System.ComponentModel.DataAnnotations;
 namespace Bussiness.Model.Tech
 {
     /// <summary>
-    /// 发料到工位表
+    /// 发料到工序表
     /// </summary>
-    public class mes_tech_proc_workshop_icitem : BaseEntity
+    public class mes_tech_proc_icitem : BaseEntity
     {
         /// <summary>
         /// 主键
         /// </summary>
         [Key]
         [Description("主键")]
-        public long tech_proc_workshop_icitem_id { get; set; }
+        public long tech_proc_icitem_id { get; set; }
 
         /// <summary>
-        /// 工序工位id
+        /// 工艺工序id
         /// </summary>
         [Required]
-        [Description("工序工位id")]
-        public long tech_proc_workshop_id { get; set; }
+        [Description("工艺工序id")]
+        public long tech_proc_id { get; set; }
 
         /// <summary>
         /// 物料id

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

@@ -7,7 +7,7 @@ namespace Bussiness.Model.Tech
     /// <summary>
     /// 工作日历
     /// </summary>
-    public class work_calendar : BaseEntity
+    public class mes_work_calendar : BaseEntity
     {
         /// <summary>
         /// 工作日历主键

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

@@ -7,7 +7,7 @@ namespace Bussiness.Model.Tech
     /// <summary>
     /// 工作日历明细表
     /// </summary>
-    public class work_calendar_list : BaseEntity
+    public class mes_work_calendar_list : BaseEntity
     {
         /// <summary>
         /// 工作日历明细主键