HuaYiZhongHeng/BaiBuLiKu.git

			@@ -100,7 +100,7 @@
			WMSTaskDTO taskDTO = new WMSTaskDTO()
			{
			TaskNum = task.TaskNum.Value,
			Grade = 1,
			Grade = task.Grade.Value,
			PalletCode = task.PalletCode,
			RoadWay = task.Roadway,
			SourceAddress = task.SourceAddress,
			@@ -186,6 +186,29 @@
			// 组盘信息
			// 将content.Data转换为ResultTrayCellsStatus对象
			var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());

			if (!result.Success)
			{
			var taskNG = new Dt_Task
			{
			CurrentAddress = input.Position,
			Grade = 1,
			Roadway = input.Roadways,
			TargetAddress = stationManager.stationNGLocation,
			Dispatchertime = DateTime.Now,
			MaterialNo = "",
			NextAddress = stationManager.stationNGChildCode,
			OrderNo = null,
			PalletCode = input.PalletCode,
			SourceAddress = stationManager.stationLocation,
			TaskState = (int)TaskInStatusEnum.Line_InFinish,
			TaskType = (int)TaskOutboundTypeEnum.InToOut,
			TaskNum = await BaseDal.GetTaskNo(),
			Creater = "Systeam"
			};
			return taskNG;
			}

			if (result.SerialNos.Count <= 0)
			{
			ConsoleHelper.WriteErrorLine(result.MOMMessage);
			@@ -218,7 +241,7 @@
			}

			// 处理异常电芯情况
			var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1).ToList();
			var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1 && x.SerialNoStatus != 4).ToList();
			if (serialNosError.Count > 0)
			{
			if (stationManager.stationType != 3)
			@@ -509,7 +532,7 @@
			var task = new Dt_Task
			{
			CurrentAddress = input.Position,
			Grade = 1,
			Grade = 2,
			Roadway = input.Roadways,
			TargetAddress = stationManager.stationLocation,
			Dispatchertime = DateTime.Now,
			@@ -836,7 +859,7 @@

			var location = locations.OrderBy(x => x.Layer).ThenBy(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();

			var stockInfo = await QueryStockInfoForEmptyTrayAsync("CWSC1");
			var stockInfo = await QueryStockInfoForEmptyTrayAsync("CWSC1","10086");

			if (stockInfo != null)
			{
			@@ -883,7 +906,6 @@

			var stockInfo = _stockInfoRepository.Db.Queryable<DtStockInfo>()
			.Includes(x => x.LocationInfo) // 预加载LocationInfo
			.Includes(x => x.StockInfoDetails) // 预加载StockInfoDetails
			.Where(x => x.AreaCode == "CWSC3" && x.IsFull == true) // 过滤条件
			.Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock) // 过滤条件
			.OrderBy(x => x.OutboundTime) // 排序