占用的PR不能扣减

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

@@ -2969,7 +2969,12 @@ namespace Business.Replenishment
             var quarter_srm_pr_mains = srm_pr_mains.Where(s => s.pr_psend_date >= _CalcBomViewAppService.quarter_starttime && s.pr_psend_date < _CalcBomViewAppService.quarter_endtime).ToList();
             var materialItemStock = _invMaster.Select(a => numbers.Contains(a.ItemNum) && a.Domain == input.factory_id.ToString());
             //更新未确认未合并的PR
+            //占用的PR不能扣减
             var prCanUpdateList = _mysql_srm_pr_main.GetListAsync(a => icItemList.Select(c => c.Id).ToList().Contains(a.icitem_id.GetValueOrDefault()) && a.pr_ssend_date >= DateTime.Now.Date.AddDays(1) && a.state==1).Result;
+            var  prIds = prCanUpdateList.Select(a => a.Id).ToList();
+            var prOccupy=_mysql_srm_po_occupy.GetListAsync(a => prIds.Contains(a.polist_id.GetValueOrDefault()) && a.factory_id==input.factory_id).Result;
+            var prOccupyIds = prOccupy.Select(a => a.polist_id).ToList();
+            prCanUpdateList = prCanUpdateList.Where(a => !prOccupyIds.Contains(a.Id)).ToList();
             List<srm_pr_main> prUpdateList = new List<srm_pr_main>();
             List<srm_pr_main> prDeleteList = new List<srm_pr_main>();
             ropMaterialModelList.ForEach(b =>