资源检查调整

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

@@ -52,6 +52,10 @@ using Microsoft.EntityFrameworkCore.Migrations.Operations;
 using Microsoft.AspNetCore.SignalR;
 using System.Diagnostics;
 using Newtonsoft.Json;
+using Bussiness.MongoModel.MES.IC;
+using Bussiness.MongoModel.Production;
+using Bussiness.MongoModel.SRM;
+using Bussiness.MongoModel.Tech;
 
 namespace Business.ResourceExamineManagement
 {
@@ -67,109 +71,109 @@ namespace Business.ResourceExamineManagement
         /// <summary>
         /// 物料占用记录
         /// </summary>
-        private readonly IMongoDB<ic_item_stockoccupy> _ic_item_stockoccupy;
+        private readonly IMongoDB<mo_ic_item_stockoccupy> _ic_item_stockoccupy;
 
         /// <summary>
         /// 物料详情
         /// </summary>
-        private readonly IMongoDB<ic_item> _ic_item;
+        private readonly IMongoDB<mo_ic_item> _ic_item;
         private IRepository<ic_item, long> _mysql_ic_item;
 
         /// <summary>
         /// 物料BOM
         /// </summary>
-        private readonly IMongoDB<ic_bom> _ic_bom;
+        private readonly IMongoDB<mo_ic_bom> _ic_bom;
         private IRepository<ic_bom, long> _mysql_ic_bom;
         /// <summary>
         /// 物料BOM明细
         /// </summary>
-        private readonly IMongoDB<ic_bom_child> _ic_bom_child;
+        private readonly IMongoDB<mo_ic_bom_child> _ic_bom_child;
         private IRepository<ic_bom_child, long> _mysql_ic_bom_child;
 
         /// <summary>
         /// 物料库存表
         /// </summary>
-        private readonly IMongoDB<ic_item_stock> _ic_item_stock;
+        private readonly IMongoDB<mo_ic_item_stock> _ic_item_stock;
         private IRepository<ic_item_stock, long> _mysql_ic_item_stock;
 
         /// <summary>
         /// 物料采购计划表
         /// </summary>
-        private readonly IMongoDB<ic_plan> _ic_plan;
+        private readonly IMongoDB<mo_ic_plan> _ic_plan;
         private IRepository<ic_plan, long> _mysql_ic_plan;
 
         /// <summary>
         /// 物料工厂明细表
         /// </summary>
-        private readonly IMongoDB<ic_factory_details> _ic_factory_details;
+        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<ic_item_pur> _ic_item_pur;
+        private readonly IMongoDB<mo_ic_item_pur> _ic_item_pur;
         private IRepository<ic_item_pur, long> _mysql_ic_item_pur;
 
         /// <summary>
         /// 采购申请单
         /// </summary>
-        private readonly IMongoDB<srm_pr_main> _srm_pr_main;
+        private readonly IMongoDB<mo_srm_pr_main> _srm_pr_main;
         private IRepository<srm_pr_main, long> _mysql_srm_pr_main;
 
         /// <summary>
         /// 采购订单表
         /// </summary>
-        private readonly IMongoDB<srm_po_main> _srm_po_main;
+        private readonly IMongoDB<mo_srm_po_main> _srm_po_main;
         private IRepository<srm_po_main, long> _mysql_srm_po_main;
 
         /// <summary>
         /// 采购订单明细表
         /// </summary>
-        private readonly IMongoDB<srm_po_list> _srm_po_list;
+        private readonly IMongoDB<mo_srm_po_list> _srm_po_list;
         private IRepository<srm_po_list, long> _mysql_srm_po_list;
 
         /// <summary>
         /// 采购订单占用详情
         /// </summary>
-        private readonly IMongoDB<srm_po_occupy> _srm_po_occupy;
+        private readonly IMongoDB<mo_srm_po_occupy> _srm_po_occupy;
         private IRepository<srm_po_occupy, long> _mysql_srm_po_occupy;
 
         /// <summary>
         /// 委外工单
         /// </summary>
-        private readonly IMongoDB<mes_oorder> _mes_oorder;
+        private readonly IMongoDB<mo_mes_oorder> _mes_oorder;
         private IRepository<mes_oorder, long> _mysql_mes_oorder;
 
         /// <summary>
         /// 物料质检表
         /// </summary>
-        private readonly IMongoDB<ic_check> _ic_check;
+        private readonly IMongoDB<mo_ic_check> _ic_check;
         /// <summary>
         /// 替代群组
         /// </summary>
-        private readonly IMongoDB<ic_substitute> _ic_substitute;
+        private readonly IMongoDB<mo_ic_substitute> _ic_substitute;
         /// <summary>
         /// 替代群组
         /// </summary>
-        private readonly IMongoDB<ic_substitute_all> _ic_substitute_all;
+        private readonly IMongoDB<mo_ic_substitute_all> _ic_substitute_all;
         /// <summary>
         /// 替代群组
         /// </summary>
-        private readonly IMongoDB<ic_substitute_all_dtl> _ic_substitute_all_dtl;
+        private readonly IMongoDB<mo_ic_substitute_all_dtl> _ic_substitute_all_dtl;
 
         /// <summary>
         /// 生产工单主表
         /// </summary>
-        private readonly IMongoDB<mes_morder> _mes_morder;
+        private readonly IMongoDB<mo_mes_morder> _mes_morder;
         /// <summary>
         /// 生产工单子表
         /// </summary>
-        private readonly IMongoDB<mes_moentry> _mes_moentry;
+        private readonly IMongoDB<mo_mes_moentry> _mes_moentry;
 
         /// <summary>
         /// 在制工单占用记录表
         /// </summary>
-        private readonly IMongoDB<mes_mooccupy> _mes_mooccupy;
+        private readonly IMongoDB<mo_mes_mooccupy> _mes_mooccupy;
         /// <summary>
         /// mysql在制工单占用表
         /// </summary>
@@ -224,26 +228,26 @@ namespace Business.ResourceExamineManagement
         /// <param name="icitem"></param>
         /// <param name="icbom"></param>
         public ResourceExamineAppService(
-            IMongoDB<ic_item> ic_item,
-            IMongoDB<ic_bom> ic_bom,
-            IMongoDB<ic_bom_child> ic_bom_child,
-            IMongoDB<ic_item_stock> ic_item_stock,
-            IMongoDB<ic_check> ic_check,
-            IMongoDB<ic_factory_details> ic_factory_details,
-            IMongoDB<mes_oorder> mes_oorder,
-            IMongoDB<srm_pr_main> srm_pr_main,
-            IMongoDB<srm_po_main> srm_po_main,
-            IMongoDB<srm_po_list> srm_po_list,
-            IMongoDB<srm_po_occupy> srm_po_occupy,
-            IMongoDB<ic_item_pur> ic_item_pur,
-            IMongoDB<ic_plan> ic_plan,
-            IMongoDB<ic_substitute> ic_substitute,
-            IMongoDB<ic_substitute_all> ic_substitute_all,
-            IMongoDB<ic_substitute_all_dtl> ic_substitute_all_dtl,
-            IMongoDB<mes_morder> mes_morder,
-            IMongoDB<mes_moentry> mes_moentry,
-            IMongoDB<mes_mooccupy> mes_mooccupy,
-            IMongoDB<ic_item_stockoccupy> ic_item_stockoccupy,
+            IMongoDB<mo_ic_item> ic_item,
+            IMongoDB<mo_ic_bom> ic_bom,
+            IMongoDB<mo_ic_bom_child> ic_bom_child,
+            IMongoDB<mo_ic_item_stock> ic_item_stock,
+            IMongoDB<mo_ic_check> ic_check,
+            IMongoDB<mo_ic_factory_details> ic_factory_details,
+            IMongoDB<mo_mes_oorder> mes_oorder,
+            IMongoDB<mo_srm_pr_main> srm_pr_main,
+            IMongoDB<mo_srm_po_main> srm_po_main,
+            IMongoDB<mo_srm_po_list> srm_po_list,
+            IMongoDB<mo_srm_po_occupy> srm_po_occupy,
+            IMongoDB<mo_ic_item_pur> ic_item_pur,
+            IMongoDB<mo_ic_plan> ic_plan,
+            IMongoDB<mo_ic_substitute> ic_substitute,
+            IMongoDB<mo_ic_substitute_all> ic_substitute_all,
+            IMongoDB<mo_ic_substitute_all_dtl> ic_substitute_all_dtl,
+            IMongoDB<mo_mes_morder> mes_morder,
+            IMongoDB<mo_mes_moentry> mes_moentry,
+            IMongoDB<mo_mes_mooccupy> mes_mooccupy,
+            IMongoDB<mo_ic_item_stockoccupy> ic_item_stockoccupy,
             IRepository<ic_item, long> mysql_ic_item,
             IRepository<ic_bom, long> mysql_ic_bom,
             IRepository<ic_bom_child, long> mysql_ic_bom_child,
@@ -469,29 +473,33 @@ namespace Business.ResourceExamineManagement
             {
                 //设置当前计算bangid
                 icitemStokc.ForEach(item => { item.bang_id = bangid; });
+                var moIcitemStokc = ObjectMapper.Map<List<ic_item_stock>, List<mo_ic_item_stock>>(icitemStokc);
                 //插入数据
-                await _ic_item_stock.InsertMany(icitemStokc);
+                await _ic_item_stock.InsertMany(moIcitemStokc);
             }
             //在制工单占用记录表
             var mes_mooccupy = _mysql_mes_mooccupy.GetListAsync(x => x.tenant_id == tenantId && 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 moMes_mooccupy = ObjectMapper.Map<List<mes_mooccupy>, List<mo_mes_mooccupy>>(mes_mooccupy);
+                await _mes_mooccupy.InsertMany(moMes_mooccupy);
             }
             //工单主表
             var mes_morder = _mysql_mes_morder.GetListAsync(x => x.tenant_id == tenantId && 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 moMes_morder = ObjectMapper.Map<List<mes_morder>, List<mo_mes_morder>>(mes_morder);
+                await _mes_morder.InsertMany(moMes_morder);
             }
             //工单子表
             var mes_moentry = _mysql_mes_moentry.GetListAsync(x => x.tenant_id == tenantId && x.factory_id == factoryId).Result;
             if (mes_moentry.Count > 0)
             {
                 mes_moentry.ForEach(item => { item.bang_id = bangid; });
-                await _mes_moentry.InsertMany(mes_moentry);
+                var moMes_moentry = ObjectMapper.Map<List<mes_moentry>, List<mo_mes_moentry>>(mes_moentry);
+                await _mes_moentry.InsertMany(moMes_moentry);
             }
 
             //TODO:要不要根据某些条件只同步有效的数据
@@ -500,7 +508,8 @@ namespace Business.ResourceExamineManagement
             if (srm_po_main.Count > 0)
             {
                 srm_po_main.ForEach(item => { item.bang_id = bangid; });
-                await _srm_po_main.InsertMany(srm_po_main);
+                var moSrm_po_main = ObjectMapper.Map<List<srm_po_main>, List<mo_srm_po_main>>(srm_po_main);
+                await _srm_po_main.InsertMany(moSrm_po_main);
             }
 
             //采购订单明细
@@ -508,7 +517,8 @@ namespace Business.ResourceExamineManagement
             if (srm_po_list.Count > 0)
             {
                 srm_po_list.ForEach(item => { item.bang_id = bangid; });
-                await _srm_po_list.InsertMany(srm_po_list);
+                var moSrm_po_list = ObjectMapper.Map<List<srm_po_list>, List<mo_srm_po_list>>(srm_po_list);
+                await _srm_po_list.InsertMany(moSrm_po_list);
             }
 
             //采购订单占用详情
@@ -516,7 +526,8 @@ namespace Business.ResourceExamineManagement
             if (srm_po_occupy.Count > 0)
             {
                 srm_po_occupy.ForEach(item => { item.bang_id = bangid; });
-                await _srm_po_occupy.InsertMany(srm_po_occupy);
+                var moSrm_po_occupy = ObjectMapper.Map<List<srm_po_occupy>, List<mo_srm_po_occupy>>(srm_po_occupy);
+                await _srm_po_occupy.InsertMany(moSrm_po_occupy);
             }
 
             //工厂物料明细表
@@ -524,7 +535,8 @@ namespace Business.ResourceExamineManagement
             if (ic_factory_details.Count > 0)
             {
                 ic_factory_details.ForEach(item => { item.bang_id = bangid; });
-                await _ic_factory_details.InsertMany(ic_factory_details);
+                var moIc_factory_details = ObjectMapper.Map<List<ic_factory_details>, List<mo_ic_factory_details>>(ic_factory_details);
+                await _ic_factory_details.InsertMany(moIc_factory_details);
             }
 
             //物料采购计划表
@@ -532,7 +544,8 @@ namespace Business.ResourceExamineManagement
             if (ic_plan.Count > 0)
             {
                 ic_plan.ForEach(item => { item.bang_id = bangid; });
-                await _ic_plan.InsertMany(ic_plan);
+                var moIc_plan = ObjectMapper.Map<List<ic_plan>, List<mo_ic_plan>>(ic_plan);
+                await _ic_plan.InsertMany(moIc_plan);
             }
 
             //物料采购报价单
@@ -540,7 +553,8 @@ namespace Business.ResourceExamineManagement
             if (ic_item_pur.Count > 0)
             {
                 ic_item_pur.ForEach(item => { item.bang_id = bangid; });
-                await _ic_item_pur.InsertMany(ic_item_pur);
+                var moIc_item_pur = ObjectMapper.Map<List<ic_item_pur>, List<mo_ic_item_pur>>(ic_item_pur);
+                await _ic_item_pur.InsertMany(moIc_item_pur);
             }
         }
 

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

@@ -46,6 +46,10 @@ using System.IO.Compression;
 using System.Collections;
 using System.Data.SqlTypes;
 using Bussiness.Model.SystemData;
+using Bussiness.MongoModel.MES.IC;
+using Bussiness.MongoModel.SystemData;
+using Bussiness.MongoModel.Tech;
+using Bussiness.Model.SIM;
 
 namespace Business.SyncDataManagement
 {
@@ -58,61 +62,61 @@ namespace Business.SyncDataManagement
         /// <summary>
         /// 物料bom
         /// </summary>
-        private readonly IMongoDB<ic_bom> _ic_bom;
+        private readonly IMongoDB<mo_ic_bom> _ic_bom;
         private IRepository<ic_bom, long> _mysql_ic_bom;
 
         /// <summary>
         /// 物料bom子表
         /// </summary>
-        private readonly IMongoDB<ic_bom_child> _ic_bom_child;
+        private readonly IMongoDB<mo_ic_bom_child> _ic_bom_child;
         private IRepository<ic_bom_child, long> _mysql_ic_bom_child;
 
         /// <summary>
         /// 物料
         /// </summary>
-        private readonly IMongoDB<ic_item> _ic_item;
+        private readonly IMongoDB<mo_ic_item> _ic_item;
         private IRepository<ic_item, long> _mysql_ic_item;
 
         /// <summary>
         /// 替代群组
         /// </summary>
-        private readonly IMongoDB<ic_substitute> _ic_substitute;
+        private readonly IMongoDB<mo_ic_substitute> _ic_substitute;
         private IRepository<ic_substitute, long> _mysql_ic_substitute;
 
         /// <summary>
         /// 物料替代多群组
         /// </summary>
-        private readonly IMongoDB<ic_substitute_all> _ic_substitute_all;
+        private readonly IMongoDB<mo_ic_substitute_all> _ic_substitute_all;
         private IRepository<ic_substitute_all, long> _mysql_ic_substitute_all;
 
         /// <summary>
         /// 物料替代多群组明细
         /// </summary>
-        private readonly IMongoDB<ic_substitute_all_dtl> _ic_substitute_all_dtl;
+        private readonly IMongoDB<mo_ic_substitute_all_dtl> _ic_substitute_all_dtl;
         private IRepository<ic_substitute_all_dtl, long> _mysql_ic_substitute_all_dtl;
 
         /// <summary>
         /// 供应商
         /// </summary>
-        private readonly IMongoDB<srm_supplier> _srm_supplier;
+        private readonly IMongoDB<mo_srm_supplier> _srm_supplier;
         private IRepository<srm_supplier, long> _mysql_srm_supplier;
 
         /// <summary>
         /// 工艺路径
         /// </summary>
-        private readonly IMongoDB<mes_technique> _mes_technique;
+        private readonly IMongoDB<mo_mes_technique> _mes_technique;
         private IRepository<mes_technique, long> _mysql_mes_technique;
 
         /// <summary>
         /// 工序
         /// </summary>
-        private readonly IMongoDB<mes_process> _mes_process;
+        private readonly IMongoDB<mo_mes_process> _mes_process;
         private IRepository<mes_process, long> _mysql_mes_process;
 
         /// <summary>
         /// 工艺路径关联工序
         /// </summary>
-        private readonly IMongoDB<mes_tech_process> _mes_tech_process;
+        private readonly IMongoDB<mo_mes_tech_process> _mes_tech_process;
         private IRepository<mes_tech_process, long> _mysql_mes_tech_process;
         #endregion
 
@@ -120,16 +124,16 @@ namespace Business.SyncDataManagement
         /// 构造函数
         /// </summary>
         public SyncMySQLDataAppService(
-            IMongoDB<ic_bom> ic_bom,
-            IMongoDB<ic_bom_child> ic_bom_child,
-            IMongoDB<ic_item> ic_item,
-            IMongoDB<ic_substitute> ic_substitute,
-            IMongoDB<ic_substitute_all> ic_substitute_all,
-            IMongoDB<ic_substitute_all_dtl> ic_substitute_all_dtl,
-            IMongoDB<srm_supplier> srm_supplier,
-            IMongoDB<mes_technique> mes_technique,
-            IMongoDB<mes_process> mes_process,
-            IMongoDB<mes_tech_process> mes_tech_process,
+            IMongoDB<mo_ic_bom> ic_bom,
+            IMongoDB<mo_ic_bom_child> ic_bom_child,
+            IMongoDB<mo_ic_item> ic_item,
+            IMongoDB<mo_ic_substitute> ic_substitute,
+            IMongoDB<mo_ic_substitute_all> ic_substitute_all,
+            IMongoDB<mo_ic_substitute_all_dtl> ic_substitute_all_dtl,
+            IMongoDB<mo_srm_supplier> srm_supplier,
+            IMongoDB<mo_mes_technique> mes_technique,
+            IMongoDB<mo_mes_process> mes_process,
+            IMongoDB<mo_mes_tech_process> mes_tech_process,
             IRepository<ic_bom, long> mysql_ic_bom,
             IRepository<ic_bom_child, long> mysql_ic_bom_child,
             IRepository<ic_item, long> mysql_ic_item,
@@ -176,9 +180,10 @@ namespace Business.SyncDataManagement
             if (icBoms.Count > 0)
             {
                 //先清空表数据
-                await _ic_bom.DeleteAll();
+                await _ic_bom.Delete(p=>p.mongo_id != -1);
+                var moIcBoms = ObjectMapper.Map<List<ic_bom>, List<mo_ic_bom>>(icBoms);
                 //插入数据
-                await _ic_bom.InsertMany(icBoms);
+                await _ic_bom.InsertMany(moIcBoms);
             }
 
             //同步物料BOM明细数据
@@ -186,9 +191,10 @@ namespace Business.SyncDataManagement
             if (icbom_childs.Count > 0)
             {
                 //先清空表数据
-                await _ic_bom_child.DeleteAll();
+                await _ic_bom_child.Delete(p => p.mongo_id != -1);
+                var moIcbom_childs = ObjectMapper.Map<List<ic_bom_child>, List<mo_ic_bom_child>>(icbom_childs);
                 //插入数据
-                await _ic_bom_child.InsertMany(icbom_childs);
+                await _ic_bom_child.InsertMany(moIcbom_childs);
             }
 
             //同步物料数据
@@ -196,9 +202,10 @@ namespace Business.SyncDataManagement
             if (icItems.Count > 0)
             {
                 //先清空表数据
-                await _ic_item.DeleteAll();
+                await _ic_item.Delete(p => p.mongo_id != -1);
+                var moIcItems = ObjectMapper.Map<List<ic_item>, List<mo_ic_item>>(icItems);
                 //插入数据
-                await _ic_item.InsertMany(icItems);
+                await _ic_item.InsertMany(moIcItems);
             }
 
             //同步替代群组数据
@@ -206,9 +213,10 @@ namespace Business.SyncDataManagement
             if (subtitutes.Count > 0)
             {
                 //先清空表数据
-                await _ic_substitute.DeleteAll();
+                await _ic_substitute.Delete(p => p.mongo_id != -1);
+                var moSubtitutes = ObjectMapper.Map<List<ic_substitute>, List<mo_ic_substitute>>(subtitutes);
                 //插入数据
-                await _ic_substitute.InsertMany(subtitutes);
+                await _ic_substitute.InsertMany(moSubtitutes);
             }
 
             //同步物料替代多群组数据
@@ -216,9 +224,10 @@ namespace Business.SyncDataManagement
             if (subAlls.Count > 0)
             {
                 //先清空表数据
-                await _ic_substitute_all.DeleteAll();
+                await _ic_substitute_all.Delete(p => p.mongo_id != -1);
+                var moSubAlls = ObjectMapper.Map<List<ic_substitute_all>, List<mo_ic_substitute_all>>(subAlls);
                 //插入数据
-                await _ic_substitute_all.InsertMany(subAlls);
+                await _ic_substitute_all.InsertMany(moSubAlls);
             }
 
             //同步物料替代多群组明细数据
@@ -226,9 +235,10 @@ namespace Business.SyncDataManagement
             if (subAllDtls.Count > 0)
             {
                 //先清空表数据
-                await _ic_substitute_all_dtl.DeleteAll();
+                await _ic_substitute_all_dtl.Delete(p => p.mongo_id != -1);
+                var moSubAllDtls = ObjectMapper.Map<List<ic_substitute_all_dtl>, List<mo_ic_substitute_all_dtl>>(subAllDtls);
                 //插入数据
-                await _ic_substitute_all_dtl.InsertMany(subAllDtls);
+                await _ic_substitute_all_dtl.InsertMany(moSubAllDtls);
             }
 
             //同步供应商数据
@@ -236,9 +246,10 @@ namespace Business.SyncDataManagement
             if (suppliers.Count > 0)
             {
                 //先清空表数据
-                await _srm_supplier.DeleteAll();
+                await _srm_supplier.Delete(p => p.mongo_id != -1);
+                var moSuppliers = ObjectMapper.Map<List<srm_supplier>, List<mo_srm_supplier>>(suppliers);
                 //插入数据
-                await _srm_supplier.InsertMany(suppliers);
+                await _srm_supplier.InsertMany(moSuppliers);
             }
 
             //同步工艺路径数据
@@ -246,9 +257,10 @@ namespace Business.SyncDataManagement
             if (techs.Count > 0)
             {
                 //先清空表数据
-                await _mes_technique.DeleteAll();
+                await _mes_technique.Delete(p => p.mongo_id != -1);
+                var moTechs = ObjectMapper.Map<List<mes_technique>, List<mo_mes_technique>>(techs);
                 //插入数据
-                await _mes_technique.InsertMany(techs);
+                await _mes_technique.InsertMany(moTechs);
             }
 
             //同步工序数据
@@ -256,9 +268,10 @@ namespace Business.SyncDataManagement
             if (suppliers.Count > 0)
             {
                 //先清空表数据
-                await _mes_process.DeleteAll();
+                await _mes_process.Delete(p => p.mongo_id != -1);
+                var moProcesses = ObjectMapper.Map<List<mes_process>, List<mo_mes_process>>(processes);
                 //插入数据
-                await _mes_process.InsertMany(processes);
+                await _mes_process.InsertMany(moProcesses);
             }
 
             //同步工艺关联工序数据
@@ -266,9 +279,10 @@ namespace Business.SyncDataManagement
             if (tech_procs.Count > 0)
             {
                 //先清空表数据
-                await _mes_tech_process.DeleteAll();
+                await _mes_tech_process.Delete(p => p.mongo_id != -1);
+                var moTech_procs = ObjectMapper.Map<List<mes_tech_process>, List<mo_mes_tech_process>>(tech_procs);
                 //插入数据
-                await _mes_tech_process.InsertMany(tech_procs);
+                await _mes_tech_process.InsertMany(moTech_procs);
             }
         }
     }

MicroServices/Business/Business.Core/MongoDBHelper/IMongoDB.cs

@@ -15,7 +15,7 @@ namespace Business.Core.MongoDBHelper
     /// MongoDB接口
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    public interface IMongoDB<T> where T : Entity<long>
+    public interface IMongoDB<T>
     {
         /// <summary>
         /// 插入一条数据
@@ -31,27 +31,12 @@ namespace Business.Core.MongoDBHelper
         /// <returns></returns>
         Task InsertMany(List<T> documents);
 
-        /// <summary>
-        /// 更新一条数据
-        /// </summary>
-        /// <param name="documents"></param>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        Task<ReplaceOneResult> UpdateOne(T documents,long id);
-
         /// <summary>
         /// 获取所有数据
         /// </summary>
         /// <returns></returns>
         Task<List<T>> GetAll();
 
-        /// <summary>
-        /// 根据ID获取数据
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        Task<T> GetOneByID(long id);
-
         /// <summary>
         /// 根据条件获取数据
         /// </summary>
@@ -64,18 +49,6 @@ namespace Business.Core.MongoDBHelper
         /// <returns></returns>
         Task<List<T>> GetManyByIds(FilterDefinition<T> filter);
 
-        /// <summary>
-        /// 根据id删除对象
-        /// </summary>
-        /// <param name="id"></param>
-        Task DeleteById(long id);
-
-        /// <summary>
-        /// 根据id列表批量删除对象
-        /// </summary>
-        /// <param name="ids">id列表</param>
-        Task DeleteByIds(IEnumerable<long> ids);
-
         /// <summary>
         /// 删除数据
         /// </summary>
@@ -92,12 +65,6 @@ namespace Business.Core.MongoDBHelper
         /// <returns></returns>
         Task<DeleteResult> Delete(FilterDefinition<T> filter, bool isOne = false);
 
-        /// <summary>
-        /// 删除集合数据
-        /// </summary>
-        /// <returns></returns>
-        Task DeleteAll();
-
         /// <summary>
         /// 根据条件获取结果列表
         /// </summary>

MicroServices/Business/Business.Core/MongoDBHelper/MongoDBTools.cs

@@ -21,7 +21,7 @@ namespace Business.Core.MongoDBHelper
     /// <summary>
     /// MongoDB帮助类
     /// </summary>
-    public class MongoDBTools<T> : IMongoDB<T> where T : Entity<long>
+    public class MongoDBTools<T> : IMongoDB<T> 
     {
         public readonly IMongoCollection<T> mongoCollection;
         public readonly IMongoDatabase dataBase;
@@ -71,17 +71,6 @@ namespace Business.Core.MongoDBHelper
            return mongoCollection.InsertManyAsync(documents,new InsertManyOptions() { IsOrdered = false});
         }
 
-        /// <summary>
-        /// 更新一条数据
-        /// </summary>
-        /// <param name="documents"></param>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public Task<ReplaceOneResult> UpdateOne(T documents,long id)
-        {
-            return mongoCollection.ReplaceOneAsync(Builders<T>.Filter.Eq(p=>p.Id, id), documents);
-        }
-
         /// <summary>
         /// 获取所有数据
         /// </summary>
@@ -92,17 +81,6 @@ namespace Business.Core.MongoDBHelper
             return mongoCollection.AsQueryable<T>().ToListAsync();
         }
 
-        /// <summary>
-        /// 跟据Id获取数据
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        /// <exception cref="NotImplementedException"></exception>
-        public Task<T> GetOneByID(long id)
-        {
-            return mongoCollection.Find(p => p.Id == id).FirstOrDefaultAsync();
-        }
-
         /// <summary>
         /// 根据条件获取数据
         /// </summary>
@@ -121,24 +99,6 @@ namespace Business.Core.MongoDBHelper
             return mongoCollection.Find(filter).ToListAsync();
         }
 
-        /// <summary>
-        /// 根据id删除对象
-        /// </summary>
-        /// <param name="id"></param>
-        public Task DeleteById(long id)
-        {
-            return mongoCollection.DeleteManyAsync(s => id==s.Id);
-        }
-
-        /// <summary>
-        /// 根据id列表批量删除对象
-        /// </summary>
-        /// <param name="ids">id列表</param>
-        public Task DeleteByIds(IEnumerable<long> ids)
-        {
-            return mongoCollection.DeleteManyAsync(s => ids.Contains(s.Id));
-        }
-
         /// <summary>
         /// 删除数据
         /// </summary>
@@ -253,14 +213,5 @@ namespace Business.Core.MongoDBHelper
                 return builder.Combine(sorts);
             }
         }
-
-        /// <summary>
-        /// 删除集合全部数据
-        /// </summary>
-        /// <returns></returns>
-        public Task DeleteAll()
-        {
-            return mongoCollection.DeleteManyAsync(p=>p.Id != -1);
-        }
     }
 }

MicroServices/Business/Bussiness.MongoModel/Base/MoBaseEntity.cs

@@ -10,11 +10,19 @@ using System.ComponentModel;
 using Volo.Abp.Domain.Entities.Auditing;
 using Volo.Abp.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
+using MongoDB.Bson.Serialization.Attributes;
 
 namespace Bussiness.MongoModel
 {
     public abstract class MoBaseEntity 
     {
+        /// <summary>
+        /// mongodb表id
+        /// </summary>
+        [Comment("mongodb表id")]
+        [BsonId]
+        public virtual long? mongo_id { get; set; }
+
         /// <summary>
         /// mysql表id
         /// </summary>
@@ -78,5 +86,12 @@ namespace Bussiness.MongoModel
         [Comment("组织ID")]
         public virtual long? org_id { get; set; }
 
+        /// <summary>
+        /// 删除标识
+        /// </summary>
+        [DefaultValue(false)]
+        [Comment("删除标识")]
+        public bool IsDeleted { get; set; }
+
     }
 }