代码提交

MicroServices/Business/Business.Application/ResourceExamineManagement/CalcBomViewAppService.cs

@@ -37,6 +37,9 @@ namespace Business.ResourceExamineManagement
         public List<mo_mes_moentry> moentriesList = new List<mo_mes_moentry>();
         public List<mo_mes_mooccupy> mooccupyAllList = new List<mo_mes_mooccupy>();
 
+        public List<mo_srm_po_list> srm_Po_Lists = new List<mo_srm_po_list>();
+        public List<mo_srm_po_occupy> srm_Po_Occupies = new List<mo_srm_po_occupy>();
+
         /// <summary>
         /// 工艺路径
         /// </summary>

MicroServices/Business/Business.Application/ResourceExamineManagement/PurchaseOrderAppService.cs

@@ -66,7 +66,7 @@ namespace Business.ResourceExamineManagement
         /// <summary>
         /// 检查在途订单
         /// </summary>
-        public  List<mo_srm_po_occupy> CheckPurchaseOrder(crm_seorderentry seorderentry, long icitem_id, decimal Quantity, DateTime DeliverDate, ic_plan ic_Plan, long bang_id)
+        public List<mo_srm_po_occupy> CheckPurchaseOrder(crm_seorderentry seorderentry, long icitem_id, decimal Quantity, DateTime DeliverDate, ic_plan ic_Plan, long bang_id)
         {
             if (seorderentry == null)
             {
@@ -75,9 +75,9 @@ namespace Business.ResourceExamineManagement
             List<mo_srm_po_occupy> occupyList = new List<mo_srm_po_occupy>();
 
             //查询出对应物料采购订单明细  --数据未被停用 && 评审通过后
-            var poDetailList =  _mo_srm_po_list.GetManyByCondition(x => x.icitem_id == icitem_id && x.state == 1 && x.rstate == 1).Result;
+            var poDetailList = _mo_srm_po_list.GetManyByCondition(x => x.icitem_id == icitem_id && x.state == 1 && x.rstate == 1).Result;
             //采购订单占用数据
-            var poOccupys =  _mo_srm_po_occupy.GetManyByCondition(x => poDetailList.Select(p => p.id).ToList().Contains(x.polist_id.GetValueOrDefault())).Result;
+            var poOccupys = _mo_srm_po_occupy.GetManyByCondition(x => poDetailList.Select(p => p.id).ToList().Contains(x.polist_id.GetValueOrDefault())).Result;
             //先查询出满足日期，并且数量可满足占用的数据
             var poDetails = poDetailList.Where(x => x.rarrdate.GetValueOrDefault().AddDays(-(int)ic_Plan.self_inspection_date.GetValueOrDefault()) < DeliverDate && x.qty - x.rqty - x.esqty -
                 poOccupys.Where(p => p.polist_id.GetValueOrDefault() == x.mysql_id)?.Sum(m => m.qty) > Quantity).OrderByDescending(x => x.rarrdate).ToList();

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

@@ -402,6 +402,10 @@ namespace Business.ResourceExamineManagement
             List<mo_mes_mooccupy> mes_mooccupyList = await _mes_mooccupy.GetManyByCondition(x => x.moo_state == 1 && !x.IsDeleted && x.tenant_id == param.tenantId
           && boms.Select(p => p.item_number).Contains(x.fitem_number) && x.bang_id == bangid);
 
+            //物料采购订单明细
+            var poDetailList = await _srm_po_list.GetManyByCondition(x => boms.Select(p => p.icitem_id).ToList().Contains(x.icitem_id.Value) && x.state == 1 && x.rstate == 1 && !x.IsDeleted);
+            //采购订单占用数据
+            var poOccupys = await _srm_po_occupy.GetManyByCondition(x => poDetailList.Select(p => p.id).ToList().Contains(x.polist_id.GetValueOrDefault()) && !x.IsDeleted);
             #endregion
 
             //物料占用记录
@@ -433,6 +437,9 @@ namespace Business.ResourceExamineManagement
             _CalcBomViewAppService.mordersList = mo_Mes_Morders;//工单
             _CalcBomViewAppService.mooccupyAllList = mes_mooccupyList;//工单占用表
 
+            _CalcBomViewAppService.srm_Po_Lists = poDetailList;
+            _CalcBomViewAppService.srm_Po_Occupies = poOccupys;
+
             foreach (var item in sentrys)
             {
                 //工单资源检查信息