MeiRuiAn/HuaiAn.git

			@@ -50,7 +50,7 @@
			}
			else
			{
			Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.LocationCode == needRelocationItem.LocationCode);
			Dt_StockInfo stockInfo = _stockService.StockInfoService.Db.Queryable<Dt_StockInfo>().Where(x => x.LocationCode == needRelocationItem.LocationCode).Includes(x => x.Details).First();
			if (stockInfo == null)
			{
			return WebResponseContent.Instance.Error($"鏈壘鍒板搴旇揣浣嶇殑搴撳瓨淇℃伅");
			@@ -95,7 +95,15 @@
			TaskStatus = 0,
			TaskType = TaskTypeEnum.Relocation.ObjToInt()
			};

			string MaterielCode = stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
			float Quantity = (float)stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
			string BatchNo = stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.BatchNo;
			if (MaterielCode != null && Quantity != null && BatchNo != null)
			{
			newTask.MaterielCode = MaterielCode;
			newTask.Quantity = Quantity;
			newTask.BatchNo = BatchNo;
			}
			if (stockInfo.StockLength>0)
			{
			newTask.TaskLength = stockInfo.StockLength;
			@@ -232,7 +240,7 @@
			return WebResponseContent.Instance.Error($"鏈壘鍒板搴旂殑缁堢偣璐т綅淇℃伅");
			}
			task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();

			FeedBackWCSTaskCompleted(task.TaskNum);
			_unitOfWorkManage.BeginTran();
			stockInfo.LocationCode = locationInfoEnd.LocationCode;
			stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
			@@ -241,7 +249,7 @@
			_basicService.LocationInfoService.UpdateLocationStatus(locationInfoEnd, stockInfo.PalletType, LocationStatusEnum.InStock, stockInfo.WarehouseId);
			BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? WIDESEA_Core.Enums.OperateTypeEnum.浜哄伐瀹屾垚 : WIDESEA_Core.Enums.OperateTypeEnum.鑷姩瀹屾垚);
			_unitOfWorkManage.CommitTran();
			FeedBackWCSTaskCompleted(task.TaskNum);

			return WebResponseContent.Instance.OK();
			}
			catch (Exception ex)