JC34WMS.git - Gitblit

			@@ -29,6 +29,7 @@
			using Model.ModelVm.SysVm;
			using System.Security.Cryptography.X509Certificates;
			using AutoMapper.Configuration.Annotations;
			using Utility;

			namespace WMS.BLL.BllPdaServer
			{
			@@ -2452,7 +2453,7 @@
			}
			}


			// 车间绑定托盘-贴标
			public void ChejianIn(string palletNo,string boxNo,decimal qty,string areaNo,int userId)
			{
			try
			@@ -2643,6 +2644,22 @@
			//添加库存箱码明细
			Db.Insertable(box2).ExecuteCommand();
			#endregion

			#region 插入车间出入库记录表
			//插入入库日志
			var _log = new LogWorkShop
			{
			Type = "0",//类型，0：入库 1：出库
			PalletNo = palletNo,
			BoxNo=box.BoxNo,
			LotNo=box.LotNo,
			SkuNo=box.SkuNo,
			SkuName=box.SkuName,
			Qty=box.Qty
			};
			//添加库存箱码明细
			Db.Insertable(_log).ExecuteCommand();
			#endregion
			}
			if (boxFullQty > bNum)
			{
			@@ -2651,7 +2668,6 @@
			}
			//更改箱支关系表信息
			Db.Updateable(boxInfoList).ExecuteCommand();


			#region 库存
			var dataStock = Db.Queryable<DataStock>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == boxInfoOne.LotNo);
			@@ -2681,11 +2697,12 @@
			}
			#endregion


			// 更改托盘使用状态
			var sqlStr = $"update SysPallets set Status = '1' where PalletNo = '{palletNo}';";
			////添加托盘记录表数据
			//sqlStr += $"insert into LogPalletTrack values('{palletNo}','{boxNo}','组盘','0',getDate(),{userId},NULL,NULL);";
			//Db.Ado.ExecuteCommand(sqlStr);
			Db.Ado.ExecuteCommand(sqlStr);
			new OperationASNServer().AddLogOperationAsn("PDA模块", "车间入库", boxNo, "添加", $"添加了托盘码为：{palletNo}、{msgStr}的入库信息", userId);

			//提交事务
			@@ -2751,8 +2768,6 @@
			new Common().GetPackQtyInfo(pack.PackagNo, ref pNum, ref bNum);

			#endregion



			#region 库存明细

			@@ -2827,7 +2842,6 @@
			// 更改箱支关系表
			decimal factQty = 0.00m;//托盘总数量


			#region 库存
			var dataStock = Db.Queryable<DataStock>().First(m => m.IsDel == "0" && m.SkuNo == skuInfo.SkuNo && m.LotNo == lotNo);
			if (dataStock != null)
			@@ -2856,6 +2870,21 @@
			}
			#endregion

			#region
			//插入入库日志
			var _log = new LogWorkShop
			{
			Type = "0",//类型，0：入库 1：出库
			PalletNo = palletNo,
			BoxNo = "",
			LotNo = lotNo,
			SkuNo = sd1.SkuNo,
			SkuName = sd1.SkuName,
			Qty = qty
			};
			//添加库存箱码明细
			Db.Insertable(_log).ExecuteCommand();
			#endregion
			// 更改托盘使用状态
			var sqlStr = $"update SysPallets set Status = '1' where PalletNo = '{palletNo}';";
			////添加托盘记录表数据
			@@ -6045,9 +6074,12 @@
			{
			foreach (var item in stockDetail)
			{
			if (!string.IsNullOrEmpty(item.WareHouseNo))
			if (!string.IsNullOrEmpty(item.WareHouseNo) && !string.IsNullOrEmpty(item.AreaNo))
			{
			throw new Exception("该托盘未在库外，请核查!");
			if (item.AreaNo != "B06" && item.AreaNo != "B07" && item.AreaNo != "B09")
			{
			throw new Exception("该托盘未在库外，请核查!");
			}
			}
			}
			iscount = 1; //回流入库
			@@ -6484,6 +6516,113 @@
			}
			#endregion

			#region 仓库收货
			/// <summary>
			/// 仓库确认收货
			/// </summary>
			/// <param name="model"></param>
			public void ConfirmTakeOf(string palletNo,int userId)
			{
			try
			{
			#region 验证信息
			if (string.IsNullOrEmpty(palletNo))
			{
			throw new Exception("托盘条码不能为空!");
			}

			//获取托盘信息
			var pallet = Db.Queryable<SysPallets>().First(w => w.IsDel == "0" && w.PalletNo == palletNo);
			//验证托盘信息是否为空
			if (pallet == null)
			{
			throw new Exception("托盘信息不存在，请检查!");
			}
			if (pallet.Status == "0")
			{
			throw new Exception("托盘未使用，请检查!");
			}
			#endregion

			//获取库存明细信息
			var stockDetailList = Db.Queryable<DataStockDetail>().Where(s => s.IsDel == "0" && s.PalletNo == palletNo).ToList();
			//验证库存明细信息是否存在
			if (stockDetailList.Count<=0)
			{
			throw new Exception("库存明细不存在，请检查库存信息!");
			}
			//开启事务
			Db.BeginTran();

			foreach (var item in stockDetailList)
			{
			if (item.AreaNo != "B06" && item.AreaNo != "B07" && item.AreaNo != "B09")
			{
			throw new Exception("该托盘非线边回库托盘!");
			}
			//库存总表
			var stock = Db.Queryable<DataStock>().First(w => w.IsDel == "0" && w.SkuNo == item.SkuNo && w.LotNo == item.LotNo);
			if (stock == null)
			{
			throw new Exception($"未查询到该托盘上物料编码为:{item.SkuNo}的库存信息!");
			}

			var boxInfoList = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.PalletNo == palletNo && w.SkuNo == item.SkuNo && w.LotNo == item.LotNo).ToList();
			if (boxInfoList.Count > 0)
			{
			foreach (var box in boxInfoList)
			{
			var bllBox = Db.Queryable<BllBoxInfo>().First(w => w.IsDel == "0" && w.Status != "0" && w.BoxNo == box.BoxNo);
			if (bllBox != null)
			{
			bllBox.Status = "0";
			bllBox.ASNDetailNo = null;
			bllBox.BindNo = null;
			bllBox.PalletNo = "";
			//更新箱支明细表
			Db.Updateable(bllBox).ExecuteCommand();
			}
			}
			//删除库存箱码信息
			Db.Deleteable(boxInfoList).ExecuteCommand();
			}

			//删除或修改库存
			stock.Qty -= (decimal)item.Qty;
			if (stock.Qty <= 0)
			{
			Db.Deleteable(stock).ExecuteCommand();
			}
			else
			{
			Db.Updateable(stock).ExecuteCommand();
			}
			//删除库存明细
			Db.Deleteable(item).ExecuteCommand();

			//判断托盘上还有没有其他物料
			var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && w.Id != item.Id);
			if (palletData == null)
			{
			pallet.Status = "0";
			Db.Updateable(pallet).ExecuteCommand();
			}
			}

			new OperationASNServer().AddLogOperationAsn("PDA模块", "仓库收货", palletNo, "完成", $"在PDA上完成托盘码为：{palletNo}的仓库收货操作", userId);

			//提交事务
			Db.CommitTran();
			}
			catch (Exception ex)
			{
			//回滚事务
			Db.RollbackTran();
			throw ex;
			}
			}
			#endregion

			#region JC23取样业务接口

			//获取未组托或已组托的箱码级别