代码提交。

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

@@ -4307,9 +4307,9 @@ namespace Business.Replenishment
             List<long> occoupyRefId = new List<long>();
             //物料采购订单明细
             var poDetailList = _srm_po_list.GetListAsync(x => icitemlist.Select(p => p.mysql_id).ToList().Contains(x.icitem_id.Value) && x.bang_id == bangid && x.state == 1 && !x.IsDeleted).Result;
-            occoupyRefId.AddRange(poDetailList.Select(p => p.Id).ToList());
+            occoupyRefId.AddRange(poDetailList.Select(p => p.mysql_id).ToList());
             var srm_pr_mains = _srm_pr_main.GetListAsync(x => icitemlist.Select(p => p.mysql_id).ToList().Contains(x.icitem_id.Value) && x.bang_id == bangid && x.state != 0 && x.state != 4 && !x.IsDeleted).Result;
-            occoupyRefId.AddRange(srm_pr_mains.Select(p => p.Id).ToList());
+            occoupyRefId.AddRange(srm_pr_mains.Select(p => p.mysql_id).ToList());
             //采购订单或采购申请占用数据
             var poOccupys = _srm_po_occupy.GetListAsync(x => occoupyRefId.Contains(x.polist_id) && x.bang_id == bangid && !x.IsDeleted).Result;
             #endregion

MicroServices/Business/Business.Application/ResourceExamineManagement/PurchaseOrderAppService.cs

@@ -85,7 +85,7 @@ namespace Business.ResourceExamineManagement
             //查询出对应物料采购订单明细  --数据未被停用 && 评审通过后
             var poDetailList = mo_Srm_Po_Lists.Where(x => x.icitem_id == icitem_id);
             //采购订单占用数据
-            var poOccupys = srm_Po_Occupies.Where(x => poDetailList.Select(p => p.Id).ToList().Contains(x.polist_id));
+            var poOccupys = srm_Po_Occupies.Where(x => poDetailList.Select(p => p.mysql_id).ToList().Contains(x.polist_id));
 
             DateTime toTime = DateTime.Now.Date;
 
@@ -100,7 +100,7 @@ namespace Business.ResourceExamineManagement
             var QuantityNumber = 0.00m;
             foreach (var item in poDetails)
             {
-                var poOccupy = poOccupys.Where(x => x.polist_id == item.Id).ToList();
+                var poOccupy = poOccupys.Where(x => x.polist_id == item.mysql_id).ToList();
                 decimal? Qtys = poOccupy.Count > 0 ? poOccupy.Sum(x => x.qty.GetValueOrDefault()) : 0.00m;
                 //剩余可用数量
                 var PlanQty = item.qty.GetValueOrDefault() - item.rqty.GetValueOrDefault() - item.esqty.GetValueOrDefault() - Qtys;

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

@@ -1131,7 +1131,7 @@ namespace Business.ResourceExamineManagement
             return JsonConvert.SerializeObject("ok");
         }
 
-        //PR自动合并
+        //PR自动合并--要货令
         public void PrAutoMerge(string companyid)
         {
             //TODO:先按每周四调度任务循环，周五下单处理
@@ -1144,7 +1144,7 @@ namespace Business.ResourceExamineManagement
             DateTime endtime = toTime.Date.AddDays(7);
             //只合并要货令
             List<srm_pr_main> prlist = _mysql_srm_pr_main.GetListAsync(s => s.company_id.ToString() == companyid && s.pr_ssend_date >= starttime && s.pr_ssend_date <= endtime && s.state == 1 && s.IsRequireGoods == 1).Result;
-            List<ic_item> ic_Items = _mysql_ic_item.GetListAsync(s => s.company_id.ToString() == companyid && prlist.Select(c => c.icitem_id).Contains(s.Id)).Result;
+            List<ic_item> ic_Items = _mysql_ic_item.GetListAsync(s => s.company_id.ToString() == companyid && prlist.Select(c => c.icitem_id).Distinct().Contains(s.Id)).Result;
 
             var occupylist = _mysql_srm_po_occupy.GetListAsync(s => prlist.Select(c => c.Id).Contains(s.polist_id.GetValueOrDefault()) && s.company_id.ToString() == companyid && s.IsDeleted == false).Result;
 
@@ -3527,9 +3527,9 @@ namespace Business.ResourceExamineManagement
             List<long> occoupyRefId = new List<long>();
             //物料采购订单明细
             var poDetailList = _srm_po_list.GetListAsync(x => icitemlist.Select(p => p.mysql_id).ToList().Contains(x.icitem_id.Value) && x.bang_id == bangid && x.state == 1 && !x.IsDeleted).Result;
-            occoupyRefId.AddRange(poDetailList.Select(p => p.Id).ToList());
+            occoupyRefId.AddRange(poDetailList.Select(p => p.mysql_id).ToList());
             var srm_pr_mains = _srm_pr_main.GetListAsync(x => icitemlist.Select(p => p.mysql_id).ToList().Contains(x.icitem_id.Value) && x.bang_id == bangid && x.state != 0 && x.state != 4 && !x.IsDeleted).Result;
-            occoupyRefId.AddRange(srm_pr_mains.Select(p => p.Id).ToList());
+            occoupyRefId.AddRange(srm_pr_mains.Select(p => p.mysql_id).ToList());
             //采购订单或采购申请占用数据
             var poOccupys = _srm_po_occupy.GetListAsync(x => occoupyRefId.Contains(x.polist_id) && x.bang_id == bangid && !x.IsDeleted).Result;
             #endregion