Browse Source

调整 在制工单逻辑

zhengly 3 years ago
parent
commit
5f1464d16f

+ 5 - 6
MicroServices/Business/Business.Application/ResourceExamineManagement/MorderAppService.cs

@@ -183,14 +183,13 @@ 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,bool flag = true)
+        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)
+            if (string.IsNullOrEmpty(bomNumber))
             {
                 //TODO:入参异常;
-                throw new NotImplementedException("BOM编码或需求数量不能为空!");
+                return null;
             }
-            var Number = 3; //1,满足,2数量满足,时间不满足,3不满足
             //获取销售订单信息
             //var seorder = await _crm_seorder.FindAsync(x => x.Id == OrderId);
             //var seorderentry = await _mysql_crm_seorderentry.FindAsync(x => x.Id == seorderentry_id);
@@ -291,7 +290,7 @@ namespace Business.ResourceExamineManagement
                 }
 
             }
-            if (flag)
+            if (flag && mes_Mooccupies.Count > 0)
             {
                 await _mes_mooccupy.InsertMany(mes_Mooccupies);
             }
@@ -381,7 +380,7 @@ namespace Business.ResourceExamineManagement
             //  }
             #endregion
             //TODO:返回占用数据,外层每个BOM根据占用工单数据判断是否满足。
-            return mes_Mooccupies.OrderByDescending(s=>s.moo_etime).ToList();
+            return mes_Mooccupies.OrderByDescending(s => s.moo_etime).ToList();
         }
         /// <summary>
         /// 拼接工单占用表