主生产计划可用库存取InvMaster

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

@@ -3532,7 +3532,8 @@ namespace Business.Replenishment
         {
             List<EOPDto> itemQty = new List<EOPDto>();
             var itemList=_mysql_ic_item.GetListAsync(a => itemNumbers.Contains(a.number) && a.factory_id == input.factory_id  && !a.IsDeleted).Result;
-            var itemStockList=_mysql_ic_item_stock.GetListAsync(a => itemNumbers.Contains(a.icitem_number) && a.factory_id == input.factory_id  && !a.IsDeleted).Result;
+            //获取成品库存、灭菌库存、在制库存(会从SAP同步的库存表更新到LocationDetail、ic_item表中)
+            var locations = _invMaster.Select(p => p.Domain == input.factory_id.ToString() && itemNumbers.Contains(p.ItemNum) && p.IsActive);
             var pooccupylist=_mysql_srm_po_occupy.GetListAsync(a => a.state == 1 && !a.IsDeleted && a.factory_id == input.factory_id ).Result;
             var poList = _mysql_srm_po_list.GetListAsync(a=> pooccupylist.Select(p=>p.polist_id).ToList().Contains(a.Id) && pooccupylist.Select(p => p.polist_row).ToList().Contains(a.polist_row) && a.factory_id == input.factory_id  && !a.IsDeleted).Result;
             var molist=_mysql_mes_morder.GetListAsync(a => itemNumbers.Contains(a.product_code) && a.factory_id == input.factory_id  && !a.IsDeleted).Result;
@@ -3551,9 +3552,9 @@ namespace Business.Replenishment
                 EOPDto eOPDto=new EOPDto();
                 eOPDto.ItemNumber = a;
                 decimal stockqty = 0;
-                if(itemStockList.Find(s => s.icitem_number == a)!=null)
+                if (locations.Find(s => s.ItemNum == a && (s.Location == "5008" || s.Location == "8000" || s.Location == "8001")) !=null)
                 {
-                    stockqty = itemStockList.Find(s => s.icitem_number == a).sqty.Value;
+                    stockqty = locations.Find(s => s.ItemNum == a && (s.Location == "5008" || s.Location == "8000" || s.Location == "8001")).AvailStatusQty.GetValueOrDefault();
                 }
                 decimal poOccupyQty = 0;
                 for(int i=0;i<pooccupylist.Count;i++)

MicroServices/Business/Business.HttpApi/Controllers/SystemJobController.cs

@@ -86,5 +86,16 @@ namespace Business.Controllers
         {
             return _SystemJobAppService.TestTimeOut();
         }
+
+        /// <summary>
+        /// 测试接口超时
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("systemversion")]
+        public string SystemVersion()
+        {
+            return "V2.7.9";
+        }
     }
 }