解决冲突

MicroServices/Business/Business.Application/BusinessApplicationAutoMapperProfile.cs

@@ -1,8 +1,12 @@
 using AutoMapper;
 using Business.ResourceExamineManagement.Dto;
 using Bussiness.Model.MES.IC;
+using Bussiness.Model.Production;
+using Bussiness.Model.ProductionProcess;
 using Bussiness.MongoModel.MES.IC;
 using Bussiness.Model.Tech;
+using Bussiness.MongoModel.Production;
+using Bussiness.MongoModel.ProductionProcess;
 using Bussiness.MongoModel.Tech;
 using Bussiness.Model.Sale;
 using Bussiness.Model.SIM;
@@ -142,6 +146,7 @@ namespace Business
               .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
             #endregion
 
+
             #region SystemData
             CreateMap<crm_customer, mo_crm_customer>()
                 .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
@@ -150,9 +155,9 @@ namespace Business
             CreateMap<sys_code, mo_sys_code>()
                 .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
             CreateMap<sys_code_pre, mo_sys_code_pre>()
-               .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+                .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
             CreateMap<sys_config, mo_sys_config>()
-              .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+                .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
             CreateMap<sys_measure_unit, mo_sys_measure_unit>()
                 .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
             CreateMap<sys_post, mo_sys_post>()
@@ -160,9 +165,9 @@ namespace Business
             CreateMap<sys_post_staff, mo_sys_post_staff>()
                 .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
             CreateMap<sys_schedule, mo_sys_schedule>()
-               .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+                .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
             CreateMap<sys_shift, mo_sys_shift>()
-              .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+                .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
             CreateMap<sys_shift_invalid_time, mo_sys_shift_invalid_time>()
                 .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
             CreateMap<sys_shift_schedule, mo_sys_shift_schedule>()
@@ -170,6 +175,65 @@ namespace Business
             CreateMap<sys_staff, mo_sys_staff>()
                 .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
             CreateMap<sys_upload, mo_sys_upload>()
+                .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+            #endregion
+
+            #region 生产模块
+            CreateMap<mes_moentry, mo_mes_moentry>()
+               .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+
+            CreateMap<mes_mooccupy, mo_mes_mooccupy>()
+               .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+
+            CreateMap<mes_morder, mo_mes_morder>()
+               .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+
+            CreateMap<mes_morder_loss_time, mo_mes_morder_loss_time>()
+               .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+
+            CreateMap<mes_oorder, mo_mes_oorder>()
+               .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+
+            CreateMap<mes_schedule_occupy, mo_mes_schedule_occupy>()
+               .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+
+            CreateMap<mes_stockoccupy, mo_mes_stockoccupy>()
+               .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+
+            CreateMap<mes_loss_time_record, mo_mes_loss_time_record>()
+               .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+
+            CreateMap<mes_meaction, mo_mes_meaction>()
+               .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+
+            CreateMap<mes_mebycard, mo_mes_mebycard>()
+               .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+
+            CreateMap<mes_merecheck, mo_mes_merecheck>()
+               .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+
+            CreateMap<mes_mereport, mo_mes_mereport>()
+               .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+
+            CreateMap<mes_prd_sendmat, mo_mes_prd_sendmat>()
+               .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+
+            CreateMap<mes_prd_sendmat_list, mo_mes_prd_sendmat_list>()
+               .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+
+            CreateMap<mes_prdlog, mo_mes_prdlog>()
+               .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+
+            CreateMap<mes_product_work_time, mo_mes_product_work_time>()
+               .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+
+            CreateMap<mes_stock_enter, mo_mes_stock_enter>()
+               .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+
+            CreateMap<mes_stock_out, mo_mes_stock_out>()
+               .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
+
+            CreateMap<mes_swipe_card, mo_mes_swipe_card>()
                .ForMember(d => d.mysql_id, map => map.MapFrom(o => o.Id));
             #endregion
         }