Sfoglia il codice sorgente

发布周计划改为勾选

Murphy 2 anni fa
parent
commit
424b11979c

+ 3 - 17
MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs

@@ -2208,10 +2208,10 @@ namespace Business.Replenishment
         {
             if (string.IsNullOrEmpty(ids))
             {
-                throw new NotImplementedException("请输入正确的订单号!");
+                throw new NotImplementedException("请选择正确的生产指令!");
             }
-            List<long> workNoList = AnalysisIdList(ids);
-            var weekPlan = _replenishmentWeekPlan.GetListAsync(a => workNoList.Contains(a.Id) && a.IsReplenishmentModel=="N").Result.OrderBy(a=>a.Priority).ToList();
+            List<string> workNoList = ids.Split(',').ToList();
+            var weekPlan = _replenishmentWeekPlan.GetListAsync(a => workNoList.Contains(a.ProductionOrder) && a.IsReplenishmentModel=="N").Result.OrderBy(a=>a.Priority).ToList();
             List<WorkOrdMaster> workMasters = _workOrdMaster.Select(a => weekPlan.Select(s=>s.ItemNumber).Contains(a.ItemNum) && weekPlan.Select(p=>p.ProductionOrder).Contains(a.WorkOrd) && a.Domain == companyid);
             List<mes_morder> mes_Morders = _mysql_mes_morder.GetListAsync(a => workMasters.Select(b => b.WorkOrd).ToList().Contains(a.morder_no) && a.factory_id ==Convert.ToInt32(companyid)).Result;
             decimal priority = 1;
@@ -2238,20 +2238,6 @@ namespace Business.Replenishment
             await _replenishmentWeekPlan.UpdateManyAsync(weekPlan);
             return "OK";
         }
-        private List<long> AnalysisIdList(string ids)
-        {
-            if (string.IsNullOrEmpty(ids))
-            {
-                throw new NotImplementedException("传入参数不正确,请选择");
-            }
-            Array alist = ids.Split(',');
-            List<long> idList = new List<long>();
-            foreach (string longid in alist)
-            {
-                idList.Add(long.Parse(longid));
-            }
-            return idList;
-        }
 
         /// <summary>
         /// 每天补货