调整数据库快照和定时任务

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

@@ -569,36 +569,6 @@ namespace Business.ResourceExamineManagement
                 moSrm_po_occupy.ForEach(item => { item.id = help.NextId(); });
                 await _srm_po_occupy.InsertMany(moSrm_po_occupy);
             }
-
-            //工厂物料明细表
-            var ic_factory_details = _mysql_ic_factory_details.GetListAsync(x => x.tenant_id == tenantId && x.factory_id == factoryId).Result;
-            if (ic_factory_details.Count > 0)
-            {
-                ic_factory_details.ForEach(item => { item.bang_id = bangid; });
-                var moIc_factory_details = ObjectMapper.Map<List<ic_factory_details>, List<mo_ic_factory_details>>(ic_factory_details);
-                moIc_factory_details.ForEach(item => { item.id = help.NextId(); });
-                await _ic_factory_details.InsertMany(moIc_factory_details);
-            }
-
-            //物料采购计划表
-            var ic_plan = _mysql_ic_plan.GetListAsync(x => x.tenant_id == tenantId && x.factory_id == factoryId).Result;
-            if (ic_plan.Count > 0)
-            {
-                ic_plan.ForEach(item => { item.bang_id = bangid; });
-                var moIc_plan = ObjectMapper.Map<List<ic_plan>, List<mo_ic_plan>>(ic_plan);
-                moIc_plan.ForEach(item => { item.id = help.NextId(); });
-                await _ic_plan.InsertMany(moIc_plan);
-            }
-
-            //物料采购报价单
-            var ic_item_pur = _mysql_ic_item_pur.GetListAsync(x => x.tenant_id == tenantId && x.factory_id == factoryId).Result;
-            if (ic_item_pur.Count > 0)
-            {
-                ic_item_pur.ForEach(item => { item.bang_id = bangid; });
-                var moIc_item_pur = ObjectMapper.Map<List<ic_item_pur>, List<mo_ic_item_pur>>(ic_item_pur);
-                moIc_item_pur.ForEach(item => { item.id = help.NextId(); });
-                await _ic_item_pur.InsertMany(moIc_item_pur);
-            }
         }
 
         /// <summary>
@@ -627,15 +597,6 @@ namespace Business.ResourceExamineManagement
 
             //清除采购订单占用详情
             await _srm_po_occupy.Delete(p => p.bang_id == bangid);
-
-            //清除工厂物料明细表
-            await _ic_factory_details.Delete(p => p.bang_id == bangid);
-
-            //清除物料采购计划表
-            await _ic_plan.Delete(p => p.bang_id == bangid);
-
-            //清除物料采购报价单
-            await _ic_item_pur.Delete(p => p.bang_id == bangid);
         }
 
         /// <summary>

MicroServices/Business/Business.Application/SyncDataManagement/SyncMySQLDataAppService.cs

@@ -119,6 +119,27 @@ namespace Business.SyncDataManagement
         private readonly IMongoDB<mo_mes_tech_process> _mes_tech_process;
         private IRepository<mes_tech_process, long> _mysql_mes_tech_process;
 
+        /// <summary>
+        /// 物料采购计划表
+        /// </summary>
+        private readonly IMongoDB<mo_ic_plan> _ic_plan;
+        private IRepository<ic_plan, long> _mysql_ic_plan;
+
+        /// <summary>
+        /// 物料工厂明细表
+        /// </summary>
+        private readonly IMongoDB<mo_ic_factory_details> _ic_factory_details;
+        private IRepository<ic_factory_details, long> _mysql_ic_factory_details;
+
+        /// <summary>
+        /// 物料采购报价单
+        /// </summary>
+        private readonly IMongoDB<mo_ic_item_pur> _ic_item_pur;
+        private IRepository<ic_item_pur, long> _mysql_ic_item_pur;
+
+        /// <summary>
+        /// 雪花算法
+        /// </summary>
         SnowFlake help = new SnowFlake();
         #endregion
 
@@ -136,6 +157,9 @@ namespace Business.SyncDataManagement
             IMongoDB<mo_mes_technique> mes_technique,
             IMongoDB<mo_mes_process> mes_process,
             IMongoDB<mo_mes_tech_process> mes_tech_process,
+            IMongoDB<mo_ic_factory_details> ic_factory_details,
+            IMongoDB<mo_ic_item_pur> ic_item_pur,
+            IMongoDB<mo_ic_plan> ic_plan,
             IRepository<ic_bom, long> mysql_ic_bom,
             IRepository<ic_bom_child, long> mysql_ic_bom_child,
             IRepository<ic_item, long> mysql_ic_item,
@@ -145,7 +169,10 @@ namespace Business.SyncDataManagement
             IRepository<srm_supplier, long> mysql_srm_supplier,
             IRepository<mes_technique, long> mysql_mes_technique,
             IRepository<mes_process, long> mysql_mes_process,
-            IRepository<mes_tech_process, long> mysql_mes_tech_process
+            IRepository<mes_tech_process, long> mysql_mes_tech_process,
+            IRepository<ic_factory_details, long> mysql_ic_factory_details,
+            IRepository<ic_item_pur, long> mysql_ic_item_pur,
+            IRepository<ic_plan, long> mysql_ic_plan
             )
         {
             _ic_bom= ic_bom;
@@ -158,7 +185,10 @@ namespace Business.SyncDataManagement
             _mes_technique = mes_technique;
             _mes_process= mes_process;
             _mes_tech_process = mes_tech_process;
-            _mysql_ic_bom= mysql_ic_bom;
+            _ic_factory_details = ic_factory_details;
+            _ic_item_pur = ic_item_pur;
+            _ic_plan = ic_plan;
+            _mysql_ic_bom = mysql_ic_bom;
             _mysql_ic_bom_child= mysql_ic_bom_child;
             _mysql_ic_item= mysql_ic_item;
             _mysql_ic_substitute= mysql_ic_substitute;
@@ -168,6 +198,9 @@ namespace Business.SyncDataManagement
             _mysql_mes_technique= mysql_mes_technique;
             _mysql_mes_process= mysql_mes_process;
             _mysql_mes_tech_process= mysql_mes_tech_process;
+            _mysql_ic_factory_details = mysql_ic_factory_details;
+            _mysql_ic_item_pur = mysql_ic_item_pur;
+            _mysql_ic_plan = mysql_ic_plan;
         }
 
         /// <summary>
@@ -296,6 +329,39 @@ namespace Business.SyncDataManagement
                 //插入数据
                 _mes_tech_process.InsertMany(moTech_procs);
             }
+
+            //工厂物料明细表
+            var ic_factory_details = _mysql_ic_factory_details.GetListAsync().Result;
+            if (ic_factory_details.Count > 0)
+            {
+                //先清空表数据
+                _ic_factory_details.Delete(p => p.mysql_id != -1);
+                var moIc_factory_details = ObjectMapper.Map<List<ic_factory_details>, List<mo_ic_factory_details>>(ic_factory_details);
+                moIc_factory_details.ForEach(s => s.id = help.NextId());
+                _ic_factory_details.InsertMany(moIc_factory_details);
+            }
+
+            //物料采购计划表
+            var ic_plan = _mysql_ic_plan.GetListAsync().Result;
+            if (ic_plan.Count > 0)
+            {
+                //先清空表数据
+                _ic_plan.Delete(p => p.mysql_id != -1);
+                var moIc_plan = ObjectMapper.Map<List<ic_plan>, List<mo_ic_plan>>(ic_plan);
+                moIc_plan.ForEach(s => s.id = help.NextId());
+                _ic_plan.InsertMany(moIc_plan);
+            }
+
+            //物料采购报价单
+            var ic_item_pur = _mysql_ic_item_pur.GetListAsync().Result;
+            if (ic_item_pur.Count > 0)
+            {
+                //先清空表数据
+                _ic_item_pur.Delete(p => p.mysql_id != -1);
+                var moIc_item_pur = ObjectMapper.Map<List<ic_item_pur>, List<mo_ic_item_pur>>(ic_item_pur);
+                moIc_item_pur.ForEach(s => s.id = help.NextId());
+                _ic_item_pur.InsertMany(moIc_item_pur);
+            }
         }
     }
 }

MicroServices/Business/Bussiness.MongoModel/MES/IC/mo_ic_factory_details.cs

@@ -238,13 +238,5 @@ namespace Bussiness.MongoModel.MES.IC
         [DefaultValue(0)]
         [Precision(20, 8)]
         public decimal? order_leadtime { get; set; }
-
-        /// <summary>
-        /// 计算ID
-        /// </summary>
-        [Comment("计算id")]
-        [NotMapped]
-        public long? bang_id { get; set; }
-
     }
 }

MicroServices/Business/Bussiness.MongoModel/MES/IC/mo_ic_item_pur.cs

@@ -86,12 +86,5 @@ namespace Bussiness.MongoModel.MES.IC
         [Required]
         [Comment("币种")]
         public long? currency_type { get; set; }
-
-        /// <summary>
-        /// 计算ID
-        /// </summary>
-        [Comment("计算id")]
-        [NotMapped]
-        public long? bang_id { get; set; }
     }
 }

MicroServices/Business/Bussiness.MongoModel/MES/IC/mo_ic_plan.cs

@@ -124,12 +124,6 @@ namespace Bussiness.MongoModel.MES.IC
         [Comment("计划备注")]
         public string? plannote { get; set; }
 
-        /// <summary>
-        /// 计算ID
-        /// </summary>
-        [Comment("计算id")]
-        [NotMapped]
-        public long? bang_id { get; set; }
         /// <summary>
         /// 自检提前期
         /// </summary>