JC24WMS.git - Gitblit

			@@ -823,6 +823,11 @@
			OutMode = "", //目标地址
			Order = 1
			};
			if (beingTask.IsSuccess == 0)
			{
			beingTask.IsSuccess = 1;
			Db.Updateable(beingTask).ExecuteCommand();
			}
			return comDto;
			}
			if (haveLocate != null)
			@@ -872,6 +877,34 @@
			throw new Exception($"{palletNo}托盘条码不具有箱码信息，不可入库！");
			}
			skuNo = stockDetail.First().SkuNo;

			#region 判断任务是否已经存在，若存在直接返回任务；
			var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0"
			&& (m.Status == "0" \|\| m.Status == "1") && m.PalletNo == palletNo && m.Type == "0");
			if (beingTask != null)
			{
			comDto = new OutCommandDto()
			{
			PalletNo = palletNo,//托盘号
			StartRoadway = beingTask.StartRoadway, // 起始巷道
			StartLocate = "", // 起始位置
			EndLocate = beingTask.EndLocat, // 目标位置
			EndRoadway = beingTask.EndRoadway, // 目标巷道
			TaskNo = beingTask.TaskNo, // 任务号
			TaskType = "0",// 任务类型 (出库)
			OutMode = "", //目标地址
			Order = 1
			};
			if (beingTask.IsSuccess == 0)
			{
			beingTask.IsSuccess = 1;
			beingTask.Status = "1";
			Db.Updateable(beingTask).ExecuteCommand();
			}

			return comDto;
			}
			#endregion

			//获取对应回库规则
			var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetNo == "Fun041" && a.IsEnable == "NO");
			@@ -1096,14 +1129,30 @@
			};
			Db.Insertable(exTask).ExecuteCommand();


			//// 添加托盘绑定表托盘入库任务号 liudl
			//if (palletBindList.Count < 1)
			//{
			// foreach (DataStockDetail stockModel in stockDetail)
			// {
			// var bindModel = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.Status == "2"
			// && m.PalletNo == stockModel.PalletNo && m.ASNNo == stockModel.ASNNo && m.ASNDetailNo == stockModel.ASNDetailNo);
			// if (bindModel != null && string.IsNullOrWhiteSpace(bindModel.TaskNo))
			// {
			// bindModel.TaskNo = taskNo;
			// bindModel.WareHouseNo = houseNo;
			// bindModel.RoadwayNo = roadNo;
			// Db.Updateable(bindModel).ExecuteCommand();
			// }
			// }
			//}
			if (palletBindList.Count >= 1)
			{
			foreach (var item in palletBindList)
			{
			item.WareHouseNo = houseNo;
			item.RoadwayNo = roadNo;
			item.TaskNo = "";
			item.TaskNo = taskNo;
			item.Status = "1";
			}
			Db.Updateable(palletBindList).ExecuteCommand();
			}
			@@ -1178,20 +1227,11 @@
			var skuCategoryList = Db.Queryable<SysMaterialCategory>().Where(m => m.IsDel == "0").ToList();

			var skuNo = ""; //入库物料

			var isAddTask = true; //是否添加新任务
			var oldTaskNo = ""; //旧任务号
			var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
			if (palletBindList.Count >= 1) //正常入库
			{
			//var bindIdList = palletBindList.Select(m => m.Id).ToList();
			//判断是否有零箱
			//foreach (var item in bindIdList)
			//{
			// var boxInfo = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BindNo == item);
			// if (boxInfo.Count(m => m.BitBoxMark == "1") > 0)
			// {
			// throw new Exception($"{palletNo}托盘上有零箱，请入零箱库！");
			// }
			//}

			var palletBind = palletBindList.FirstOrDefault(m => m.Status == "1");
			if (palletBind != null)
			{
			@@ -1200,19 +1240,38 @@
			{
			throw new Exception("该托盘正在入库，但未查询到任务信息");
			}
			comDto = new OutCommandDto()
			if (!string.IsNullOrWhiteSpace(beingTask.EndLocat))
			{
			PalletNo = palletNo,//托盘号
			StartRoadway = beingTask.StartRoadway, // 起始巷道
			StartLocate = "", // 起始位置
			EndLocate = beingTask.EndLocat, // 目标位置
			EndRoadway = beingTask.EndRoadway, // 目标巷道
			TaskNo = beingTask.TaskNo, // 任务号
			TaskType = "0",// 任务类型 (出库)
			OutMode = "", //目标地址
			Order = 1
			};
			return comDto;
			comDto = new OutCommandDto()
			{
			PalletNo = palletNo,//托盘号
			StartRoadway = beingTask.StartRoadway, // 起始巷道
			StartLocate = "", // 起始位置
			EndLocate = beingTask.EndLocat, // 目标位置
			EndRoadway = beingTask.EndRoadway, // 目标巷道
			TaskNo = beingTask.TaskNo, // 任务号
			TaskType = "0",// 任务类型 (出库)
			OutMode = "", //目标地址
			Order = 1
			};
			if (beingTask.IsSuccess == 0)
			{
			beingTask.IsSuccess = 1;//如果任务下发状态是未下发更改为已下发
			Db.Updateable(beingTask).ExecuteCommand();
			}
			return comDto;

			}
			else
			{
			if (string.IsNullOrWhiteSpace(roadwayNo))
			{
			roadwayNo = beingTask.EndRoadway;
			}
			isAddTask = false;
			oldTaskNo = beingTask.TaskNo;
			}

			}
			if (haveLocate != null)
			{
			@@ -1253,7 +1312,7 @@
			}
			else //回流入库
			{
			var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();

			if (stockDetail.Count == 0)
			{
			throw new Exception($"{palletNo}托盘条码不具有箱码信息，不可入库！");
			@@ -1277,6 +1336,42 @@
			}
			}

			var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0"
			&& (m.Status == "0" \|\| m.Status == "1") && m.PalletNo == palletNo && m.Type == "0");
			if (beingTask != null)
			{
			if (!string.IsNullOrWhiteSpace(beingTask.EndLocat))
			{
			comDto = new OutCommandDto()
			{
			PalletNo = palletNo,//托盘号
			StartRoadway = beingTask.StartRoadway, // 起始巷道
			StartLocate = "", // 起始位置
			EndLocate = beingTask.EndLocat, // 目标位置
			EndRoadway = beingTask.EndRoadway, // 目标巷道
			TaskNo = beingTask.TaskNo, // 任务号
			TaskType = "0",// 任务类型 (出库)
			OutMode = "", //目标地址
			Order = 1
			};
			if (beingTask.IsSuccess == 0)
			{
			beingTask.IsSuccess = 1;
			beingTask.Status = "1";
			Db.Updateable(beingTask).ExecuteCommand();
			}
			return comDto;
			}
			else
			{
			if (string.IsNullOrWhiteSpace(roadwayNo))
			{
			roadwayNo = beingTask.EndRoadway;
			}
			isAddTask = false;
			oldTaskNo = beingTask.TaskNo;
			}
			}

			//获取对应回库规则
			var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetName == "托盘回库验证" && a.IsEnable == "NO");
			@@ -1343,46 +1438,73 @@
			Db.BeginTran();
			try
			{
			//if (locate != null)
			//{
			// //添加巷道使用记录
			// var log = new SysRoadwayUseLog
			// {
			// RoadwayNo = locate.RoadwayNo,
			// LocateNo = locate.LocatNo,
			// WareHouseNo = locate.WareHouseNo,
			// Row = locate.Row,
			// Column = locate.Column,
			// Layer = locate.Layer,
			// Depth = locate.Depth
			// };
			// Db.Insertable(log).ExecuteCommand();
			//}

			var taskNo = new Common().GetMaxNo("TK");
			var exTask = new LogTask //入库任务
			if (isAddTask)
			{
			TaskNo = taskNo,
			Sender = "WMS",
			Receiver = "WCS",
			IsSuccess = 1, //是否下发成功 0失败 1成功
			SendDate = DateTime.Now, //发送时间
			BackDate = DateTime.Now, //返回时间
			StartRoadway = "", // 起始巷道
			StartLocat = "",//起始位置
			EndLocat = locate.LocatNo,//目标位置
			EndRoadway = locate.RoadwayNo, // 目标巷道
			PalletNo = palletNo,//托盘码
			IsSend = 1,//是否可再次下发
			IsCancel = 1,//是否可取消
			IsFinish = 1,//是否可完成
			Type = "0",//任务类型 0 入库任务 1 出库任务 2 移库任务
			Status = "1",//任务状态0：等待执行1正在执行2执行完成
			OrderType = "0",//0 入库单 1 出库单 2 盘点单 3 移库单
			Msg = "入库口到=>>" + locate.LocatNo + "的入库任务", //关键信息
			var taskNo = new Common().GetMaxNo("TK");
			var exTask = new LogTask //入库任务
			{
			TaskNo = taskNo,
			Sender = "WMS",
			Receiver = "WCS",
			IsSuccess = 1, //是否下发成功 0失败 1成功
			SendDate = DateTime.Now, //发送时间
			BackDate = DateTime.Now, //返回时间
			StartRoadway = "", // 起始巷道
			StartLocat = "",//起始位置
			EndLocat = locate.LocatNo,//目标位置
			EndRoadway = locate.RoadwayNo, // 目标巷道
			PalletNo = palletNo,//托盘码
			IsSend = 1,//是否可再次下发
			IsCancel = 1,//是否可取消
			IsFinish = 1,//是否可完成
			Type = "0",//任务类型 0 入库任务 1 出库任务 2 移库任务
			Status = "1",//任务状态0：等待执行1正在执行2执行完成
			OrderType = "0",//0 入库单 1 出库单 2 盘点单 3 移库单
			Msg = "入库口到=>>" + locate.LocatNo + "的入库任务", //关键信息

			};
			Db.Insertable(exTask).ExecuteCommand();
			};
			Db.Insertable(exTask).ExecuteCommand();
			// 添加托盘绑定表托盘入库任务号 liudl
			foreach (DataStockDetail stockModel in stockDetail)
			{
			var bindModel = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.Status == "2"
			&& m.PalletNo == stockModel.PalletNo && m.ASNNo == stockModel.ASNNo && m.ASNDetailNo == stockModel.ASNDetailNo);
			if (bindModel != null && string.IsNullOrWhiteSpace(bindModel.TaskNo))
			{
			bindModel.TaskNo = taskNo;
			bindModel.WareHouseNo = locate.WareHouseNo;
			bindModel.RoadwayNo = locate.RoadwayNo;
			bindModel.LocatNo = locate.LocatNo;
			Db.Updateable(bindModel).ExecuteCommand();
			}
			}
			oldTaskNo = taskNo;
			}
			else
			{
			var oldTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == oldTaskNo);
			oldTask.EndLocat = locate.LocatNo;
			oldTask.EndRoadway = locate.RoadwayNo;
			if (oldTask.IsSuccess == 0)
			{
			oldTask.IsSuccess = 1;
			oldTask.Status = "1";
			}
			Db.Updateable(oldTask).ExecuteCommand();

			var bindModel = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.Status == "2"
			&& m.PalletNo == oldTask.PalletNo && m.TaskNo == oldTaskNo);
			if (bindModel != null && string.IsNullOrWhiteSpace(bindModel.LocatNo))
			{
			bindModel.TaskNo = oldTask.TaskNo;
			bindModel.WareHouseNo = locate.WareHouseNo;
			bindModel.RoadwayNo = locate.RoadwayNo;
			bindModel.LocatNo = locate.LocatNo;
			Db.Updateable(bindModel).ExecuteCommand();
			}
			}


			locate.Status = "2";
			Db.Updateable(locate).ExecuteCommand();
			if (palletBindList.Count >= 1)
			@@ -1393,7 +1515,7 @@
			item.WareHouseNo = locate.WareHouseNo;
			item.RoadwayNo = locate.RoadwayNo;
			item.LocatNo = locate.LocatNo;
			item.TaskNo = taskNo;
			item.TaskNo = oldTaskNo;
			}
			Db.Updateable(palletBindList).ExecuteCommand();
			}
			@@ -1405,7 +1527,7 @@
			StartLocate = "", // 起始位置
			EndLocate = locate.LocatNo, // 目标位置
			EndRoadway = locate.RoadwayNo, // 目标巷道
			TaskNo = exTask.TaskNo, // 任务号
			TaskNo = oldTaskNo, // 任务号
			TaskType = "0",// 任务类型 (出库)
			OutMode = "", //目标地址
			Order = 1