JC34WMS.git - Gitblit

			@@ -128,39 +128,8 @@
			var pNum = 0;//托盘物品数量
			var bNum = 0;//箱码物品数量

			if (pack == null)
			{
			throw new Exception("获取物料包装信息失败，请核实!");
			}
			if (pack.L5Num.HasValue)
			{
			pNum = (int)pack.L5Num;
			bNum = (int)pack.L4Num;
			}
			else if (pack.L4Num.HasValue)
			{
			pNum = (int)pack.L4Num;
			bNum = (int)pack.L3Num;
			}
			else if (pack.L3Num.HasValue)
			{
			pNum = (int)pack.L3Num;
			bNum = (int)pack.L2Num;
			}
			else if (pack.L2Num.HasValue)
			{
			pNum = (int)pack.L2Num;
			bNum = (int)pack.L1Num;
			}
			else if (pack.L1Num.HasValue)
			{
			pNum = (int)pack.L1Num;
			bNum = (int)pack.L1Num;
			}
			if (pNum == 0 \|\| bNum == 0)
			{
			throw new Exception($"绑定失败，{detail.SkuNo}物品包装未找到！");
			}
			//公共方法获取包装数量
			new Common().GetPackQtyInfo(detail.PackagNo, ref pNum, ref bNum);

			#endregion

			@@ -1123,6 +1092,7 @@
			{
			try
			{
			Db.BeginTran();
			#region 判断

			//0：成品入库 1：采购入库 3：退货入库 4：车间余料入库 8：生产退料入库
			@@ -1197,44 +1167,13 @@
			#region 包装

			var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == detail.SkuNo);
			var pack = Db.Queryable<SysPackag>().First(m => m.IsDel == "0" && m.PackagNo == detail.PackagNo); // liudl 由Sku包装编号变更为入库单明细包装编号
			//var pack = Db.Queryable<SysPackag>().First(m => m.IsDel == "0" && m.PackagNo == detail.PackagNo); // liudl 由Sku包装编号变更为入库单明细包装编号

			var pNum = 0;//托盘物品数量
			var bNum = 0;//箱码物品数量

			if (pack == null)
			{
			throw new Exception("获取物料包装失败，请核实!");
			}
			if (pack.L5Num.HasValue)
			{
			pNum = (int)pack.L5Num;
			bNum = (int)pack.L4Num;
			}
			else if (pack.L4Num.HasValue)
			{
			pNum = (int)pack.L4Num;
			bNum = (int)pack.L3Num;
			}
			else if (pack.L3Num.HasValue)
			{
			pNum = (int)pack.L3Num;
			bNum = (int)pack.L2Num;
			}
			else if (pack.L2Num.HasValue)
			{
			pNum = (int)pack.L2Num;
			bNum = (int)pack.L1Num;
			}
			else if (pack.L1Num.HasValue)
			{
			pNum = (int)pack.L1Num;
			bNum = (int)pack.L1Num;
			}
			if (pNum == 0 \|\| bNum == 0)
			{
			throw new Exception($"绑定失败，{detail.SkuNo}物品包装未找到！");
			}
			//公共方法获取包装数量
			new Common().GetPackQtyInfo(detail.PackagNo, ref pNum, ref bNum);


			#endregion

			@@ -1330,10 +1269,16 @@
			{
			tags = "1";
			}

			//验证库存托盘是否有贴标物料
			var skuStr = Db.Queryable<SysMaterials>().Where(m => m.IsDel == "0" && m.IsPasteCode == "1").Select(m => m.SkuNo).ToList();
			var sdHave = Db.Queryable<DataStockDetail>().Count(m => m.IsDel == "0" && m.PalletNo == model.PalletNo && skuStr.Contains(m.SkuNo));
			if (sdHave>0)
			{
			throw new Exception("当前托盘含有贴标物料信息，不能组托");
			}
			// 判断库存明细是否已有此托盘信息
			var sd1 = Db.Queryable<DataStockDetail>()
			.First(m => m.IsDel == "0" && m.ASNDetailNo == bind.ASNDetailNo && m.PalletNo == model.PalletNo && m.LotNo == bind.LotNo);
			.First(m => m.IsDel == "0" && m.ASNDetailNo == bind.ASNDetailNo && m.PalletNo == model.PalletNo && m.SkuNo == detail.SkuNo && m.LotNo == bind.LotNo);
			var sdId1 = 0;
			if (sd1 != null)
			{
			@@ -1426,8 +1371,6 @@
			}
			#endregion



			#region 更改组托信息

			var isSample = "0";//是否取样
			@@ -1497,10 +1440,12 @@
			Db.Updateable(notice).ExecuteCommand();
			#endregion

			#region 库存明细
			#region 更改库存明细数量

			sd1.Qty = bind.Qty;
			//更改库存明细数量
			Db.Updateable(sd1).Where(m => m.Id == sdId1).ExecuteCommand();

			#endregion

			#region 库存
			@@ -1574,9 +1519,12 @@
			sqlStr += $"insert into LogPalletTrack values('{model.PalletNo}','{model.AsnNo}','组盘','0',getDate(),{userId},NULL,NULL);";
			Db.Ado.ExecuteCommand(sqlStr);
			new OperationASNServer().AddLogOperationAsn("PDA模块", "托盘绑定", model.AsnNo, "添加", $"添加了托盘码为：{model.PalletNo}的组盘信息", userId);

			Db.CommitTran();
			}
			catch (Exception e)
			{
			Db.RollbackTran();
			throw new Exception(e.Message);
			}
			}
			@@ -1899,6 +1847,51 @@
			}
			}

			/// <summary>
			/// 根据单据获取标签数量
			/// </summary>
			/// <param name="asnNo">入库单</param>
			/// <param name="asnDetailId">入库单明细号</param>
			/// <returns></returns>
			public BoxListInfoDto GetBoxCountByAsn(string asnNo,int? asnDetailId)
			{
			try
			{

			var detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == asnDetailId);
			if (detail == null)
			{
			throw new Exception("没有查询到单据明细信息");
			}
			var data = new BoxListInfoDto()
			{
			SkuNo = detail.SkuNo,
			SkuName = detail.SkuName,
			LotNo = detail.LotNo,

			};
			//获取状态是未组托的标签信息
			var models = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.ASNNo == asnNo && m.ASNDetailNo == asnDetailId ).GroupBy(m=> new { m.ProductionTime,m.ExpirationTime }).Select(m=>new { m.ProductionTime ,m.ExpirationTime}).OrderBy(m=>m.ProductionTime).ToList();//&& m.Status == "0"
			foreach (var item in models)
			{
			var boxNoList = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.ASNNo == asnNo && m.ASNDetailNo == asnDetailId && m.ProductionTime == item.ProductionTime).Select(m => m.BoxNo).ToList();
			if (boxNoList.Count > 0)
			{
			data.BoxNoList = boxNoList;
			data.Date1 = item.ProductionTime.ToString();
			data.Date2 = item.ExpirationTime.ToString();

			break;
			}
			}
			return data;
			}
			catch (Exception ex)
			{
			throw ex;
			}
			}

			#endregion