moBase 新增公司组织 ID

MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/Dto/SeorderentryDto.cs

@@ -15,7 +15,7 @@ namespace Business.ResourceExamineManagement.Dto
         public long sorderId { get; set; }
 
         /// <summary>
-        /// 企业id
+        /// 租户id
         /// </summary>
         public long tenantId { get; set; }
 
@@ -23,6 +23,14 @@ namespace Business.ResourceExamineManagement.Dto
         /// 工厂id
         /// </summary>
         public long factoryId { get; set; }
+        /// <summary>
+        /// 公司ID
+        /// </summary>
+        public long company_id { get; set; }
+        /// <summary>
+        /// 组织ID
+        /// </summary>
+        public long org_id { get; set; }
 
         /// <summary>
         /// 检查入口--用于判断是否需要生成（工单、委外、采购）

MicroServices/Business/Business.Application/ResourceExamineManagement/MorderAppService.cs

@@ -133,7 +133,7 @@ namespace Business.ResourceExamineManagement
         /// <param name="number">物料编码</param>
         /// <param name="Quantity"></param>
         /// <param name="ParentId"></param>
-        public Mes_MorderDto GenerateMorder(GenerateMorderDto generateMorderDto,int urgent)
+        public Mes_MorderDto GenerateMorder(GenerateMorderDto generateMorderDto, int urgent)
         {
             //1.库存、在制工单检查完成后 当前BOM需要自制时 产生工单。
 
@@ -186,6 +186,8 @@ namespace Business.ResourceExamineManagement
             mes_Morder.moentry_startup_status = 0;
             mes_Morder.tenant_id = param.tenantId;
             mes_Morder.factory_id = param.factoryId;
+            mes_Morder.company_id = param.company_id;
+            mes_Morder.org_id = param.org_id;
             mes_Morder.product_code = generateMorderDto.number;
             mes_Morder.product_name = generateMorderDto.ic_Item.name;
             if (generateMorderDto.seorder != null)
@@ -205,7 +207,7 @@ namespace Business.ResourceExamineManagement
             mes_Morder.morder_production_number = generateMorderDto.Quantity;
             mes_Morder.need_number = generateMorderDto.Quantity;
             mes_Morder.remaining_number = 0;
-            mes_Morder.create_time=DateTime.Now;
+            mes_Morder.create_time = DateTime.Now;
             //生成工单子表数据
             mo_mes_moentry mes_Moentry = new mo_mes_moentry();
             mes_Moentry.GenerateNewId(snowFlake.NextId());
@@ -219,7 +221,9 @@ namespace Business.ResourceExamineManagement
             mes_Moentry.remaining_number = 0;
             mes_Moentry.tenant_id = param.tenantId;
             mes_Moentry.factory_id = param.factoryId;
-            mes_Moentry.create_time=DateTime.Now;
+            mes_Moentry.company_id = param.company_id;
+            mes_Moentry.org_id = param.org_id;
+            mes_Moentry.create_time = DateTime.Now;
             Mes_MorderDto mes_MorderDto = new Mes_MorderDto();
             mes_MorderDto.mes_Morders = new List<mo_mes_morder>();
             mes_MorderDto.mes_Moentries = new List<mo_mes_moentry>();
@@ -481,7 +485,7 @@ namespace Business.ResourceExamineManagement
                 mes_Mooccupy.fentry_id = seorderentry.entry_seq.Value;//销售订单行
                 mes_Mooccupy.org_id = seorderentry.org_id;
             }
-            
+
             mes_Mooccupy.fitem_name = ic_item.name;//物料名称
             mes_Mooccupy.fitem_number = ic_item.number;
             mes_Mooccupy.fmodel = ic_item.model;//规格型号
@@ -497,6 +501,8 @@ namespace Business.ResourceExamineManagement
             //mes_Mooccupy.moo_creason = string.Empty;
             mes_Mooccupy.tenant_id = param.tenantId;//取销售子表企业ID
             mes_Mooccupy.factory_id = param.factoryId;
+            mes_Mooccupy.company_id = param.company_id;
+            mes_Mooccupy.org_id = param.org_id;
             return mes_Mooccupy;
         }
 

MicroServices/Business/Business.Domain/MongoDB/Base/MoBaseEntity.cs

@@ -68,11 +68,17 @@ namespace Business.Domain
         public virtual DateTime? update_time { get; set; }
 
         /// <summary>
-        /// 企业ID
+        /// 租户ID
         /// </summary>
         [Required]
-        [Comment("企业ID")]
+        [Comment("租户ID")]
         public virtual long tenant_id { get; set; }
+        /// <summary>
+        /// 公司ID
+        /// </summary>
+        [Required]
+        [Comment("公司ID")]
+        public virtual long company_id { get; set; }
 
         /// <summary>
         /// 工厂ID