JC34WMS.git - Gitblit

			@@ -22,6 +22,7 @@
			using WMS.Entity.BllAsnEntity;
			using System.Threading.Tasks;
			using Utility;
			using WMS.BLL.Logic;

			namespace WMS.BLL.BllPdaServer
			{
			@@ -118,12 +119,12 @@
			#region 拼托信息
			var sdId = 0;
			bool isNew = false;


			var pinStockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.SkuNo == stockDetail.SkuNo && m.LotNo == stockDetail.LotNo);

			if (pinStockDetail != null)
			if (pinStockDetail != null)
			{
			if (palletNo != palletNoNew)//非整托拣货
			if (palletNo != palletNoNew)//非整托拣货
			{
			var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Id!= pinStockDetail.Id).ToList();
			if (pinStockDetails.Count(m=>m.SONo != notice.SONo) > 0)
			@@ -141,7 +142,11 @@
			var newPalletInfo = await Db.Queryable<SysPallets>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Status == "0");
			if (newPalletInfo == null)
			{
			throw Oops.Bah("新托盘信息不存在或已被使用！");
			var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Id != pinStockDetail.Id).ToList();
			if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
			{
			throw Oops.Bah("新托盘信息不存在或已被使用！");
			}
			}
			//修改新托盘状态
			newPalletInfo.Status = "1";
			@@ -583,7 +588,11 @@
			var newPalletInfo = await Db.Queryable<SysPallets>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Status == "0");
			if (newPalletInfo == null)
			{
			throw Oops.Bah("新托盘信息不存在或已被使用！");
			var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Id != pinStockDetail.Id).ToList();
			if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
			{
			throw Oops.Bah("新托盘信息不存在或已被使用！");
			}
			}
			//修改新托盘状态
			newPalletInfo.Status = "1";
			@@ -871,6 +880,25 @@
			return allotList2;
			}


			public async Task<List<DetailIdSkuLotNo>> GetSoSkuLotNoListBySo(string soNo)
			{
			if (string.IsNullOrWhiteSpace(soNo))//判断托盘是否为空
			{
			throw Oops.Bah("单据为空，请选择单据");
			}
			//获取状态为待拣货或者部分拣货的出库单
			var allotList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SONo == soNo && (m.Status == "0" \|\| m.Status == "1"));

			var list = await allotList.GroupBy(m => new { m.SODetailNo, m.SkuNo, m.SkuName, m.LotNo }).Select(m => new DetailIdSkuLotNo()
			{
			SoDetailId = m.SODetailNo,
			SkuName = m.SkuName,
			LotNo = m.LotNo,
			}).ToListAsync();

			return list;
			}
			//获取出库托盘上的物料批次(根据托盘码)
			public async Task<List<DetailIdSkuLotNo>> GetSoSkuLotNoListByPallet(string palletNo, string soNo)
			{
			@@ -1770,9 +1798,8 @@
			//获取当前时间
			DateTime serverTime = Db.GetDate();
			//获取库存明细是否小于等于该垛数
			//string str = "select * from DataStockDetail where IsDel = '0' and SkuNo = '100099' and Status = '0' ";
			//var stockDetail = Db.Ado.SqlQuery<DataStockDetail>(str);
			var stockDetail = await Db.Queryable<DataStockDetail>().Where(s => s.IsDel == "0" && s.SkuNo == "100099" && s.Status == "0").ToListAsync();

			var stockDetail = await Db.Queryable<DataStockDetail>().Where(s => s.IsDel == "0" && s.SkuNo == "100099" && s.Status == "0" && !string.IsNullOrWhiteSpace(s.WareHouseNo)).ToListAsync();
			if (stockDetail.Count > 0)
			{
			//判断是否大于需要垛数
			@@ -1797,7 +1824,7 @@
			foreach (var s in stockDetail)
			{
			//获取储位信息
			var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(l => l.LocatNo == s.LocatNo && l.IsDel == "0" && l.WareHouseNo == "W02");
			var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(l => l.LocatNo == s.LocatNo && l.IsDel == "0" && (l.WareHouseNo == "W01"\|\|l.WareHouseNo == "W02"));

			if (locat == null)
			{
			@@ -1872,10 +1899,10 @@
			{
			TaskNo = taskNo,
			Sender = "WMS",
			Receiver = "PDA",
			Receiver = "WCS",
			IsSuccess = 1, //是否下发成功 0失败 1成功

			StartLocat = locat == null ? "零箱库" : s.LocatNo,//起始位置
			StartLocat = s.LocatNo,//起始位置
			EndLocat = model.OutMode,//目标位置
			PalletNo = s.PalletNo,//托盘码
			IsSend = 1,//是否可再次下发
			@@ -1886,20 +1913,28 @@
			OrderType = "1",//0 入库单 1 出库单 2 盘点单 3 移库单
			CreateTime = serverTime, //创建时间
			CreateUser = userId, //创建人
			Msg = "Pda空托从" + locat == null ? "零箱库" : s.LocatNo + "到" + model.OutMode + "的出库任务", //关键信息
			Msg = "Pda空托从" + s.LocatNo + "到" + model.OutMode + "的出库任务", //关键信息
			//FinishDate = serverTime, //完成时间
			};
			var endroad = "";
			if (locat.WareHouseNo == "W01")
			{
			endroad = new AllotLocation().RoadwayToStationNum(locat.RoadwayNo, model.OutMode);
			}

			outDtoList.Add(new OutCommandDto()
			{
			PalletNo = exTask.PalletNo,//托盘号
			StartLocate = exTask.StartLocat, // 起始位置
			StartRoadway = locat.RoadwayNo, //所属巷道
			EndLocate = "", // 目标位置
			TaskNo = exTask.TaskNo, // 任务号
			TaskType = "1",// 任务类型 (出库)
			OutMode = model.OutMode, //目标地址
			Order = 1,
			Type = PLCTypeEnum.AGV
			PalletNo = exTask.PalletNo,//托盘号

			StartLocate = exTask.StartLocat, // 起始位置
			StartRoadway = locat.RoadwayNo, //所属巷道
			EndLocate = model.OutMode, // 目标位置
			EndRoadway = endroad,

			Order = 999,
			Type = locat.WareHouseNo == "W01"?PLCTypeEnum.ShuttleCar : PLCTypeEnum.AGV
			});
			await Db.Insertable(exTask).ExecuteCommandAsync();

			@@ -1926,17 +1961,17 @@
			var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss")

			////解析返回数据
			var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
			if (wcsModel.StatusCode == 0)
			var wcsModel = JsonConvert.DeserializeObject<WcsModel2>(response);
			if (wcsModel.code == 200)
			{
			//更改任务的发送返回时间//
			new TaskServer().EditTaskIssueOk(list2, time1, time2);
			//str += "下发成功";
			}
			if (wcsModel.StatusCode == -1)
			else
			{
			new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.Msg);
			throw Oops.Bah(wcsModel.Msg);
			new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.message);
			throw Oops.Bah(wcsModel.message);
			}
			}
			catch (AppFriendlyException e)
			@@ -1960,7 +1995,7 @@
			catch (Exception e)
			{
			Db.RollbackTran();
			return e.Message;
			throw new Exception(e.Message);
			}

			}