|
|
@@ -4569,6 +4569,24 @@ namespace Business.Replenishment
|
|
|
{
|
|
|
//Mes_Morders.ForEach(s => { s.moentry_sys_stime = DateTime.Now.Date.AddDays((double)lookDay + 1); });
|
|
|
List<string> monolist = Mes_Morders.Select(c => c.morder_no).ToList();
|
|
|
+ if (string.IsNullOrEmpty(analogCalcVersion))
|
|
|
+ {
|
|
|
+ var workOrds = _workOrdMaster.Select(a => monolist.Contains(a.WorkOrd) && a.Domain == param.factoryId.ToString() && a.IsActive).OrderBy(c => c.Priority).ToList();
|
|
|
+ List<mes_morder> PriorityList = new List<mes_morder>();
|
|
|
+ foreach (var item in workOrds)
|
|
|
+ {
|
|
|
+ var mesItem = Mes_Morders.Find(a => a.morder_no == item.WorkOrd);
|
|
|
+ if (mesItem != null)
|
|
|
+ {
|
|
|
+ PriorityList.Add(mesItem);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(PriorityList.Any())
|
|
|
+ {
|
|
|
+ Mes_Morders = PriorityList;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
//清理PR的占用。
|
|
|
//如果PR没有转PO,则PR没有合并,就删除,有合并,就减少合并后的PR的数量。
|
|
|
//var prlist = _mysql_srm_pr_main.GetListAsync(s => monolist.Contains(s.pr_mono)).Result;
|