取数逻辑修改，MongoDB实体替换

MicroServices/Business/Business.Application.Contracts/Business.Application.Contracts.csproj

@@ -39,6 +39,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Bussiness.Model\Bussiness.Model.csproj" />
+    <ProjectReference Include="..\Bussiness.MongoModel\Bussiness.MongoModel.csproj" />
   </ItemGroup>
 
 </Project>

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

@@ -1,4 +1,5 @@
 using Bussiness.Model.SRM;
+using Bussiness.MongoModel.SRM;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -12,6 +13,6 @@ namespace Business.ResourceExamineManagement.Dto
     {
         public DateTime lastStartTmie { get; set; }
 
-        public srm_pr_main srm_Pr_Main { get; set; }
+        public mo_srm_pr_main srm_Pr_Main { get; set; }
     }
 }

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

@@ -636,20 +636,20 @@ namespace Business.ResourceExamineManagement
         /// <returns></returns>
         private List<ICItemLeadTimeDto> GetLeadTime(List<long> icItemIds, long tenantId, long factoryid)
         {
-            ProjectionDefinitionBuilder<ic_factory_details> project = new ProjectionDefinitionBuilder<ic_factory_details>();
+            ProjectionDefinitionBuilder<mo_ic_factory_details> project = new ProjectionDefinitionBuilder<mo_ic_factory_details>();
             return _ic_factory_details.Find(p => icItemIds.Contains(p.icitem_id) && p.factory_id == factoryid && p.tenant_id == tenantId && !p.IsDeleted,
                 project.Include(p => p.icitem_id).Include(p => p.production_leadtime).Include(p => p.stock_leadtime).Include(p => p.transportation_leadtime).Include(p => p.order_leadtime)).Result.
                 Select(x => new ICItemLeadTimeDto { item_id = x.icitem_id, transportation_leadtime = x.transportation_leadtime, stock_leadtime = x.stock_leadtime, production_leadtime = x.production_leadtime, order_leadtime = x.order_leadtime }).AsQueryable<ICItemLeadTimeDto>().ToList();
         }
 
         //根据物料id获取物料供应商
-        private List<ic_item_pur> GetSupplier(List<long> icItemIds, long tenantId, long factoryid)
+        private List<mo_ic_item_pur> GetSupplier(List<long> icItemIds, long tenantId, long factoryid)
         {
             return _ic_item_pur.Find(p => icItemIds.Contains(p.icitem_id) && p.tenant_id == tenantId && p.factory_id == factoryid && !p.IsDeleted).Result;
         }
 
         //根据物料id获取物料采购计划表
-        private List<ic_plan> GetICPlan(List<long> icItemIds, long tenantId, long factoryid)
+        private List<mo_ic_plan> GetICPlan(List<long> icItemIds, long tenantId, long factoryid)
         {
             return _ic_plan.Find(p => icItemIds.Contains(p.icitem_id) && p.tenant_id == tenantId && p.factory_id == factoryid && !p.IsDeleted).Result;
         }
@@ -701,8 +701,8 @@ namespace Business.ResourceExamineManagement
                             {
                                 //在途满足，写占用表
                                 itemlist.Add(new ICItemDateDto { item_id = itemPO[i].icitem_id.Value, dateTime = itemPO[i].rarrdate });
-                                srm_po_occupy po_Occupy = new srm_po_occupy();
-                                po_Occupy.GenerateNewId();
+                                mo_srm_po_occupy po_Occupy = new mo_srm_po_occupy();
+                                //po_Occupy.GenerateNewId();
                                 po_Occupy.polist_id = itemPO[i].po_id;//采购订单id
                                 po_Occupy.polist_row = itemPO[i].polist_row;//采购订单行号
                                 po_Occupy.eid = 111;//客户订单行id
@@ -724,8 +724,8 @@ namespace Business.ResourceExamineManagement
                             {
                                 //不满足逐步扣减
                                 itemPOQty = itemPOQty + itemPO[i].qty - itemPO[i].esqty;
-                                srm_po_occupy po_Occupy = new srm_po_occupy();
-                                po_Occupy.GenerateNewId();
+                                mo_srm_po_occupy po_Occupy = new mo_srm_po_occupy();
+                                //po_Occupy.GenerateNewId();
                                 po_Occupy.polist_id = itemPO[i].po_id;//采购订单id
                                 po_Occupy.polist_row = itemPO[i].polist_row;//采购订单行号
                                 po_Occupy.eid = 111;//客户订单行id
@@ -806,10 +806,10 @@ namespace Business.ResourceExamineManagement
         /// </summary>
         /// <param name="returnlist"></param>
         /// <param name="factoryid"></param>
-        private mes_oorder CreateMesOOder(BomChildExamineDto returnlist, long tenantId, long factoryid, long bangId, List<ICItemLeadTimeDto> iCItemLeadTimes, List<ic_item_pur> supplierList, DateTime deliveryDate)
+        private mo_mes_oorder CreateMesOOder(BomChildExamineDto returnlist, long tenantId, long factoryid, long bangId, List<ICItemLeadTimeDto> iCItemLeadTimes, List<ic_item_pur> supplierList, DateTime deliveryDate)
         {
-            mes_oorder oOrder = new mes_oorder();
-            oOrder.GenerateNewId();
+            mo_mes_oorder oOrder = new mo_mes_oorder();
+            //oOrder.GenerateNewId();
             oOrder.oorder_no = getOrderNum("WW");//生产工单编号
             oOrder.oorder_type = "委外工单";//生产工单类型
             oOrder.oorder_date = DateTime.Now;//委外订单日期
@@ -917,7 +917,7 @@ namespace Business.ResourceExamineManagement
         private SRMPRDto CreateSRMPR(BomChildExamineDto returnlist, long tenantId, long factoryid, long bangId, int orderType, List<ICItemLeadTimeDto> iCItemLeadTimes, List<ic_item_pur> supplierList, List<ic_plan> planList, DateTime deliveryDate)
         {
             SRMPRDto sRMPR = new SRMPRDto();
-            srm_pr_main srm_Pr = new srm_pr_main();
+            mo_srm_pr_main srm_Pr = new mo_srm_pr_main();
             var leadTime = iCItemLeadTimes.Find(x => x.item_id == returnlist.item_id);
             var supplier = supplierList.Find(x => x.icitem_id == returnlist.item_id);//默认取第一个供应商
             var plan = planList.Find(x => x.icitem_id == returnlist.item_id);
@@ -929,7 +929,7 @@ namespace Business.ResourceExamineManagement
                 //throw new NotImplementedException("未找到物料ic_factory_details或ic_item_pur或ic_plan信息！");
             }
             
-            srm_Pr.GenerateNewId();
+            //srm_Pr.GenerateNewId();
             srm_Pr.pr_billno = getOrderNum("PR");//pr单号
             srm_Pr.pr_mono = "";//关联工单号
             srm_Pr.entity_id = 1;//工单行号