zhengly пре 3 година
родитељ
комит
1c6aecf0b7

+ 6 - 2
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -348,7 +348,7 @@ namespace Business.ResourceExamineManagement
         /// 数据库快照
         /// </summary>
         /// <returns></returns>
-        public async Task SyncData(long factoryId,long bangid)
+        public async Task SyncData(long factoryId, long bangid)
         {
             //同步物料库存数据
             var icitemStokc = _mysql_ic_item_stock.GetListAsync(p => p.factory_id == factoryId).Result;
@@ -363,24 +363,28 @@ namespace Business.ResourceExamineManagement
             var icBom = _mysql_ic_bom.GetListAsync(x => x.factory_id == factoryId).Result;
             if (icBom.Count > 0)
             {
+                icBom.ForEach(item => { item.bang_id = bangid; });
                 await _ic_bom.InsertMany(icBom);
             }
             //在制工单占用记录表
             var mes_mooccupy = _mysql_mes_mooccupy.GetListAsync(x => x.factory_id == factoryId).Result;
             if (mes_mooccupy.Count > 0)
             {
+                mes_mooccupy.ForEach(item => { item.bang_id = bangid; });
                 await _mes_mooccupy.InsertMany(mes_mooccupy);
             }
             //工单主表
             var mes_morder = _mysql_mes_morder.GetListAsync(x => x.factory_id == factoryId).Result;
             if (mes_morder.Count > 0)
             {
+                mes_morder.ForEach(item => { item.bang_id = bangid; });
                 await _mes_morder.InsertMany(mes_morder);
             }
             //工单子表
             var mes_moentry = _mysql_mes_moentry.GetListAsync(x => x.factory_id == factoryId).Result;
             if (mes_moentry.Count > 0)
             {
+                mes_moentry.ForEach(item => { item.bang_id = bangid; });
                 await _mes_moentry.InsertMany(mes_moentry);
             }
         }
@@ -479,7 +483,7 @@ namespace Business.ResourceExamineManagement
             if (curProcess != null)
             {
                 sortProcesses.AddFirst(curProcess);
-                SortProcess(Processes, curProcess.Id,sortProcesses);
+                SortProcess(Processes, curProcess.Id, sortProcesses);
             }
         }
 

+ 5 - 0
MicroServices/Business/Bussiness.Model/MES/IC/ic_bom.cs

@@ -133,5 +133,10 @@ namespace Bussiness.Model.MES.IC
         [StringLength(20)]
         [Description("单位")]
         public string? unit { get; set; }
+        /// <summary>
+        /// 计算ID
+        /// </summary>
+        [Description("计算id")]
+        public long? bang_id { get; set; }
     }
 }

+ 5 - 0
MicroServices/Business/Bussiness.Model/Production/mes_moentry.cs

@@ -74,6 +74,11 @@ namespace Bussiness.Model.Production
         [Precision(20, 8)]
         [Description("剩余可用数量")]
         public decimal? remaining_number { get; set; }
+        /// <summary>
+        /// 计算ID
+        /// </summary>
+        [Description("计算id")]
+        public long? bang_id { get; set; }
 
     }
 }

+ 5 - 0
MicroServices/Business/Bussiness.Model/Production/mes_mooccupy.cs

@@ -131,6 +131,11 @@ namespace Bussiness.Model.Production
         [StringLength(500)]
         [Description("变更原因")]
         public string? moo_creason { get; set; }
+        /// <summary>
+        /// 计算ID
+        /// </summary>
+        [Description("计算id")]
+        public long? bang_id { get; set; }
 
     }
 }

+ 5 - 0
MicroServices/Business/Bussiness.Model/Production/mes_morder.cs

@@ -315,5 +315,10 @@ namespace Bussiness.Model.Production
         /// </summary>
         [Description("下达日期")]
         public DateTime? convey_date { get; set; }
+        /// <summary>
+        /// 计算ID
+        /// </summary>
+        [Description("计算id")]
+        public long? bang_id { get; set; }
     }
 }