JC34WMS.git - Gitblit

			@@ -23,6 +23,7 @@
			using System.Threading.Tasks;
			using Utility;
			using WMS.BLL.Logic;
			using System.Web;

			namespace WMS.BLL.BllPdaServer
			{
			@@ -92,7 +93,7 @@
			}
			//出库分配信息
			var allot = await Db.Queryable<BllExportAllot>().FirstAsync(m =>
			m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3") && m.SONo == soNo &&
			m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3" \|\| m.Status == "5") && m.SONo == soNo &&
			m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo);
			if (allot == null)
			{
			@@ -119,12 +120,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)
			@@ -142,11 +143,19 @@
			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.SkuNo != stockDetail.SkuNo \|\| m.LotNo != stockDetail.LotNo)).ToList();
			if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
			{
			throw Oops.Bah("新托盘信息不存在或已被使用！");
			}
			}
			//修改新托盘状态
			newPalletInfo.Status = "1";
			await Db.Updateable(newPalletInfo).ExecuteCommandAsync();
			else
			{
			//修改新托盘状态
			newPalletInfo.Status = "1";
			await Db.Updateable(newPalletInfo).ExecuteCommandAsync();
			}

			}

			var sd = new DataStockDetail();
			@@ -208,10 +217,10 @@
			throw Oops.Bah("该托盘上没有可拣货的箱子");
			}
			var boxQty = await boxInfo.GroupBy(m => m.PalletNo).Select(m => SqlFunc.AggregateSum(m.Qty)).ToListAsync();
			if (boxQty[0] > needQty)
			{
			throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
			}
			//if (boxQty[0] > needQty)
			//{
			// throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
			//}

			var comDetailList = await Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToListAsync();
			var comList = new List<BllCompleteDetail>();
			@@ -265,7 +274,7 @@
			await Db.Insertable(comList).ExecuteCommandAsync();
			//修改出库分配信息
			allot.CompleteQty += pickQty;
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			await Db.Updateable(allot).ExecuteCommandAsync();

			@@ -314,7 +323,7 @@
			else
			{
			List<DataBoxInfo> boxInfos;
			var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);
			var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo && m.Status == "2");
			if (await boxInfo.CountAsync() == 0)
			{
			throw Oops.Bah("未查询到该箱码的信息");
			@@ -329,10 +338,10 @@
			throw Oops.Bah("该托盘与箱码没有绑定关系");
			}
			var boxQty = await boxInfo.GroupBy(m => m.BoxNo).Select(m => SqlFunc.AggregateSum(m.Qty)).ToListAsync();
			if (boxQty[0] > needQty)
			{
			throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
			}
			//if (boxQty[0] > needQty)
			//{
			// throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
			//}

			foreach (var item in boxInfos)
			{
			@@ -388,7 +397,7 @@
			await Db.Insertable(comList).ExecuteCommandAsync();
			//修改出库分配信息
			allot.CompleteQty += pickQty;
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;

			await Db.Updateable(allot).ExecuteCommandAsync();
			@@ -397,6 +406,10 @@
			stockDetail.BitPalletMark = "1";//修改为零托标识
			stockDetail.Qty -= pickQty;
			stockDetail.LockQty -= pickQty;
			if (stockDetail.LockQty < 0)
			{
			stockDetail.LockQty = 0;
			}
			stockDetail.UDF5 = "1";
			if (stockDetail.Qty == stockDetail.LockQty)
			{
			@@ -454,9 +467,10 @@

			if (isNew)
			{
			sd.Qty = pickQty;
			sd.LockQty = pickQty;
			await Db.Updateable(sd).ExecuteCommandAsync();
			var sdnew = Db.Queryable<DataStockDetail>().First(m => m.Id == sdId);
			sdnew.Qty = pickQty;
			sdnew.LockQty = pickQty;
			await Db.Updateable(sdnew).ExecuteCommandAsync();
			}
			else
			{
			@@ -584,11 +598,18 @@
			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.SkuNo != stockDetail.SkuNo && m.LotNo != stockDetail.LotNo)).ToList();
			if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
			{
			throw Oops.Bah("新托盘信息不存在或已被使用！");
			}
			}
			//修改新托盘状态
			newPalletInfo.Status = "1";
			await Db.Updateable(newPalletInfo).ExecuteCommandAsync();
			else
			{
			//修改新托盘状态
			newPalletInfo.Status = "1";
			await Db.Updateable(newPalletInfo).ExecuteCommandAsync();
			}
			}

			if (isNew)
			@@ -715,7 +736,7 @@

			//修改出库分配信息
			allot.CompleteQty += int.Parse(PickQty);
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			await Db.Updateable(allot).ExecuteCommandAsync();

			@@ -1459,6 +1480,333 @@
			}
			}

			//车间pda拣货 - 标签
			public async Task ChejianPick(string palletNo, string boxNo, int userId)
			{
			Db.BeginTran();
			try
			{
			#region 判断

			if (string.IsNullOrWhiteSpace(palletNo))
			{
			throw Oops.Bah("托盘码不能为空");
			}
			if (string.IsNullOrEmpty(boxNo))
			{
			throw Oops.Bah("箱码不可为空");
			}

			//箱码明细
			List<DataBoxInfo> boxInfos;
			var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);
			if (await boxInfo.CountAsync() == 0)
			{
			throw Oops.Bah("未查询到该箱码及追溯码的信息");
			}
			boxInfos = await boxInfo.ToListAsync();

			//库存明细
			var stockDetail = await Db.Queryable<DataStockDetail>()
			.FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNo
			&& m.SkuNo == boxInfos.First().SkuNo && m.LotNo == boxInfos.First().LotNo);
			if (stockDetail == null)
			{
			throw Oops.Bah("未查询到该托盘分配的库存明细信息！");
			}
			string lotNpstr = boxInfos.First().LotNo;
			string skuNo = boxInfos.First().SkuNo;
			string skuName = boxInfos.First().SkuName;

			// 验证是否车间线边仓库
			var areaList = new List<string>() { "B06", "B07", "B09" };
			if (!areaList.Contains(stockDetail.AreaNo))
			{
			throw Oops.Bah("托盘不是车间托盘！");
			}

			//库存总表
			var stock = await Db.Queryable<DataStock>()
			.FirstAsync(a => a.IsDel == "0" && a.SkuNo == stockDetail.SkuNo && a.LotNo == stockDetail.LotNo);
			if (stock == null)
			{
			throw Oops.Bah("未查询到该托盘分配的库存信息！");
			}
			#endregion

			var pickQty = boxInfos.Sum(m => m.Qty);

			// 删除箱任务
			await Db.Deleteable(boxInfos).ExecuteCommandAsync();


			//删除或修改库存明细
			stockDetail.BitPalletMark = "1";//修改为零托标识
			stockDetail.Qty -= pickQty;
			if (stockDetail.Qty == stockDetail.LockQty)
			{
			stockDetail.Status = "2";
			}
			else if (stockDetail.Qty > stockDetail.LockQty && stockDetail.LockQty > 0)
			{
			stockDetail.Status = "1";
			}
			else
			{
			stockDetail.Status = "0";
			}

			if (stockDetail.Qty <= 0)
			{
			await Db.Deleteable(stockDetail).ExecuteCommandAsync();
			}
			else
			{
			await Db.Updateable(stockDetail).ExecuteCommandAsync();
			}
			stock.Qty -= pickQty;
			//stock.LockQty -= pickQty;
			if (stock.Qty <= 0)
			{
			await Db.Deleteable(stock).ExecuteCommandAsync();
			}
			else
			{
			await Db.Updateable(stock).ExecuteCommandAsync();
			}

			var num2 = await Db.Queryable<DataStockDetail>().CountAsync(m => m.IsDel == "0" && m.PalletNo == palletNo);
			if (num2 <= 0)
			{
			//改变托盘状态
			var pallet = await Db.Queryable<SysPallets>().FirstAsync(m => m.PalletNo == palletNo && m.IsDel == "0");
			if (pallet == null)
			{
			throw Oops.Bah("未在托盘表中查询到托盘信息");
			}
			pallet.Status = "0";
			await Db.Updateable(pallet).ExecuteCommandAsync();
			}

			#region 插入车间出入库记录表
			//插入入库日志
			var _log = new LogWorkShop
			{
			Type = "1",//类型，0：入库 1：出库
			PalletNo = palletNo,
			BoxNo = boxNo,
			LotNo = lotNpstr,
			SkuNo = skuNo,
			SkuName = skuName,
			Qty = pickQty
			};
			// 插入车间出库记录
			Db.Insertable(_log).ExecuteCommand();
			#endregion


			//添加操作日志记录
			var k = new OperationSOServer().AddLogOperationSo("PDA模块", "车间出库",
			boxNo, "出库", $"在PDA上对箱号为：{boxNo}的托盘码为：{palletNo}的拣货操作", userId);
			Db.CommitTran();
			}
			catch (AppFriendlyException e)
			{
			Db.RollbackTran();
			}
			catch (Exception e)
			{
			Db.RollbackTran();
			throw new Exception(e.Message);
			}
			}

			// 车间Pda拣货-数量
			public async Task ChejianPickNum(PdaSoVm model, int userId)
			{
			Db.BeginTran();
			try
			{
			#region 判断

			if (string.IsNullOrWhiteSpace(model.PalletNo))
			{
			throw Oops.Bah("托盘码不能为空");
			}
			if (string.IsNullOrWhiteSpace(model.SkuNo))
			{
			throw Oops.Bah("物料编码不能为空");
			}

			decimal skuNum = 0;
			if (string.IsNullOrEmpty(model.PickQty))
			{
			throw Oops.Bah("物料数量不可为null");
			}
			else
			{
			skuNum = decimal.Parse(model.PickQty);
			if (skuNum <= 0)
			{
			throw Oops.Bah("物料数量应大于0！");
			}
			}

			// 判断是否贴标物料
			var skuModel = await Db.Queryable<SysMaterials>().FirstAsync(m => m.IsDel == "0" && m.SkuNo == model.SkuNo);
			if (skuModel == null)
			{
			throw Oops.Bah("物料不存在，请检查物料编码是否拯却！");
			}
			else
			{
			if (skuModel.IsPasteCode != "0")
			{
			throw Oops.Bah("该物料为贴标物料，请到标签页面拣货！");
			}
			}


			//库存明细
			var stockDetail = await Db.Queryable<DataStockDetail>()
			.FirstAsync(m => m.IsDel == "0" && m.PalletNo == model.PalletNo
			&& m.SkuNo == model.SkuNo && m.LotNo == model.LotNo);
			if (stockDetail == null)
			{
			throw Oops.Bah("未查询到该托盘上货物的库存明细信息！");
			}

			// 验证是否车间线边仓库
			var areaList = new List<string>() { "B06", "B07", "B09" };
			if (!areaList.Contains(stockDetail.AreaNo))
			{
			throw Oops.Bah("托盘不是车间托盘！");
			}

			//库存总表
			var stock = await Db.Queryable<DataStock>()
			.FirstAsync(a => a.IsDel == "0" && a.SkuNo == stockDetail.SkuNo && a.LotNo == stockDetail.LotNo);
			if (stock == null)
			{
			throw Oops.Bah("未查询到该托盘上货物的库存信息！");
			}
			#endregion

			var pickQty = skuNum;

			//删除或修改库存明细
			stockDetail.BitPalletMark = "1";//修改为零托标识
			stockDetail.Qty -= pickQty;
			if (stockDetail.Qty == stockDetail.LockQty)
			{
			stockDetail.Status = "2";
			}
			else if (stockDetail.Qty > stockDetail.LockQty && stockDetail.LockQty > 0)
			{
			stockDetail.Status = "1";
			}
			else
			{
			stockDetail.Status = "0";
			}

			if (stockDetail.Qty <= 0)
			{
			await Db.Deleteable(stockDetail).ExecuteCommandAsync();
			}
			else
			{
			await Db.Updateable(stockDetail).ExecuteCommandAsync();
			}
			stock.Qty -= pickQty;
			if (stock.Qty <= 0)
			{
			await Db.Deleteable(stock).ExecuteCommandAsync();
			}
			else
			{
			await Db.Updateable(stock).ExecuteCommandAsync();
			}

			var num2 = await Db.Queryable<DataStockDetail>().CountAsync(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
			if (num2 <= 0)
			{
			//改变托盘状态
			var pallet = await Db.Queryable<SysPallets>().FirstAsync(m => m.PalletNo == model.PalletNo && m.IsDel == "0");
			if (pallet == null)
			{
			throw Oops.Bah("未在托盘表中查询到托盘信息");
			}
			pallet.Status = "0";
			await Db.Updateable(pallet).ExecuteCommandAsync();
			}

			#region 插入车间出入库记录表
			// 创建实体
			var _log = new LogWorkShop
			{
			Type = "1",//类型，0：入库 1：出库
			PalletNo = model.PalletNo,
			BoxNo = "",
			LotNo = model.LotNo,
			SkuNo = skuModel.SkuNo,
			SkuName = skuModel.SkuName,
			Qty = pickQty
			};
			// 插入车间出库记录
			Db.Insertable(_log).ExecuteCommand();
			#endregion

			//添加操作日志记录
			var k = new OperationSOServer().AddLogOperationSo("PDA模块", "车间出库",
			skuModel.SkuName, "拣货", $"在PDA车间出库页上对：：{skuModel.SkuName}的物料进行拣货操作", userId);
			Db.CommitTran();
			}
			catch (AppFriendlyException e)
			{
			Db.RollbackTran();
			}
			catch (Exception e)
			{
			Db.RollbackTran();
			throw new Exception(e.Message);
			}
			}

			/// <summary>
			/// 根据箱码获取标签箱码信息（车间入库-获取WMS生成的箱信息）
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			public List<BoxInfoDto> GetWmsBoxInfos(string boxNo)
			{
			try
			{
			if (string.IsNullOrEmpty(boxNo))
			{
			throw new Exception("请扫描外箱条码!");
			}

			string sqlString = $@"SELECT BoxNo, SkuNo, SkuName, LotNo FROM DataBoxInfo
			WHERE IsDel = '0' and BoxNo = '{boxNo}'
			GROUP BY BoxNo,SkuNo,SkuName,LotNo; ";
			var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);

			if (models.Count != 0)
			{
			return models;
			}
			else
			{
			throw new Exception("没有查询到箱码信息");
			}

			}
			catch (Exception ex)
			{
			throw ex;
			}
			}

			#endregion

			@@ -1505,7 +1853,7 @@
			return allotList;
			}
			//获取状态为待拣货或者部分拣货的出库单
			var allotList2 = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3") && m.PalletNo == palletNo).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
			var allotList2 = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3" \|\| m.Status == "5") && m.PalletNo == palletNo).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();

			//var allotList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToList();
			//获取出库单据不为待拣货执行完毕订单关闭等待执行的单据
			@@ -1513,6 +1861,27 @@

			return allotList2;
			}


			//获取托盘中含有的执行中的单据
			public async Task<List<string>> GetPalletListBySo(string soNo, string soDetailId)
			{
			if (string.IsNullOrWhiteSpace(soNo))//判断托盘是否为空
			{
			throw Oops.Bah("出库单为空，请选择出库单");
			}
			if (string.IsNullOrWhiteSpace(soDetailId))
			{
			throw Oops.Bah("出库明细为空，请选择物料-批次");
			}

			var allotList = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.Status == "0" && m.SONo == soNo && m.SODetailNo == int.Parse(soDetailId)).Select(m => m.PalletNo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
			return allotList;


			}



			//获取托盘中含有的执行中的单据
			public async Task<List<string>> GetRunNoticeList(string type)
			@@ -1559,7 +1928,7 @@
			throw Oops.Bah("托盘码为空，请输入托盘码");
			}
			//获取状态为待拣货或者部分拣货的出库单
			var allotList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3") && m.PalletNo == palletNo);
			var allotList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3" \|\| m.Status == "5") && m.PalletNo == palletNo);
			//var allotList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SONo == soNo && m.Status != "4" && m.Status != "5");
			if (!string.IsNullOrWhiteSpace(soNo))
			{
			@@ -1581,7 +1950,7 @@
			//获取出库口、规格、待拣及已拣数量（根据出库单明细ID、托盘号）
			public async Task<OutPdaInfo> GetOutlets(string soDetailId, string palletNo)
			{
			var allotInfo = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo && (m.Status == "2" \|\| m.Status == "3")).ToListAsync();
			var allotInfo = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo && (m.Status == "2" \|\| m.Status == "3" \|\| m.Status == "5")).ToListAsync();
			if (allotInfo.Count == 0)
			{
			throw Oops.Bah($"{palletNo}托盘上未查询到分配信息，请核实");
			@@ -1665,7 +2034,7 @@
			}
			if (!string.IsNullOrWhiteSpace(soDetailId))
			{
			var allotInfos = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo && (m.Status == "2" \|\| m.Status == "3")).ToListAsync();
			var allotInfos = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo && (m.Status == "2" \|\| m.Status == "3" \|\| m.Status == "5")).ToListAsync();
			if (allotInfos.Count == 0)
			{
			throw Oops.Bah($"{palletNo}托盘上未查询到分配信息，请核实");
			@@ -1723,6 +2092,49 @@
			}

			return list;
			}

			/// <summary>
			/// 出库拣货获取扫描标签数量
			/// </summary>
			/// <param name="palletNo"></param>
			/// <param name="boxNo"></param>
			/// <returns></returns>
			/// <exception cref="Exception"></exception>
			public decimal CheckBoxForPick(string palletNo ,string boxNo)
			{
			try
			{
			decimal boxNum = 0;
			if (string.IsNullOrEmpty(palletNo))
			{
			throw new Exception("托盘条码不可为空!");
			}
			if (string.IsNullOrEmpty(boxNo))
			{
			throw new Exception("标签条码不可为空!");
			}
			var boxInfo = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.BoxNo == boxNo && w.PalletNo == palletNo).ToList();
			if (boxInfo.Count <= 0)
			{
			boxInfo = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.BoxNo2 == boxNo && w.PalletNo == palletNo).ToList();
			if (boxInfo.Count <= 0)
			{
			boxInfo = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.BoxNo3 == boxNo && w.PalletNo == palletNo).ToList();
			}
			}
			if (boxInfo == null \|\| boxInfo.Count <= 0)
			{
			throw new Exception("标签条码未在该托盘内!");
			}
			boxNum = boxInfo.Sum(s => s.Qty);

			return boxNum;
			}
			catch (Exception ex)
			{
			throw new Exception(ex.Message);
			}
			}

			//获取库内无箱码的托盘分配信息
			@@ -1819,7 +2231,7 @@
			{
			throw Oops.Bah("未查询到该出库单的信息");
			}
			if (notice.Status != "3")
			if (notice.Status != "3" && notice.Status != "4")
			{
			throw Oops.Bah("出库单的状态不是正在执行，不能拣货");
			}
			@@ -1832,7 +2244,7 @@
			}
			//出库分配信息
			var allot = await Db.Queryable<BllExportAllot>().FirstAsync(m =>
			m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3") && m.SONo == soNo &&
			m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3" \|\| m.Status == "5") && m.SONo == soNo &&
			m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo);
			if (allot == null)
			{
			@@ -1858,7 +2270,7 @@
			if (string.IsNullOrWhiteSpace(boxNo))//整托拣货
			{
			List<DataBoxInfo> boxInfos;
			var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo);//找到托盘上所有箱码
			var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo && m.SkuNo == stockDetail.SkuNo && m.LotNo == stockDetail.LotNo);//找到托盘上所有箱码
			boxInfos = await boxInfo.ToListAsync();
			if (boxInfo.Count() <= 0)
			{
			@@ -1914,7 +2326,7 @@
			await Db.Insertable(comList).ExecuteCommandAsync();
			//修改出库分配信息
			allot.CompleteQty += pickQty;
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			await Db.Updateable(allot).ExecuteCommandAsync();
			//删除库存明细
			@@ -1922,6 +2334,10 @@
			//删除或修改库存
			stock.Qty -= pickQty;
			stock.LockQty -= pickQty;
			if (stock.LockQty < 0)
			{
			stock.LockQty = 0;
			}
			if (stock.Qty <= 0)
			{
			await Db.Deleteable(stock).ExecuteCommandAsync();
			@@ -1930,14 +2346,20 @@
			{
			await Db.Updateable(stock).ExecuteCommandAsync();
			}
			//改变托盘状态为：未使用
			var pallet = Db.Queryable<SysPallets>().First(m => m.PalletNo == palletNo && m.IsDel == "0");
			if (pallet == null)
			//判断托盘上还有没有其他物料
			var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && w.Id != stockDetail.Id);
			if (palletData == null)
			{
			throw Oops.Bah("未在托盘表中查询到托盘信息");
			//改变托盘状态为：未使用
			var pallet = Db.Queryable<SysPallets>().First(m => m.PalletNo == palletNo && m.IsDel == "0");
			if (pallet == null)
			{
			throw Oops.Bah("未在托盘表中查询到托盘信息");
			}
			pallet.Status = "0";
			await Db.Updateable(pallet).ExecuteCommandAsync();
			}
			pallet.Status = "0";
			await Db.Updateable(pallet).ExecuteCommandAsync();

			//修改出库单明细拣货数量
			noticeDetail.CompleteQty += pickQty;
			await Db.Updateable(noticeDetail).ExecuteCommandAsync();
			@@ -1997,10 +2419,10 @@
			throw Oops.Bah("该托盘与箱码没有绑定关系");
			}
			var boxQty = boxInfos.First().Qty;
			if (boxQty > needQty)
			{
			throw Oops.Bah("拣货数量不能大于剩余待拣数量");
			}
			//if (boxQty > needQty)
			//{
			// throw Oops.Bah("拣货数量不能大于剩余待拣数量");
			//}

			foreach (var item in boxInfos)
			{
			@@ -2023,10 +2445,10 @@
			{
			throw Oops.Bah("拣货数量不能大于箱内数量");
			}
			if (Convert.ToInt32(pickQty1) > needQty)
			{
			throw Oops.Bah("拣货数量不能大于剩余待拣数量");
			}
			//if (Convert.ToInt32(pickQty1) > needQty)
			//{
			// throw Oops.Bah("拣货数量不能大于剩余待拣数量");
			//}

			biaoShi = "2";
			}
			@@ -2041,10 +2463,10 @@
			throw Oops.Bah("该托盘与箱码没有绑定关系");
			}
			var boxQty = await boxInfo.GroupBy(m => m.BoxNo).Select(m => SqlFunc.AggregateSum(m.Qty)).ToListAsync();
			if (boxQty[0] > needQty)
			{
			throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
			}
			//if (boxQty[0] > needQty)
			//{
			// throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
			//}

			foreach (var item in boxInfos)
			{
			@@ -2118,7 +2540,7 @@
			await Db.Insertable(comList).ExecuteCommandAsync();
			//修改出库分配信息
			allot.CompleteQty += pickQty;
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			if (allot.Status == "5")
			{
			@@ -2130,6 +2552,10 @@
			stockDetail.BitPalletMark = "1";//修改为零托标识
			stockDetail.Qty -= pickQty;
			stockDetail.LockQty -= pickQty;
			if (stockDetail.LockQty < 0)
			{
			stockDetail.LockQty = 0;
			}
			if (stockDetail.Qty == stockDetail.LockQty)
			{
			stockDetail.Status = "2";
			@@ -2153,6 +2579,10 @@
			}
			stock.Qty -= pickQty;
			stock.LockQty -= pickQty;
			if (stock.LockQty < 0)
			{
			stock.LockQty = 0;
			}
			if (stock.Qty <= 0)
			{
			await Db.Deleteable(stock).ExecuteCommandAsync();
			@@ -2206,10 +2636,10 @@
			var k = new OperationSOServer().AddLogOperationSo("PDA模块", "拣货出库", soNo, "拣货", $"在PDA上对出库单号为：{soNo}的托盘码为：{palletNo}的拣货操作", userId);
			Db.CommitTran();
			}
			catch (AppFriendlyException e)
			{
			Db.RollbackTran();
			}
			//catch (AppFriendlyException e)
			//{
			// Db.RollbackTran();
			//}
			catch (Exception e)
			{
			Db.RollbackTran();
			@@ -2217,6 +2647,515 @@
			}
			}

			/// <summary>
			/// 出库pda拣货-JC34
			/// </summary>
			/// <param name="soNo"></param>
			/// <param name="soDetailId"></param>
			/// <param name="palletNo"></param>
			/// <param name="boxNo">箱码/盒码/支码</param>
			/// <param name="pickQty1"></param>
			/// <param name="userId"></param>
			/// <returns></returns>
			/// <exception cref="Exception"></exception>
			public async Task SoSetPick34(string soNo, string soDetailId, string palletNo, string boxNo, string pickQty1, int userId)
			{
			Db.BeginTran();
			try
			{
			#region 判断

			if (string.IsNullOrWhiteSpace(soNo))
			{
			throw Oops.Bah("出库单据不能为空");
			}
			if (string.IsNullOrWhiteSpace(soDetailId))
			{
			throw Oops.Bah("出库物料-批次不能为空");
			}
			if (string.IsNullOrWhiteSpace(palletNo))
			{
			throw Oops.Bah("托盘码不能为空");
			}
			//if (!string.IsNullOrEmpty(boxNo3) && !string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)
			//{
			// throw Oops.Bah("追溯条码和拣货数量不能同时输入");
			//}

			//出库单
			var notice = await Db.Queryable<BllExportNotice>().FirstAsync(m => m.IsDel == "0" && m.SONo == soNo);
			if (notice == null)
			{
			throw Oops.Bah("未查询到该出库单的信息");
			}
			if (notice.Status != "3" && notice.Status != "4")
			{
			throw Oops.Bah("出库单的状态不是正在执行，不能拣货");
			}
			//出库单明细
			var noticeDetail = await Db.Queryable<BllExportNoticeDetail>()
			.FirstAsync(m => m.IsDel == "0" && m.Id == int.Parse(soDetailId));
			if (noticeDetail == null)
			{
			throw Oops.Bah("未查询到该出库单明细的信息");
			}
			//出库分配信息
			var allot = await Db.Queryable<BllExportAllot>().FirstAsync(m =>
			m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3" \|\| m.Status == "5") && m.SONo == soNo &&
			m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo);
			if (allot == null)
			{
			throw Oops.Bah("未查询到该托盘的分配信息");
			}
			//剩余拣货数量（待拣减去已拣）
			var needQty = allot.Qty - allot.CompleteQty;

			//库存明细
			var stockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.Id == allot.StockId);
			if (stockDetail == null)
			{
			throw Oops.Bah("未查询到该托盘分配的库存明细信息！");
			}
			//库存总表
			var stock = await Db.Queryable<DataStock>().FirstAsync(a => a.IsDel == "0" && a.SkuNo == stockDetail.SkuNo && a.LotNo == stockDetail.LotNo);
			if (stock == null)
			{
			throw Oops.Bah("未查询到该托盘分配的库存信息！");
			}
			#endregion

			if (string.IsNullOrWhiteSpace(boxNo))//整托拣货
			{
			List<DataBoxInfo> boxInfos;
			var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo && m.SkuNo == stockDetail.SkuNo && m.LotNo == stockDetail.LotNo);//找到托盘上所有箱码
			boxInfos = await boxInfo.ToListAsync();
			if (boxInfo.Count() <= 0)
			{
			throw Oops.Bah("该托盘上没有可拣货的箱子");
			}
			var boxQty = await boxInfo.GroupBy(m => m.PalletNo).Select(m => SqlFunc.AggregateSum(m.Qty)).ToListAsync();
			if (boxQty[0] > needQty)
			{
			throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
			}
			decimal pickQty = 0;//拣货的数量
			var comDetailList = await Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToListAsync();
			var comList = new List<BllCompleteDetail>();
			foreach (var item in boxInfos)
			{
			if (comDetailList.Any(m => m.BoxNo3 == item.BoxNo3) && item.BoxNo3 != null)
			{
			throw Oops.Bah($"当前{item.BoxNo}中{item.BoxNo3}已拣货完成，请勿重复拣货");
			}
			if (item.SkuNo != allot.SkuNo \|\| item.LotNo != allot.LotNo)
			{
			throw Oops.Bah("当前托盘上有其他不同物料批次，拣货失败");
			}
			//添加拣货明细
			var completeDetail = new BllCompleteDetail()
			{
			SONo = soNo,
			SODetailNo = int.Parse(soDetailId),
			ExportAllotId = allot.Id,
			StockId = allot.StockId,
			BoxNo = item.BoxNo,
			BoxNo2 = item.BoxNo2,
			BoxNo3 = item.BoxNo3,

			LotNo = allot.LotNo,
			LotText = allot.LotText,
			SupplierLot = allot.SupplierLot,
			SkuNo = allot.SkuNo,
			SkuName = allot.SkuName,
			Standard = allot.Standard,
			PalletNo = palletNo,
			CompleteQty = item.Qty,

			CreateUser = userId
			};
			comList.Add(completeDetail);

			//删除库存箱码明细
			await Db.Deleteable(item).ExecuteCommandAsync();
			pickQty += item.Qty;
			}
			//添加拣货明细
			await Db.Insertable(comList).ExecuteCommandAsync();
			//修改出库分配信息
			allot.CompleteQty += pickQty;
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			await Db.Updateable(allot).ExecuteCommandAsync();
			//删除库存明细
			await Db.Deleteable(stockDetail).ExecuteCommandAsync();
			//删除或修改库存
			stock.Qty -= pickQty;
			stock.LockQty -= pickQty;
			if (stock.LockQty < 0)
			{
			stock.LockQty = 0;
			}
			if (stock.Qty <= 0)
			{
			await Db.Deleteable(stock).ExecuteCommandAsync();
			}
			else
			{
			await Db.Updateable(stock).ExecuteCommandAsync();
			}
			//判断托盘上还有没有其他物料
			var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && w.Id != stockDetail.Id);
			if (palletData == null)
			{
			//改变托盘状态为：未使用
			var pallet = Db.Queryable<SysPallets>().First(m => m.PalletNo == palletNo && m.IsDel == "0");
			if (pallet == null)
			{
			throw Oops.Bah("未在托盘表中查询到托盘信息");
			}
			pallet.Status = "0";
			await Db.Updateable(pallet).ExecuteCommandAsync();
			}

			//修改出库单明细拣货数量
			noticeDetail.CompleteQty += pickQty;
			await Db.Updateable(noticeDetail).ExecuteCommandAsync();

			var num = await Db.Queryable<BllExportNoticeDetail>()
			.CountAsync(m => m.IsDel == "0" && m.SONo == soNo && m.CompleteQty < m.Qty);
			if (num <= 0)
			{
			notice.Status = "4"; //更改为执行完成
			//修改出库单信息
			await Db.Updateable(notice).ExecuteCommandAsync();
			if (notice.IsWave == "1")
			{
			var waveNum = await Db.Queryable<BllExportNotice>().CountAsync(m => m.IsDel == "0" && m.WaveNo == notice.WaveNo && m.Status != "4");
			if (waveNum == 0)
			{
			var wave = await Db.Queryable<BllWaveMage>().FirstAsync(m => m.IsDel == "0" && m.WaveNo == notice.WaveNo);
			if (wave != null)
			{
			wave.Status = "4";
			wave.UpdateUser = userId;
			wave.UpdateTime = DateTime.Now;
			await Db.Updateable(wave).ExecuteCommandAsync();
			}
			}
			}
			}

			}
			else
			{
			var biaoShi = "0";//0：整箱拣货、1：整盒拣货、 2：散支拣货、3：数量拣货
			List<DataBoxInfo> boxInfos;
			var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);
			if (await boxInfo.CountAsync() == 0)
			{
			biaoShi = "1";
			boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo2 == boxNo);
			if (await boxInfo.CountAsync() == 0)
			{
			biaoShi = "2";
			boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo3 == boxNo);
			if (await boxInfo.CountAsync() == 0)
			{
			throw Oops.Bah("未查询到该箱码及追溯码的信息");
			}
			}
			}
			if (biaoShi == "0" && !string.IsNullOrEmpty(pickQty1) && decimal.Parse(pickQty1) > 0)
			{
			biaoShi = "3";
			}
			if (biaoShi == "2" && !string.IsNullOrEmpty(pickQty1) && decimal.Parse(pickQty1) > 0)
			{
			throw Oops.Bah("追溯条码和拣货数量不能同时输入");
			}
			boxInfos = await boxInfo.ToListAsync();

			if (boxInfos[0].SkuNo != allot.SkuNo \|\| boxInfos[0].LotNo != allot.LotNo)
			{
			throw Oops.Bah("箱码物料批次和选择物料批次不一致！");
			}

			var comDetailList = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToList();
			if (biaoShi == "2") //散支拣货
			{
			boxInfos = boxInfos.Where(m => m.BoxNo3 == boxNo).ToList();

			if (boxInfos.Count() == 0)
			{
			throw Oops.Bah("未查询到该箱码及追溯码的信息");
			}
			if (boxInfos.Count() > 1)
			{
			throw Oops.Bah("该追溯支码的信息大于1条，信息错误，请核实！");
			}

			if (boxInfos.Any(m => m.PalletNo != palletNo))
			{
			throw Oops.Bah("该托盘与箱码没有绑定关系");
			}
			var boxQty = boxInfos.First().Qty;
			//if (boxQty > needQty)
			//{
			// throw Oops.Bah("拣货数量不能大于剩余待拣数量");
			//}

			foreach (var item in boxInfos)
			{
			if (comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
			{
			throw Oops.Bah($"当前{item.BoxNo}中{item.BoxNo3}已拣货完成，请勿重复拣货");
			}
			}
			}
			else if (biaoShi == "1")//整盒拣货
			{
			if (boxInfo.Count() == 0)
			{
			throw Oops.Bah("未查询到该盒码的信息");
			}
			if (boxInfo.Any(m => m.PalletNo != palletNo))
			{
			throw Oops.Bah("该托盘与盒码没有绑定关系");
			}
			var boxQty = await boxInfo.GroupBy(m => m.BoxNo2).Select(m => SqlFunc.AggregateSum(m.Qty)).ToListAsync();
			//if (boxQty[0] > needQty)
			//{
			// throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
			//}

			foreach (var item in boxInfos)
			{
			if (comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
			{
			throw Oops.Bah($"当前{item.BoxNo}中{item.BoxNo3}已拣货完成，请勿重复拣货");
			}
			}
			}
			else if (biaoShi == "3")//数量拣货
			{
			if (boxInfo.Count() > 1)
			{
			throw Oops.Bah("该箱码内存在支码不能进行数量拣货");
			}
			decimal boxQty = boxInfo.First().Qty;
			if (Convert.ToDecimal(pickQty1) > boxQty)
			{
			throw Oops.Bah("拣货数量不能大于箱内数量");
			}
			//if (Convert.ToInt32(pickQty1) > needQty)
			//{
			// throw Oops.Bah("拣货数量不能大于剩余待拣数量");
			//}
			}
			else //整箱拣货
			{
			if (boxInfo.Count() == 0)
			{
			throw Oops.Bah("未查询到该箱码的信息");
			}
			if (boxInfo.Any(m => m.PalletNo != palletNo))
			{
			throw Oops.Bah("该托盘与箱码没有绑定关系");
			}
			var boxQty = await boxInfo.GroupBy(m => m.BoxNo).Select(m => SqlFunc.AggregateSum(m.Qty)).ToListAsync();
			//if (boxQty[0] > needQty)
			//{
			// throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
			//}

			foreach (var item in boxInfos)
			{
			if (comDetailList.Any(m => m.BoxNo == item.BoxNo))
			{
			throw Oops.Bah($"当前{item.BoxNo}已拣货完成，请勿重复拣货");
			}
			}
			}
			decimal pickQty = 0;//拣货的数量

			var comList = new List<BllCompleteDetail>();
			foreach (var item in boxInfos)
			{
			//添加拣货明细
			var completeDetail = new BllCompleteDetail()
			{
			SONo = soNo,
			SODetailNo = int.Parse(soDetailId),
			ExportAllotId = allot.Id,
			StockId = allot.StockId,
			BoxNo = item.BoxNo,
			BoxNo2 = item.BoxNo2,
			BoxNo3 = item.BoxNo3,

			LotNo = allot.LotNo,
			LotText = allot.LotText,
			SupplierLot = allot.SupplierLot,
			SkuNo = allot.SkuNo,
			SkuName = allot.SkuName,
			Standard = allot.Standard,
			PalletNo = palletNo,
			CompleteQty = biaoShi == "3" ? decimal.Parse(pickQty1) : item.Qty,

			CreateUser = userId
			};
			comList.Add(completeDetail);

			if (biaoShi != "3")
			{
			//删除库存箱码明细
			await Db.Deleteable(item).ExecuteCommandAsync();

			pickQty += item.Qty;
			}
			else//数量拣货
			{
			if (decimal.Parse(pickQty1) == item.Qty)
			{
			//删除库存箱码明细
			await Db.Deleteable(item).ExecuteCommandAsync();
			}
			else
			{
			item.Qty -= decimal.Parse(pickQty1);
			item.BitBoxMark = "1";//零箱标识
			await Db.Updateable(item).ExecuteCommandAsync();
			}
			pickQty += decimal.Parse(pickQty1);
			}
			}
			//改变库内箱码是否零箱信息
			if (biaoShi == "1" \|\| biaoShi == "2")
			{
			var boxSurplusList = new List<DataBoxInfo>();
			if (biaoShi == "1")
			{
			boxSurplusList = boxInfo.Where(m => m.BoxNo2 != boxNo).ToList();
			}
			else
			{
			boxSurplusList = boxInfo.Where(m => m.BoxNo3 != boxNo).ToList();
			}
			foreach (var item in boxSurplusList)
			{
			item.BitBoxMark = "1";
			await Db.Updateable(item).ExecuteCommandAsync();
			}
			}

			await Db.Insertable(comList).ExecuteCommandAsync();
			//修改出库分配信息
			allot.CompleteQty += pickQty;
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			if (allot.Status == "5")
			{
			//判断该托盘是否还存在物料存在改为待回库待回库完成后改为已完成
			}
			await Db.Updateable(allot).ExecuteCommandAsync();

			//删除或修改库存明细
			stockDetail.BitPalletMark = "1";//修改为零托标识
			stockDetail.Qty -= pickQty;
			stockDetail.LockQty -= pickQty;
			if (stockDetail.LockQty < 0)
			{
			stockDetail.LockQty = 0;
			}
			if (stockDetail.Qty == stockDetail.LockQty)
			{
			stockDetail.Status = "2";
			}
			else if (stockDetail.Qty > stockDetail.LockQty && stockDetail.LockQty > 0)
			{
			stockDetail.Status = "1";
			}
			else
			{
			stockDetail.Status = "0";
			}

			if (stockDetail.Qty <= 0)
			{
			await Db.Deleteable(stockDetail).ExecuteCommandAsync();
			}
			else
			{
			await Db.Updateable(stockDetail).ExecuteCommandAsync();
			}
			stock.Qty -= pickQty;
			stock.LockQty -= pickQty;
			if (stock.LockQty < 0)
			{
			stock.LockQty = 0;
			}
			if (stock.Qty <= 0)
			{
			await Db.Deleteable(stock).ExecuteCommandAsync();
			}
			else
			{
			await Db.Updateable(stock).ExecuteCommandAsync();
			}
			var num2 = await Db.Queryable<DataStockDetail>().CountAsync(m => m.IsDel == "0" && m.PalletNo == palletNo);
			if (num2 <= 0)
			{
			//改变托盘状态
			var pallet = await Db.Queryable<SysPallets>().FirstAsync(m => m.PalletNo == palletNo && m.IsDel == "0");
			if (pallet == null)
			{
			throw Oops.Bah("未在托盘表中查询到托盘信息");
			}
			pallet.Status = "0";
			await Db.Updateable(pallet).ExecuteCommandAsync();
			}
			//修改出库单明细拣货数量
			noticeDetail.CompleteQty += pickQty;
			await Db.Updateable(noticeDetail).ExecuteCommandAsync();

			var num = await Db.Queryable<BllExportNoticeDetail>()
			.CountAsync(m => m.IsDel == "0" && m.SONo == soNo && m.CompleteQty < m.Qty);
			if (num <= 0)
			{
			notice.Status = "4"; //更改为执行完成
			//修改出库单信息
			await Db.Updateable(notice).ExecuteCommandAsync();
			if (notice.IsWave == "1")
			{
			var waveNum = await Db.Queryable<BllExportNotice>()
			.CountAsync(m => m.IsDel == "0" && m.WaveNo == notice.WaveNo && m.Status != "4");
			if (waveNum == 0)
			{
			var wave = await Db.Queryable<BllWaveMage>().FirstAsync(m => m.IsDel == "0" && m.WaveNo == notice.WaveNo);
			if (wave != null)
			{
			wave.Status = "4";
			wave.UpdateUser = userId;
			wave.UpdateTime = DateTime.Now;
			await Db.Updateable(wave).ExecuteCommandAsync();
			}
			}
			}
			}
			}
			//添加操作日志记录
			var k = new OperationSOServer().AddLogOperationSo("PDA模块", "拣货出库", soNo, "拣货", $"在PDA上对出库单号为：{soNo}的托盘码为：{palletNo}的拣货操作", userId);
			Db.CommitTran();
			}
			//catch (AppFriendlyException e)
			//{
			// Db.RollbackTran();
			//}
			catch (Exception e)
			{
			Db.RollbackTran();
			throw new Exception(e.Message);
			}
			}
			//出库pda拣货
			public async Task SoSetQtyPick(string soNo, string soDetailId, string palletNo, string PickQty, int userId)
			{
			@@ -2257,7 +3196,7 @@
			}
			//出库分配信息
			var allot = await Db.Queryable<BllExportAllot>().FirstAsync(m =>
			m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3") && m.SONo == soNo &&
			m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3" \|\| m.Status == "5") && m.SONo == soNo &&
			m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo);
			if (allot == null)
			{
			@@ -2337,7 +3276,7 @@

			//修改出库分配信息
			allot.CompleteQty += int.Parse(PickQty);
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			await Db.Updateable(allot).ExecuteCommandAsync();

			@@ -2347,6 +3286,10 @@
			stockDetail.BitPalletMark = "1";//修改为零托标识
			stockDetail.Qty -= int.Parse(PickQty);
			stockDetail.LockQty -= int.Parse(PickQty);
			if (stockDetail.LockQty < 0)
			{
			stockDetail.LockQty = 0;
			}
			if (stockDetail.Qty == stockDetail.LockQty)
			{
			stockDetail.Status = "2";
			@@ -2358,7 +3301,7 @@
			else
			{
			stockDetail.Status = "0";
			}
			}
			if (stockDetail.Qty <= 0)
			{
			await Db.Deleteable(stockDetail).ExecuteCommandAsync();
			@@ -2388,7 +3331,9 @@
			}

			//判断托盘上物料是否拣货完毕
			if (isDel == 0)
			//判断托盘上还有没有其他物料
			var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && w.Id != stockDetail.Id);
			if (isDel == 0 && palletData == null)
			{
			pallet.Status = "0";
			await Db.Updateable(pallet).ExecuteCommandAsync();
			@@ -2450,8 +3395,8 @@
			//获取当前时间
			DateTime serverTime = Db.GetDate();
			//获取库存明细是否小于等于该垛数

			var stockDetail = await Db.Queryable<DataStockDetail>().Where(s => s.IsDel == "0" && s.SkuNo == "100099" && s.Status == "0" && !string.IsNullOrWhiteSpace(s.WareHouseNo)).ToListAsync();

			var stockDetail = await Db.Queryable<DataStockDetail>().Where(s => s.IsDel == "0" && s.SkuNo == "100099" && s.Status == "0" && s.WareHouseNo == "W02").ToListAsync();
			if (stockDetail.Count > 0)
			{
			//判断是否大于需要垛数
			@@ -2460,6 +3405,7 @@
			throw Oops.Bah("需要垛数大于库存垛数，请重新输入!");
			}
			}
			//stockDetail = new AllotSku().GetDataListOrder(stockDetail);
			//获取库存总表信息
			var stock = await Db.Queryable<DataStock>().FirstAsync(s => s.IsDel == "0" && s.SkuNo == "100099");
			//验证库存总表是否为空
			@@ -2467,16 +3413,26 @@
			{
			throw Oops.Bah("库存信息不存在，请核查!");
			}

			//目标储位信息
			var endLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.OutMode);
			if (endLocat == null)
			{
			throw Oops.Bah("库存信息不存在，请核查!");
			}
			//if (endLocat.Status != "0")
			//{
			// throw Oops.Bah("目标储位不是空储位，请核查!");
			//}
			int i = 0;

			//开启事务
			Db.BeginTran();

			//遍历库存信息
			foreach (var s in stockDetail)
			{
			//获取储位信息
			var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(l => l.LocatNo == s.LocatNo && l.IsDel == "0" && (l.WareHouseNo == "W01"\|\|l.WareHouseNo == "W02"));
			var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(l => l.LocatNo == s.LocatNo && l.IsDel == "0" && l.WareHouseNo == "W02");

			if (locat == null)
			{
			@@ -2490,7 +3446,7 @@
			locat.Status = "3"; //3 出库中
			locat.UpdateTime = serverTime; //修改时间
			locat.UpdateUser = userId; //修改人
			//修改储位信息
			//修改储位信息
			await Db.Updateable(locat).ExecuteCommandAsync();

			//增加库存锁定数量
			@@ -2535,7 +3491,7 @@
			Status = "1",
			LogisticsId = 0,
			IsAdvance = "0",
			OutMode = model.OutMode,//出库口
			OutMode = model.OutMode,//出库目标储位

			CreateUser = userId,
			CreateTime = DateTime.Now
			@@ -2563,7 +3519,7 @@
			Type = "1",//任务类型 0 入库任务 1 出库任务 2 移库任务
			Status = "1",//任务状态0：等待执行1正在执行2执行完成
			OrderType = "1",//0 入库单 1 出库单 2 盘点单 3 移库单
			CreateTime = serverTime, //创建时间
			CreateTime = Db.GetDate(), //创建时间
			CreateUser = userId, //创建人
			Msg = "Pda空托从" + s.LocatNo + "到" + model.OutMode + "的出库任务", //关键信息
			//FinishDate = serverTime, //完成时间
			@@ -2586,7 +3542,7 @@
			EndRoadway = endroad,

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

			@@ -3476,7 +4432,7 @@
			await Db.Insertable(comList).ExecuteCommandAsync();
			//修改出库分配信息
			allot.CompleteQty += pickQty;
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			if (allot.Status == "5")
			{
			@@ -3489,6 +4445,10 @@
			stockDetail.InspectMark = "1"; //抽检托标识
			stockDetail.Qty -= pickQty;
			stockDetail.LockQty -= pickQty;
			if (stockDetail.LockQty < 0)
			{
			stockDetail.LockQty = 0;
			}
			if (stockDetail.Qty == stockDetail.LockQty)
			{
			stockDetail.Status = "2";
			@@ -3512,6 +4472,10 @@
			}
			stock.Qty -= pickQty;
			stock.LockQty -= pickQty;
			if (stock.LockQty < 0)
			{
			stock.LockQty = 0;
			}
			stock.IsSampling = "1";
			if (stock.Qty <= 0)
			{
			@@ -3944,7 +4908,7 @@

			//修改出库分配信息
			allot.CompleteQty += int.Parse(PickQty);
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";

			allot.UpdateTime = DateTime.Now;
			await Db.Updateable(allot).ExecuteCommandAsync();
			@@ -4269,7 +5233,7 @@
			await Db.Insertable(comList).ExecuteCommandAsync();
			//修改出库分配信息
			allot.CompleteQty += pickQty;
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			await Db.Updateable(allot).ExecuteCommandAsync();

			@@ -4480,7 +5444,7 @@
			await Db.Insertable(comList).ExecuteCommandAsync();
			//修改出库分配信息
			allot.CompleteQty += pickQty;
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			if (allot.Status == "5")
			{
			@@ -4804,7 +5768,7 @@

			//修改出库分配信息
			allot.CompleteQty += int.Parse(PickQty);
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			await Db.Updateable(allot).ExecuteCommandAsync();

			@@ -4928,9 +5892,6 @@

			return data;
			}



			#endregion

			}