在制工单检查

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

@@ -173,13 +173,16 @@ namespace Business.ResourceExamineManagement
                 //TODO：入参异常；
                 //throw new NotImplementedException();
             }
-            var morderList = _mes_morder.GetAll().Result;
-            var morderTypeList = morderList.Where(x => x.work_order_type == "备库工单" && x.morder_type == "计划工单" && x.bom_number == bomNumber && (x.morder_state == "初始" || x.morder_state == "下达")).ToList();
+            #region 注释
+            /* var morderList = _mes_morder.GetAll().Result;
+            //查询生产工单类型为计划工单并且工单类型为备库工单 并且BOM编码一致数据，订单状态为 初始或下达工单
+            var morderTypeList = morderList.Where(x => x.work_order_type == "备库工单" && x.morder_type == "计划工单" &&
+            x.bom_number == bomNumber && (x.morder_state == "初始" || x.morder_state == "下达")).ToList();
 
-            //查询生产工单类型为计划工单并且工单类型为备库工单 并且BOM编码一致数据
-            // 订单状态为 初始或下达工单
-            var SatisfyQuantityList = morderTypeList.Where(x => x.morder_production_number >= Quantity).
-                ToList().OrderBy(x => x.moentry_sys_etime).FirstOrDefault();
+            //计划数量-需求数量=剩余可用数量 -->使用计划结束时间排序取第一条满足条件工单
+            // List =>数量满足Quantity && 生成工单结束日期最早
+            var SatisfyQuantityList = morderTypeList.Where(x => (x.morder_production_number.Value - x.need_number.Value) >= Quantity).
+                ToList().OrderBy(x => x.moentry_etime).FirstOrDefault();
             if (SatisfyQuantityList == null)
             {
 
@@ -187,8 +190,8 @@ namespace Business.ResourceExamineManagement
             else
             {
 
-            }
-            // List =>数量满足Quantity && 生成工单结束日期最早
+            }*/
+            #endregion
         }
 
         public void BomPretreatment(long? orderid, long? BomId, int Quantity)
@@ -196,7 +199,7 @@ namespace Business.ResourceExamineManagement
             if (orderid == null)
             {
                 //throw new bu
-            }
+            } 
             if (BomId == null)
             {
                 //throw new bu