JC34WMS.git - Gitblit

			@@ -12,6 +12,7 @@
			using Newtonsoft.Json;
			using SqlSugar;
			using Utility;
			using Utility.Tools;
			using WMS.BLL.LogServer;
			using WMS.DAL;
			using WMS.Entity.BllAsnEntity;
			@@ -839,23 +840,22 @@
			throw Oops.Bah("储位信息不存在,请检查!");
			}
			//目标储位信息
			var storageLocatEnd = new SysStorageLocat();
			if (!string.IsNullOrEmpty(areaNo))
			//var storageLocatEnd = new SysStorageLocat();

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


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

			StartLocat = stockDetail.LocatNo,//起始位置
			@@ -871,7 +871,7 @@

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

			//修改库存明细信息
			//stockDetail.Status = "4";//移库锁定
			@@ -894,19 +894,22 @@
			//添加操作日志记录
			var k = new OperationCrServer().AddLogOperationCr("PDA模块", "AGV转运", palletNo, "移库", $"PDA呼叫小车对托盘号：{palletNo}发起转运", userId);

			var outDto = new List<OutCommandDto>();
			outDto.Add(new OutCommandDto()
			var outDto = new List<OutCommandDto>
			{
			PalletNo = exTask.PalletNo,//托盘号
			StartLocate = exTask.StartLocat, // 起始位置
			StartRoadway = storageLocat.RoadwayNo,//其实巷道
			EndLocate = EndLocat, // 目标位置
			TaskNo = exTask.TaskNo, // 任务号
			TaskType = "2",// 任务类型 (出库)0入 1出 2移
			OutMode = "", //出库口
			Order = 1
			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();
			@@ -916,21 +919,21 @@
			try
			{
			var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")
			//response = HttpHelper.DoPost(url, jsonData, "下发给WCS出库命令", "WCS");
			response = HttpHelper.DoPost(url, jsonData, "下发给WCS出库命令", "WCS");
			var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss")

			//////解析返回数据
			//var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
			//if (wcsModel.StatusCode == 0)
			//{
			// //更改任务的发送返回时间//
			new TaskServer().EditTaskIssueOk(list2, time1, time2);
			//}
			//if (wcsModel.StatusCode == -1)
			//{
			// new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.Msg);
			// throw new Exception(wcsModel.Msg);
			//}
			//解析返回数据
			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)
			{
			@@ -1111,16 +1114,16 @@
			endLocat = locatInfo2.LocatNo;
			}

			if (string.IsNullOrEmpty(endLocat))
			{
			var locatInfo3 = storageLocatList.Where(w => w.IsDel == "0" && w.Flag == "0")
			.OrderByDescending(m => m.Layer).OrderByDescending(m => m.Column).OrderByDescending(m => m.Row).First();
			//if (string.IsNullOrEmpty(endLocat))
			//{
			// var locatInfo3 = storageLocatList.Where(w => w.IsDel == "0" && w.Flag == "0")
			// .OrderByDescending(m => m.Layer).OrderByDescending(m => m.Column).OrderByDescending(m => m.Row).First();

			if (locatInfo3 != null)
			{
			endLocat = locatInfo3.LocatNo;
			}
			}
			// if (locatInfo3 != null)
			// {
			// endLocat = locatInfo3.LocatNo;
			// }
			//}
			return endLocat;
			}
			#endregion
			@@ -1318,15 +1321,15 @@
			{
			throw new Exception("托盘没有出库单信息");
			}
			var task = Db.Queryable<LogTask>().First(m => m.PalletNo == palletNo && m.IsDel == "0" && m.Status == "5");
			if (task == null)
			{
			throw new Exception("没有查询到托盘任务信息");
			}
			if (task.Status != "5")
			{
			throw new Exception("任务状态不是等待确认");
			}
			//var task = Db.Queryable<LogTask>().First(m => m.PalletNo == palletNo && m.IsDel == "0" && m.Status == "5");
			//if (task == null)
			//{
			// throw new Exception("没有查询到托盘任务信息");
			//}
			//if (task.Status != "5")
			//{
			// throw new Exception("任务状态不是等待确认");
			//}
			return detail;
			}
			catch (Exception e)
			@@ -1346,20 +1349,26 @@
			try
			{
			Db.BeginTran();
			var task = Db.Queryable<LogTask>().First(m => m.PalletNo == palletNo && m.IsDel == "0" && m.Status == "5");
			if (task == null)
			//var task = Db.Queryable<LogTask>().First(m => m.PalletNo == palletNo && m.IsDel == "0" && m.Status == "5");
			//if (task == null)
			//{
			// throw new Exception("没有查询到托盘任务信息");
			//}
			//if (task.Status != "5")
			//{
			// throw new Exception("任务状态不是等待确认");
			//}
			////任务状态变更为执行完成
			//task.Status = "2";
			//Db.Updateable(task).ExecuteCommand();
			var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo).ToList();
			if (stockDetail.Count == 0)
			{
			throw new Exception("没有查询到托盘任务信息");
			throw new Exception("库存托盘没有信息");
			}
			if (task.Status != "5")
			{
			throw new Exception("任务状态不是等待确认");
			}
			//任务状态变更为执行完成
			task.Status = "2";
			Db.Updateable(task).ExecuteCommand();
			var locatList = Db.Queryable<SysStorageLocat>().Where(m=>m.WareHouseNo == "W04" && (m.AreaNo == "B06" \|\| m.AreaNo == "B07") && m.IsDel == "0").ToList();
			var locat = locatList.FirstOrDefault(m => m.LocatNo == task.EndLocat);
			var locate = stockDetail.First().LocatNo;
			var locatList = Db.Queryable<SysStorageLocat>().Where(m=>m.WareHouseNo == "W04" && (m.AreaNo == "B06" \|\| m.AreaNo == "B07" \|\| m.AreaNo == "B09") && m.IsDel == "0").ToList();
			var locat = locatList.FirstOrDefault(m => m.LocatNo == locate);
			//判断托盘储位是否在车间
			if (locat == null)
			{
			@@ -1368,7 +1377,7 @@
			locat.Status = "0";
			Db.Updateable(locat).ExecuteCommand();
			//判断托盘信息
			var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo).ToList();

			foreach (var item in stockDetail)
			{
			if (item.UDF5 != "1" \|\| string.IsNullOrWhiteSpace(item.SONo))
			@@ -1380,7 +1389,7 @@
			//item.RoadwayNo = "";
			//item.AreaNo = "";
			item.LocatNo = "";
			item.PalletNo = "";
			//item.PalletNo = "";
			item.LockQty = 0; // 锁定数量更为0
			item.Status = "0"; // 状态变为待分配
			var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.StockDetailId == item.Id).ToList();
			@@ -1393,15 +1402,15 @@
			}
			Db.Updateable(stockDetail).ExecuteCommand();
			//托盘变更状态
			var pallet = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNo);
			if (pallet == null)
			{
			throw new Exception("没有查询到托盘信息");
			}
			pallet.Status = "0";
			Db.Updateable(pallet).ExecuteCommand();
			//var pallet = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNo);
			//if (pallet == null)
			//{
			// throw new Exception("没有查询到托盘信息");
			//}
			//pallet.Status = "0";
			//Db.Updateable(pallet).ExecuteCommand();
			//添加操作日志
			new OperationCrServer().AddLogOperationCr("库内作业", "操作日志", palletNo, "编辑", $"车间收货：{palletNo}托盘收货", userId);
			new OperationCrServer().AddLogOperationCr("PDA模块", "车间收货", palletNo, "完成", $"车间收货：{palletNo}托盘收货", userId);
			Db.CommitTran();
			}
			catch (Exception e)