JC24WMS.git - Gitblit

			@@ -773,33 +773,41 @@
			{
			try
			{
			var models = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo);
			if (models == null)
			{
			throw new Exception("托盘库存信息不存在,请检查!");
			}
			if (string.IsNullOrEmpty(models.LocatNo))
			{
			throw new Exception("托盘储位信息不存在,请检查!");
			}
			if (models.WareHouseNo != "W02")
			{
			throw new Exception("该托盘未在平库内,请检查!");
			}
			var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == models.LocatNo);
			if (storageLocat == null)
			{
			throw new Exception("储位信息不存在,请检查!");
			}
			var storageArea = new List<SysStorageArea>();
			if (storageLocat.AreaNo.Contains("B0"))
			if (string.IsNullOrEmpty(palletNo))
			{
			storageArea = Db.Queryable<SysStorageArea>().Where(w => w.AreaNo.Contains("B0")).ToList();
			storageArea = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.WareHouseNo == "W02").OrderBy(o=>o.AreaNo).ToList();
			}
			else
			{
			storageArea = Db.Queryable<SysStorageArea>().Where(w => w.AreaNo.Contains("B1")).ToList();
			}
			var models = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo);
			if (models == null)
			{
			throw new Exception("托盘库存信息不存在,请检查!");
			}
			if (string.IsNullOrEmpty(models.LocatNo))
			{
			throw new Exception("托盘储位信息不存在,请检查!");
			}
			if (models.WareHouseNo != "W02")
			{
			throw new Exception("该托盘未在平库内,请检查!");
			}
			var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == models.LocatNo);
			if (storageLocat == null)
			{
			throw new Exception("储位信息不存在,请检查!");
			}

			if (storageLocat.AreaNo.Contains("B0"))
			{
			storageArea = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.AreaNo.Contains("B0") && w.WareHouseNo == "W02").OrderBy(o => o.AreaNo).ToList();
			}
			else
			{
			storageArea = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.AreaNo.Contains("B1") && w.WareHouseNo == "W02").OrderBy(o => o.AreaNo).ToList();
			}
			}
			return storageArea;
			}
			catch (Exception ex)
			@@ -867,7 +875,7 @@
			}

			/// <summary>
			/// agv转运呼叫小车-开发未完成待确认
			/// agv转运呼叫小车
			/// </summary>
			/// <param name="palletNo"></param>
			/// <param name="areaNo"></param>
			@@ -1004,7 +1012,7 @@
			}
			}
			/// <summary>
			/// agv转运呼叫小车取货-开发未完成待确认
			/// agv转运呼叫小车取货
			/// </summary>
			/// <param name="soNo"></param>
			/// <param name="palletNo"></param>
			@@ -1016,112 +1024,139 @@
			{
			throw new Exception("请选择出库单据！");
			}
			if (string.IsNullOrEmpty(palletNo))
			{
			throw new Exception("请扫描托盘条码！");
			}
			if (string.IsNullOrEmpty(areaNo))
			{
			throw new Exception("请选择目标区域！");
			}
			try
			{
			var log = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && (w.Status == "0" \|\| w.Status == "1"));
			if (log != null)
			{
			throw new Exception("该托盘已有小车等待执行或正在执行的任务!");
			}

			//开启事务
			Db.BeginTran();
			//出库单信息
			var notice = Db.Queryable<BllExportNotice>().First(w => w.IsDel == "0" && w.SONo == soNo);
			if (notice == null)
			{
			throw new Exception("出库单据信息不存在,请检查!");
			}
			var allot = Db.Queryable<BllExportAllot>().First(w => w.IsDel == "0" && w.SONo == soNo && w.PalletNo == palletNo);
			if (allot == null)
			{
			throw new Exception("该托盘出库分配信息不存在,请检查!");
			}
			var stockDetail = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo);
			if (stockDetail == null)
			{
			throw new Exception("托盘上物料库存信息不存在,请检查!");
			}
			var stock = Db.Queryable<DataStock>().First(w => w.IsDel == "0" && w.SkuNo == stockDetail.SkuNo && w.LotNo == stockDetail.LotNo);
			if (stock == null)
			{
			throw new Exception("托盘上物料库存信息不存在,请检查!");
			}
			if (string.IsNullOrEmpty(stockDetail.LocatNo))
			{
			throw new Exception("托盘储位信息不存在,请检查!");
			}
			if (stockDetail.WareHouseNo != "W02")
			{
			throw new Exception("该托盘未在平库内,请检查!");
			}
			var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == stockDetail.LocatNo);
			if (storageLocat == null)
			{
			throw new Exception("储位信息不存在,请检查!");
			}
			//目标区域信息
			var storageArea = Db.Queryable<SysStorageArea>().First(w => w.IsDel == "0" && w.AreaNo == areaNo);
			if (storageArea == null)
			{
			throw new Exception("所选区域信息不存在,请检查!");
			}
			string EndLocat = string.Empty;//目标位置
			EndLocat= GetLocat(areaNo, stockDetail.SkuNo, stockDetail.LotNo,palletNo);
			//目标储位信息
			var storageLocatEnd = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == EndLocat && w.Flag == "0" && w.Status == "0");
			if (storageLocatEnd == null)
			List<DataStockDetail> stockDetailList = new List<DataStockDetail>();//需要的托盘明细
			if (!string.IsNullOrEmpty(palletNo))//单托盘叫货
			{
			throw new Exception("目标储位信息不存在,请检查!");
			stockDetailList = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.PalletNo == palletNo).ToList();
			}
			//开启事务
			Db.BeginTran();

			//添加出库任务
			var taskNo = new Common().GetMaxNo("TK");
			var exTask = new LogTask
			else//整个出库单叫货
			{
			TaskNo = taskNo,
			Sender = "WMS",
			Receiver = "AGV",
			IsSuccess = 0, //是否下发成功 0失败 1成功
			Msg= string.Format("转运任务：{0}=>>{1}", stockDetail.LocatNo, EndLocat),
			StartLocat = stockDetail.LocatNo,//起始位置
			EndLocat = EndLocat,//目标位置
			PalletNo = palletNo,//托盘码
			IsSend = 1,//是否可再次下发
			IsCancel = 1,//是否可取消
			IsFinish = 1,//是否可完成
			Type = "2",//任务类型 0 入库任务 1 出库任务 2 移库任务
			Status = "0",//任务状态0：等待执行1正在执行2执行完成
			OrderType = "3",//0 入库单 1 出库单 2 盘点单 3 移库单
			string sqlStr = $"select * from DataStockDetail where PalletNo in (select PalletNo from BllExportAllot where IsDel='0' and SONo='{soNo}')";
			stockDetailList = Db.Ado.SqlQuery<DataStockDetail>(sqlStr).ToList();
			}
			if (stockDetailList.Count<=0)
			{
			throw new Exception("托盘明细不存在,请检查!");
			}

			CreateTime = DateTime.Now
			};
			Db.Insertable(exTask).ExecuteCommand();
			var log = Db.Queryable<LogTask>().Where(w => w.IsDel == "0" && (w.Status == "0" \|\| w.Status == "1"));//任务表
			var storageLocat = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0");//储位表
			var stock = Db.Queryable<DataStock>().Where(w => w.IsDel == "0");//库存总表
			string EndLocat = string.Empty;//目标位置
			string hasLocatNoList = string.Empty;//已分配的储位
			foreach (var item in stockDetailList)
			{
			//任务信息
			var logInfo = log.First(w =>w.PalletNo == item.PalletNo);
			if (logInfo != null)
			{
			throw new Exception($"托盘号：{item.PalletNo}已有小车等待执行或正在执行的任务!");
			}
			if (string.IsNullOrEmpty(item.LocatNo))
			{
			throw new Exception($"托盘号：{item.PalletNo}的储位信息不存在,请检查!");
			}
			if (item.WareHouseNo != "W02")
			{
			throw new Exception($"托盘号：{item.PalletNo}未在平库内,请检查!");
			}
			//起始储位信息
			var storageLocatBegin = storageLocat.First(w => w.LocatNo == item.LocatNo);
			if (storageLocat == null)
			{
			throw new Exception($"托盘号：{item.PalletNo}所在的储位信息不存在,请检查!");
			}
			//获取目标储位
			EndLocat = GetLocat(areaNo, item.SkuNo, item.LotNo, palletNo);
			if (string.IsNullOrEmpty(EndLocat))
			{
			throw new Exception("分配目标储位失败,请检查!");
			}
			if (string.IsNullOrEmpty(hasLocatNoList))
			{
			hasLocatNoList = EndLocat;
			}
			else
			{
			hasLocatNoList = hasLocatNoList + "," + EndLocat;
			}
			//目标储位信息
			var storageLocatEnd = storageLocat.First(w => w.LocatNo == EndLocat && w.Flag == "0" && w.Status == "0");
			if (storageLocatEnd == null)
			{
			throw new Exception("目标储位信息不存在,请检查!");
			}

			//修改库存明细信息
			stockDetail.Status = "4";//移库锁定
			stockDetail.LockQty = stockDetail.Qty;//锁定库存数量
			Db.Updateable(stockDetail).ExecuteCommand();
			//修改库存信息
			stock.LockQty += (decimal)stockDetail.Qty;
			Db.Updateable(stock).ExecuteCommand();
			//添加出库任务
			var taskNo = new Common().GetMaxNo("TK");
			var exTask = new LogTask
			{
			TaskNo = taskNo,
			Sender = "WMS",
			Receiver = "AGV",
			IsSuccess = 0, //是否下发成功 0失败 1成功
			Msg = string.Format("转运任务：{0}=>>{1}", item.LocatNo, EndLocat),
			StartLocat = item.LocatNo,//起始位置
			EndLocat = EndLocat,//目标位置
			PalletNo = palletNo,//托盘码
			IsSend = 1,//是否可再次下发
			IsCancel = 1,//是否可取消
			IsFinish = 1,//是否可完成
			Type = "2",//任务类型 0 入库任务 1 出库任务 2 移库任务
			Status = "0",//任务状态0：等待执行1正在执行2执行完成
			OrderType = "3",//0 入库单 1 出库单 2 盘点单 3 移库单

			//修改储位地址状态
			storageLocat.Status = "5";//0：空储位 1：有物品 2：入库中 3：出库中 4：移入中 5：移出中
			Db.Updateable(storageLocat).ExecuteCommand();
			CreateTime = DateTime.Now
			};
			Db.Insertable(exTask).ExecuteCommand();

			//修改目标储位地址状态
			storageLocatEnd.Status = "4";//0：空储位 1：有物品 2：入库中 3：出库中 4：移入中 5：移出中
			Db.Updateable(storageLocatEnd).ExecuteCommand();
			//修改库存明细信息
			item.Status = "4";//移库锁定
			item.LockQty = item.Qty;//锁定库存数量
			Db.Updateable(item).ExecuteCommand();

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

			var stockInfo = stock.First(w => w.SkuNo == item.SkuNo && w.LotNo == item.LotNo);
			//修改库存信息
			stockInfo.LockQty += (decimal)item.Qty;//锁定数量
			Db.Updateable(stockInfo).ExecuteCommand();
			}
			if (string.IsNullOrEmpty(palletNo))
			{
			//添加操作日志记录
			var k = new OperationCrServer().AddLogOperationCr("PDA模块", "AGV转运", palletNo, "移库", $"PDA呼叫小车对出库单：{soNo}下所有托盘发起转运", userId);
			}
			else
			{
			//添加操作日志记录
			var k = new OperationCrServer().AddLogOperationCr("PDA模块", "AGV转运", palletNo, "移库", $"PDA呼叫小车对托盘号：{palletNo}发起转运", userId);
			}
			//提交事务
			Db.CommitTran();

			@@ -1142,7 +1177,7 @@
			/// <param name="skuNo"></param>
			/// <param name="lotNo"></param>
			/// <returns></returns>
			private string GetLocat(string areaNo,string skuNo,string lotNo,string palletNo)
			private string GetLocat(string areaNo,string skuNo,string lotNo,string palletNo,string hasLocatNoList="")
			{
			try
			{
			@@ -1156,7 +1191,7 @@
			{
			var locatInfo = storageLocatList.Where(w => w.LocatNo == item).First();

			var locatInfo2 = storageLocatList.Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0" && w.LocatNo != locatInfo.LocatNo && w.Row == locatInfo.Row)
			var locatInfo2 = storageLocatList.Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0" && w.LocatNo != locatInfo.LocatNo && w.Row == locatInfo.Row && !hasLocatNoList.Contains(w.LocatNo))
			.OrderByDescending(o => o.Column).First();
			if (locatInfo2 != null)
			{
			@@ -1165,7 +1200,7 @@
			}
			if (string.IsNullOrEmpty(endLocat))
			{
			var locatInfo3 = storageLocatList.Where(w => w.IsDel == "0" && w.Flag == "0" && w.Status == "0")
			var locatInfo3 = storageLocatList.Where(w => w.IsDel == "0" && w.Flag == "0" && w.Status == "0" && !hasLocatNoList.Contains(w.LocatNo))
			.OrderByDescending(m => m.Layer).OrderByDescending(m=>m.Column).OrderByDescending(m=> m.Row).First();

			if (locatInfo3 != null)