JC34WMS.git - Gitblit

			@@ -1475,7 +1475,7 @@
			}
			}

			//车间pda拣货
			//车间pda拣货 - 标签
			public async Task ChejianPick(string palletNo, string boxNo, int userId)
			{
			Db.BeginTran();
			@@ -1489,7 +1489,7 @@
			}
			if (string.IsNullOrEmpty(boxNo))
			{
			throw Oops.Bah("追溯条码和拣货数量不能同时输入");
			throw Oops.Bah("箱码不可为空");
			}

			//箱码明细
			@@ -1502,26 +1502,34 @@
			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);
			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("未查询到该托盘分配的库存明细信息！");
			}

			// 验证是否车间线边仓库
			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);
			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();


			//删除或修改库存明细
			@@ -1558,6 +1566,7 @@
			{
			await Db.Updateable(stock).ExecuteCommandAsync();
			}

			var num2 = await Db.Queryable<DataStockDetail>().CountAsync(m => m.IsDel == "0" && m.PalletNo == palletNo);
			if (num2 <= 0)
			{
			@@ -1572,7 +1581,8 @@
			}

			//添加操作日志记录
			var k = new OperationSOServer().AddLogOperationSo("PDA模块", "车间出库", boxNo, "拣货", $"在PDA上对箱号为：{boxNo}的托盘码为：{palletNo}的拣货操作", userId);
			var k = new OperationSOServer().AddLogOperationSo("PDA模块", "车间出库",
			boxNo, "拣货", $"在PDA上对箱号为：{boxNo}的托盘码为：{palletNo}的拣货操作", userId);
			Db.CommitTran();
			}
			catch (AppFriendlyException e)
			@@ -2040,7 +2050,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)
			{
			@@ -2112,14 +2122,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();
			@@ -2541,7 +2557,9 @@
			{
			stockDetail.Status = "0";
			}
			if (stockDetail.Qty <= 0)
			//判断托盘上还有没有其他物料
			var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && w.Id != stockDetail.Id);
			if (stockDetail.Qty <= 0 && palletData == null)
			{
			await Db.Deleteable(stockDetail).ExecuteCommandAsync();
			}
			@@ -2642,6 +2660,7 @@
			throw Oops.Bah("需要垛数大于库存垛数，请重新输入!");
			}
			}
			stockDetail = new AllotSku().GetDataListOrder(stockDetail);
			//获取库存总表信息
			var stock = await Db.Queryable<DataStock>().FirstAsync(s => s.IsDel == "0" && s.SkuNo == "100099");
			//验证库存总表是否为空
			@@ -2745,7 +2764,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, //完成时间