JC24WMS.git - Gitblit

			@@ -837,6 +837,7 @@

			var comList = new List<BllCompleteDetail>();
			//判断是否存在拣货明细
			isComplete = 0;// 所有无箱码或一级箱码拣货时，拣货明细应重新插入数据(体现多次拣货流程记录)
			if (isComplete == 0)
			{
			//添加拣货明细
			@@ -875,8 +876,6 @@

			Db.Updateable(complete).ExecuteCommand();
			}



			//修改出库分配信息
			allot.CompleteQty += int.Parse(PickQty);
			@@ -2544,6 +2543,13 @@
			{
			throw new Exception("新托盘码不能为空");
			}
			if (palletNo == palletNoNew)//原托盘与新托盘一致
			{
			if (!string.IsNullOrEmpty(boxNo))
			{
			throw new Exception("原托盘与新托盘一致，请选择整托出库");
			}
			}

			//出库单
			var notice = Db.Queryable<BllExportNotice>().First(m => m.IsDel == "0" && m.SONo == soNo);
			@@ -2594,6 +2600,8 @@
			var pinStockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew);
			if (pinStockDetail != null)
			{
			if (palletNo != palletNoNew)//非整托拣货
			{
			if (pinStockDetail.SONo != notice.SONo)
			{
			throw new Exception("拼托托盘上只能放同一个出库单下的物料！");
			@@ -2601,6 +2609,7 @@
			if (pinStockDetail.SkuName != stockDetail.SkuName \|\| pinStockDetail.LotNo != stockDetail.LotNo)
			{
			isNew = true;
			}
			}
			sdId = pinStockDetail.Id;
			}
			@@ -2717,10 +2726,14 @@
			};
			comList.Add(completeDetail);

			//修改库存箱码明细
			if (palletNo != palletNoNew)
			{
			item.StockDetailId = sdId;
			item.BindNo = null;//托盘绑定号
			item.PalletNo = palletNoNew;
			}
			item.Status = "5";//箱支状态，0：未组托 1：已组托 2：已入库 3：已出库 4:已分配 5：已拣货
			//修改库存箱码明细
			Db.Updateable(item).ExecuteCommand();

			pickQty += item.Qty;
			@@ -2732,10 +2745,13 @@
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			Db.Updateable(allot).ExecuteCommand();

			if (palletNo != palletNoNew)
			{
			//删除原托盘库存明细
			Db.Deleteable(stockDetail).ExecuteCommand();

			//改变托盘状态为：未使用
			//改变原托盘状态为：未使用
			var pallet = Db.Queryable<SysPallets>().First(m => m.PalletNo == palletNo && m.IsDel == "0");
			if (pallet == null)
			{
			@@ -2743,6 +2759,13 @@
			}
			pallet.Status = "0";
			Db.Updateable(pallet).ExecuteCommand();
			}
			else
			{
			stockDetail.SONo = soNo;
			Db.Updateable(stockDetail).ExecuteCommand();
			}

			//修改出库单明细拣货数量
			noticeDetail.CompleteQty += pickQty;
			Db.Updateable(noticeDetail).ExecuteCommand();
			@@ -2877,6 +2900,7 @@
			item.StockDetailId = sdId;
			item.BindNo = null;//托盘绑定号
			item.PalletNo = palletNoNew;
			item.Status = "5";//箱支状态，0：未组托 1：已组托 2：已入库 3：已出库 4:已分配 5：已拣货
			Db.Updateable(item).ExecuteCommand();

			pickQty += item.Qty;
			@@ -2888,7 +2912,8 @@
			item.BindNo = null;//托盘绑定号
			item.PalletNo = palletNoNew;
			item.BoxNo = item.BoxNo3;//将支码赋给箱码
			item.BitBoxMark = "1";
			item.BitBoxMark = "1";//零箱标记
			item.Status = "5";//箱支状态，0：未组托 1：已组托 2：已入库 3：已出库 4:已分配 5：已拣货
			Db.Updateable(item).ExecuteCommand();

			pickQty += item.Qty;
			@@ -2901,6 +2926,7 @@
			item.StockDetailId = sdId;
			item.BindNo = null;//托盘绑定号
			item.PalletNo = palletNoNew;
			item.Status = "5";//箱支状态，0：未组托 1：已组托 2：已入库 3：已出库 4:已分配 5：已拣货
			Db.Updateable(item).ExecuteCommand();
			}
			else
			@@ -2993,10 +3019,13 @@
			}
			else
			{
			if (palletNo != palletNoNew)
			{
			//修改拼托托盘库存明细
			pinStockDetail.Qty += pickQty;
			pinStockDetail.LockQty += pickQty;
			Db.Updateable(pinStockDetail).ExecuteCommand();
			}
			}

			//添加操作日志记录
			@@ -3087,12 +3116,21 @@
			{
			throw new Exception("未查询到该托盘分配的库存信息！");
			}
			if (palletNo == palletNoNew)//原托盘与新托盘一致
			{
			if (int.Parse(PickQty) != stockDetail.Qty)
			{
			throw new Exception("原托盘与新托盘一致，需要把托盘上所有数量拣货");
			}
			}
			#endregion

			#region 拼托信息
			bool isNew = false;
			var pinStockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew);
			if (pinStockDetail != null)
			{
			if (palletNo != palletNoNew)//非整托拣货
			{
			if (pinStockDetail.SONo != notice.SONo)
			{
			@@ -3101,6 +3139,7 @@
			if (pinStockDetail.SkuName != stockDetail.SkuName \|\| pinStockDetail.LotNo != stockDetail.LotNo)
			{
			isNew = true;
			}
			}
			}
			else
			@@ -3169,10 +3208,18 @@
			}
			else
			{
			if (palletNo != palletNoNew)
			{
			//修改拼托托盘库存明细
			pinStockDetail.Qty += int.Parse(PickQty);
			pinStockDetail.LockQty += int.Parse(PickQty);
			Db.Updateable(pinStockDetail).ExecuteCommand();
			}
			else
			{
			pinStockDetail.SONo = soNo;
			Db.Updateable(pinStockDetail).ExecuteCommand();
			}
			}
			#endregion

			@@ -3188,6 +3235,7 @@

			var comList = new List<BllCompleteDetail>();
			//判断是否存在拣货明细
			isComplete = 0;//所有无箱码或一级箱码拣货时，拣货明细应重新插入数据(体现多次拣货流程记录)
			if (isComplete == 0)
			{
			//添加拣货明细
			@@ -3235,6 +3283,8 @@

			int isDel = 0;

			if (palletNo != palletNoNew)
			{
			//删除或修改库存明细
			stockDetail.BitPalletMark = "1";//修改为零托标识
			stockDetail.Qty -= int.Parse(PickQty);
			@@ -3260,7 +3310,11 @@
			isDel = 1;
			Db.Updateable(stockDetail).ExecuteCommand();
			}

			}
			else
			{
			isDel = 1;
			}
			//判断托盘上物料是否拣货完毕
			if (isDel == 0)
			{