JC34WMS.git - Gitblit

			@@ -1509,6 +1509,9 @@
			{
			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" };
			@@ -1579,10 +1582,179 @@
			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);
			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)
			@@ -5129,9 +5301,6 @@

			return data;
			}



			#endregion

			}