RuiShiGe/LingPaoCheShenKu.git

			@@ -9,6 +9,7 @@
			using WIDESEA_Core;
			using WIDESEA_Core.HttpContextUser;
			using WIDESEA_DTO;
			using WIDESEA_DTO.Location;
			using WIDESEA_Model.Models;

			namespace WIDESEA_StorageBasicService;
			@@ -26,6 +27,7 @@
			private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
			private readonly IMapper _mapper;
			private readonly IDt_PalletStockInfoRepository _palletStockInfoRepository;
			private readonly IVV_StockInfoRepository _stockrepository;

			public LocationInfoService(ILocationInfoRepository BaseDal,
			IUnitOfWorkManage unitOfWorkManage,
			@@ -37,7 +39,8 @@
			IStockInfoDetailRepository stockInfoDetailRepository,
			IMapper mapper,
			IDt_TaskService taskService,
			IDt_PalletStockInfoRepository palletStockInfoRepository) : base(BaseDal)
			IDt_PalletStockInfoRepository palletStockInfoRepository,
			IVV_StockInfoRepository stockrepository) : base(BaseDal)
			{
			_unitOfWorkManage = unitOfWorkManage;
			_taskRepository = taskRepository;
			@@ -49,6 +52,7 @@
			_mapper = mapper;
			_taskService = taskService;
			_palletStockInfoRepository = palletStockInfoRepository;
			_stockrepository = stockrepository;
			}


			@@ -263,6 +267,8 @@
			{
			var data = BaseDal.QueryData(x => x.AreaId == Convert.ToInt32(area.areaCode));

			List<VV_StockInfo> stockInfos = _stockrepository.QueryData(x => true);

			List<LocationLayer> layers = new List<LocationLayer>();
			foreach (var layer in data.GroupBy(t => t.Layer))
			{
			@@ -273,6 +279,8 @@
			var cols = new List<LocationCol>();
			foreach (var data_col in data_row)
			{
			var stock = stockInfos.FirstOrDefault(x => x.LocationCode == data_col.LocationCode);

			cols.Add(new LocationCol()
			{
			//å
			@@ -280,6 +288,7 @@
			locationCode = data_col.LocationCode,
			location_state = data_col.LocationStatus.ToString(),
			location_lock = data_col.EnalbeStatus.ToString(),
			stockInfo = stock
			});
			}
			cols = cols.OrderBy(t => t.index).ToList();