Merge branch 'dev' of http://123.60.180.165:4647/ZZYDOP/DOPCore into dev

MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs

@@ -4394,13 +4394,20 @@ namespace Business.Replenishment
         {
             var works = _workOrdMaster.Select(a =>(string.IsNullOrEmpty(a.Status) || a.Status.ToUpper()=="P") && a.Typed.ToUpper() != "PW" && a.Domain == domain && a.IsActive);
             works = works.OrderBy(a => a.OrdDate).ToList();
+            var workOrdsList = works.Select(a => a.WorkOrd).ToList();
+            var weekPlan = _replenishmentWeekPlan.GetListAsync(a=>a.IsReplenishmentModel=="N" && workOrdsList.Contains(a.ProductionOrder)).Result;
             decimal Priority = 1.0m;
             for (int i = 0; i < works.Count; i++)
             {
                 works[i].Priority = Priority;
+                if (weekPlan.Any(a => a.ProductionOrder == works[i].WorkOrd))
+                {
+                    weekPlan.First(a=>a.ProductionOrder == works[i].WorkOrd).Priority = Priority;
+                }
                 Priority = Priority + 1.0m;
             }
             _businessDbContext.BulkUpdate(works);
+            _businessDbContext.BulkUpdate(weekPlan);
         }
 
         /// <summary>

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

@@ -5949,7 +5949,7 @@ namespace Business.ResourceExamineManagement
                 var itemList = _itemMaster.Select(a => items.Contains(a.ItemNum) && a.Domain == domain);
                 var locationRange = _configurationItem.Select(x => x.FldName == "MRPLocationRange" && x.Domain == domain).FirstOrDefault();
 
-                List<string> locationList = new List<string> { "1000", "1001", "5007", "5008" };
+                List<string> locationList = new List<string> { "1001", "5007", "5008", "8000", "8001" };
                 if (locationRange != null && locationRange.Val != null)
                 {
                     locationList = locationRange.Val.SplitToArray(",").ToList();
@@ -5962,10 +5962,10 @@ namespace Business.ResourceExamineManagement
                 {
                     if (!weekStockQty.ContainsKey(item.MATNR))
                     {
-                        weekStockQty.Add(item.MATNR, item.LABST + item.INSME);
+                        weekStockQty.Add(item.MATNR, item.LABST);
                     } else
                     {
-                        weekStockQty[item.MATNR] += (item.LABST + item.INSME);
+                        weekStockQty[item.MATNR] += (item.LABST);
                     }
                 }
                 foreach (var item in dsList)