Merge branch 'master' of http://123.60.180.165:4647/ZZYDOP/DOPCore

MicroServices/Business/Business.Application/ResourceExamineManagement/MorderAppService.cs

@@ -183,7 +183,7 @@ namespace Business.ResourceExamineManagement
         /// <param name="DeliverDate">交付日期</param>
         /// <param name="seorderentry_id">销售订单子表ID</param>
         /// <returns></returns>
-        public async Task<List<mes_mooccupy>> CheckMorder(string bomNumber, decimal? Quantity, DateTime DeliverDate, crm_seorderentry seorderentry, ic_item ic_Item)
+        public async Task<List<mes_mooccupy>> CheckMorder(string bomNumber, decimal? Quantity, DateTime DeliverDate, crm_seorderentry seorderentry, ic_item ic_Item,bool flag = true)
         {
             if (string.IsNullOrEmpty(bomNumber) || Quantity == null)
             {
@@ -282,7 +282,10 @@ namespace Business.ResourceExamineManagement
                 }
 
             }
-            await _mes_mooccupy.InsertMany(mes_Mooccupies);
+            if (flag)
+            {
+                await _mes_mooccupy.InsertMany(mes_Mooccupies);
+            }
             #region 注释
             //  if (morderDataList.Count > 0)
             //  {
@@ -369,7 +372,7 @@ namespace Business.ResourceExamineManagement
             //  }
             #endregion
             //TODO：返回占用数据，外层每个BOM根据占用工单数据判断是否满足。
-            return mes_Mooccupies;
+            return mes_Mooccupies.OrderByDescending(s=>s.moo_etime).ToList();
         }
         /// <summary>
         /// 拼接工单占用表

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

@@ -1337,7 +1337,7 @@ namespace Business.ResourceExamineManagement
                         //得到库存最小数量，去占用，然后剩余的丢第二个循环里去占用。
                         //获取物料详情
                         var ic_item = icitemlist.Find(s => s.Id == hy.item_id);
-                        var mooccupylist = _morderAppService.CheckMorder(hy.bom_number, hy.lack_qty, plan_date.GetValueOrDefault(), sentrys, ic_item).Result;
+                        var mooccupylist = _morderAppService.CheckMorder(hy.bom_number, hy.lack_qty, plan_date.GetValueOrDefault(), sentrys, ic_item, false).Result;
                         decimal moo_qty = mooccupylist.Sum(s => s.moo_qty.GetValueOrDefault());
                         decimal make = (hy.sqty + moo_qty) / hy.qty;
                         if (Math.Floor(hy.qty) == hy.qty)