JC34WMS.git - Gitblit

			@@ -420,7 +420,7 @@
			public async Task<List<DataStockDetail>> GetStockQueryList(string locatNo, string palletNo)
			{
			return await Db.Queryable<DataStockDetail>()
			.Where(s => s.IsDel == "0" && s.LocatNo.Contains(locatNo) && s.PalletNo.Contains(palletNo))
			.Where(s => s.IsDel == "0" && s.LocatNo.Contains(locatNo) \|\| s.PalletNo.Contains(palletNo))
			.OrderBy(s => new { s.LotNo, s.LocatNo, s.PalletNo })
			.ToListAsync();

			@@ -947,6 +947,166 @@
			}
			}
			/// <summary>
			/// 呼叫agv转运空托盘
			/// </summary>
			/// <param name="palletNo"></param>
			/// <param name="areaNo"></param>
			/// <param name="locatNo"></param>
			/// <param name="url"></param>
			/// <param name="userId"></param>
			/// <returns></returns>
			/// <exception cref="Exception"></exception>
			public async Task AgvNullPallet(string palletNo, string areaNo, string locatNo, string url, int userId)
			{
			try
			{
			if (string.IsNullOrEmpty(palletNo))
			{
			throw Oops.Bah("请扫描托盘条码！");
			}
			if (string.IsNullOrEmpty(locatNo))
			{
			throw Oops.Bah("请扫描起始地码！");
			}
			if (string.IsNullOrEmpty(areaNo))
			{
			throw Oops.Bah("请选择目标区域！");
			}
			string EndLocat = string.Empty;//目标位置

			var log = await Db.Queryable<LogTask>().FirstAsync(w => w.IsDel == "0" && w.PalletNo == palletNo && (w.Status == "0" \|\| w.Status == "1"));
			if (log != null)
			{
			throw Oops.Bah("该托盘已有等待执行或正在执行的任务!");
			}
			var stockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(w => w.IsDel == "0" && w.PalletNo == palletNo);
			if (stockDetail != null)
			{
			throw Oops.Bah("托盘上物料存在库存明细信息,请检查!");
			}

			var storageArea = await Db.Queryable<SysStorageArea>().FirstAsync(w => w.IsDel == "0" && w.AreaNo == areaNo);
			if (storageArea == null)
			{
			throw Oops.Bah("所选区域信息不存在,请检查!");
			}
			var palletInfo = await Db.Queryable<SysPallets>().FirstAsync(w => w.IsDel == "0" && w.PalletNo == palletNo);
			if (palletInfo == null)
			{
			throw Oops.Bah("该托盘信息不存在!");
			}
			if (palletInfo.Status!="0")
			{
			throw Oops.Bah("该托盘不是空托盘!");
			}
			//根据目标区域获取目标储位地址
			EndLocat = await GetLocat(areaNo);

			//起始储位信息
			var storageLocat = await Db.Queryable<SysStorageLocat>().FirstAsync(w => w.IsDel == "0" && w.LocatNo == locatNo);
			if (storageLocat == null)
			{
			throw Oops.Bah("储位信息不存在,请检查!");
			}
			//目标储位信息
			//var storageLocatEnd = new SysStorageLocat();

			var storageLocatEnd = await Db.Queryable<SysStorageLocat>().FirstAsync(w => w.IsDel == "0" && w.LocatNo == EndLocat && w.Flag == "0");
			if (storageLocatEnd == null)
			{
			throw Oops.Bah("目标储位信息不存在,请检查!");
			}

			//添加出库任务
			var taskNo = new Common().GetMaxNo("TK");
			var moveTask = new LogTask
			{
			TaskNo = taskNo,
			Sender = "WMS",
			Receiver = "WCS",
			IsSuccess = 0, //是否下发成功 0失败 1成功

			StartLocat = storageLocat.LocatNo,//起始位置
			EndLocat = EndLocat,//目标位置
			PalletNo = palletNo,//托盘码
			Msg = string.Format("转运任务：{0}=>>{1}", storageLocat.LocatNo, EndLocat),
			IsSend = 1,//是否可再次下发
			IsCancel = 1,//是否可取消
			IsFinish = 1,//是否可完成
			Type = "2",//任务类型 0 入库任务 1 出库任务 2 移库任务
			Status = "0",//任务状态0：等待执行1正在执行2执行完成
			OrderType = "3",//0 入库单 1 出库单 2 盘点单 3 移库单

			CreateTime = DateTime.Now
			};
			await Db.Insertable(moveTask).ExecuteCommandAsync();

			//修改起始储位地址状态
			storageLocat.Status = "5";//0：空储位 1：有物品 2：入库中 3：出库中 4：移入中 5：移出中
			await Db.Updateable(storageLocat).ExecuteCommandAsync();

			//修改目标储位地址状态
			//if (storageLocatEnd != null)
			//{
			// storageLocatEnd.Status = "4";//0：空储位 1：有物品 2：入库中 3：出库中 4：移入中 5：移出中
			// await Db.Updateable(storageLocatEnd).ExecuteCommandAsync();
			//}
			//添加操作日志记录
			var k = new OperationCrServer().AddLogOperationCr("PDA模块", "AGV空托转运", palletNo, "移库", $"PDA呼叫小车对托盘号：{palletNo}发起转运", userId);

			var outDto = new List<OutCommandDto>
			{
			new OutCommandDto()
			{
			TaskNo = moveTask.TaskNo, // 任务号
			TaskType = "2",// 任务类型 0入 1出 2移
			PalletNo = moveTask.PalletNo,//托盘号

			StartLocate = moveTask.StartLocat, // 起始位置
			EndLocate = EndLocat, // 目标位置

			Order = 999,
			Type = PLCTypeEnum.AGV

			}
			};

			// 正式运行程序放开
			var list2 = outDto.Select(m => m.TaskNo).ToList();
			var jsonData = JsonConvert.SerializeObject(outDto);
			string response = "";

			try
			{
			var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")
			response = HttpHelper.DoPost(url, jsonData, "下发给WCS出库命令", "WCS");
			var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss")

			//解析返回数据
			var wcsModel = JsonConvert.DeserializeObject<WcsModel2>(response);
			if (wcsModel.code == 200)
			{
			// 更改任务的发送返回时间//
			new TaskServer().EditTaskIssueOk(list2, time1, time2);
			}
			else
			{
			new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.message);
			throw new Exception(wcsModel.message);
			}
			}
			catch (Exception ex)
			{
			throw new Exception(ex.Message);
			}

			}
			catch (Exception e)
			{
			throw new Exception(e.Message);
			}
			}
			/// <summary>
			/// agv转运呼叫小车取货
			/// </summary>
			/// <param name="soNo"></param>
			@@ -1303,9 +1463,8 @@
			SkuName = boxInfo.SkuName,
			LotNo = boxInfo.LotNo,
			BoxNoList = new List<string>() { boxNoNew } ,
			Date1 = boxInfo.ProductionTime.ToString(),
			Date2 = boxInfo.ExpirationTime.ToString(),

			Date1 = boxInfo.ProductionTime == null ? "" : Convert.ToDateTime(boxInfo.ProductionTime).ToString("yyyy-MM-dd"),
			Date2 = boxInfo.ExpirationTime == null ? "" : Convert.ToDateTime(boxInfo.ExpirationTime).ToString("yyyy-MM-dd"),
			};

			#endregion