JC34WMS.git - Gitblit

			@@ -92,7 +92,7 @@
			}
			//出库分配信息
			var allot = await Db.Queryable<BllExportAllot>().FirstAsync(m =>
			m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3") && m.SONo == soNo &&
			m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3" \|\| m.Status == "5") && m.SONo == soNo &&
			m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo);
			if (allot == null)
			{
			@@ -216,10 +216,10 @@
			throw Oops.Bah("该托盘上没有可拣货的箱子");
			}
			var boxQty = await boxInfo.GroupBy(m => m.PalletNo).Select(m => SqlFunc.AggregateSum(m.Qty)).ToListAsync();
			if (boxQty[0] > needQty)
			{
			throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
			}
			//if (boxQty[0] > needQty)
			//{
			// throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
			//}

			var comDetailList = await Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToListAsync();
			var comList = new List<BllCompleteDetail>();
			@@ -273,7 +273,7 @@
			await Db.Insertable(comList).ExecuteCommandAsync();
			//修改出库分配信息
			allot.CompleteQty += pickQty;
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			await Db.Updateable(allot).ExecuteCommandAsync();

			@@ -322,7 +322,7 @@
			else
			{
			List<DataBoxInfo> boxInfos;
			var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);
			var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo && m.Status == "2");
			if (await boxInfo.CountAsync() == 0)
			{
			throw Oops.Bah("未查询到该箱码的信息");
			@@ -337,10 +337,10 @@
			throw Oops.Bah("该托盘与箱码没有绑定关系");
			}
			var boxQty = await boxInfo.GroupBy(m => m.BoxNo).Select(m => SqlFunc.AggregateSum(m.Qty)).ToListAsync();
			if (boxQty[0] > needQty)
			{
			throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
			}
			//if (boxQty[0] > needQty)
			//{
			// throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
			//}

			foreach (var item in boxInfos)
			{
			@@ -396,7 +396,7 @@
			await Db.Insertable(comList).ExecuteCommandAsync();
			//修改出库分配信息
			allot.CompleteQty += pickQty;
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;

			await Db.Updateable(allot).ExecuteCommandAsync();
			@@ -405,6 +405,10 @@
			stockDetail.BitPalletMark = "1";//修改为零托标识
			stockDetail.Qty -= pickQty;
			stockDetail.LockQty -= pickQty;
			if (stockDetail.LockQty < 0)
			{
			stockDetail.LockQty = 0;
			}
			stockDetail.UDF5 = "1";
			if (stockDetail.Qty == stockDetail.LockQty)
			{
			@@ -731,7 +735,7 @@

			//修改出库分配信息
			allot.CompleteQty += int.Parse(PickQty);
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			await Db.Updateable(allot).ExecuteCommandAsync();

			@@ -1848,7 +1852,7 @@
			return allotList;
			}
			//获取状态为待拣货或者部分拣货的出库单
			var allotList2 = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3") && m.PalletNo == palletNo).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
			var allotList2 = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3" \|\| m.Status == "5") && m.PalletNo == palletNo).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();

			//var allotList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToList();
			//获取出库单据不为待拣货执行完毕订单关闭等待执行的单据
			@@ -1923,7 +1927,7 @@
			throw Oops.Bah("托盘码为空，请输入托盘码");
			}
			//获取状态为待拣货或者部分拣货的出库单
			var allotList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3") && m.PalletNo == palletNo);
			var allotList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3" \|\| m.Status == "5") && m.PalletNo == palletNo);
			//var allotList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SONo == soNo && m.Status != "4" && m.Status != "5");
			if (!string.IsNullOrWhiteSpace(soNo))
			{
			@@ -1945,7 +1949,7 @@
			//获取出库口、规格、待拣及已拣数量（根据出库单明细ID、托盘号）
			public async Task<OutPdaInfo> GetOutlets(string soDetailId, string palletNo)
			{
			var allotInfo = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo && (m.Status == "2" \|\| m.Status == "3")).ToListAsync();
			var allotInfo = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo && (m.Status == "2" \|\| m.Status == "3" \|\| m.Status == "5")).ToListAsync();
			if (allotInfo.Count == 0)
			{
			throw Oops.Bah($"{palletNo}托盘上未查询到分配信息，请核实");
			@@ -2029,7 +2033,7 @@
			}
			if (!string.IsNullOrWhiteSpace(soDetailId))
			{
			var allotInfos = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo && (m.Status == "2" \|\| m.Status == "3")).ToListAsync();
			var allotInfos = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo && (m.Status == "2" \|\| m.Status == "3" \|\| m.Status == "5")).ToListAsync();
			if (allotInfos.Count == 0)
			{
			throw Oops.Bah($"{palletNo}托盘上未查询到分配信息，请核实");
			@@ -2183,7 +2187,7 @@
			{
			throw Oops.Bah("未查询到该出库单的信息");
			}
			if (notice.Status != "3")
			if (notice.Status != "3" && notice.Status != "4")
			{
			throw Oops.Bah("出库单的状态不是正在执行，不能拣货");
			}
			@@ -2196,7 +2200,7 @@
			}
			//出库分配信息
			var allot = await Db.Queryable<BllExportAllot>().FirstAsync(m =>
			m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3") && m.SONo == soNo &&
			m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3" \|\| m.Status == "5") && m.SONo == soNo &&
			m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo);
			if (allot == null)
			{
			@@ -2278,7 +2282,7 @@
			await Db.Insertable(comList).ExecuteCommandAsync();
			//修改出库分配信息
			allot.CompleteQty += pickQty;
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			await Db.Updateable(allot).ExecuteCommandAsync();
			//删除库存明细
			@@ -2286,6 +2290,10 @@
			//删除或修改库存
			stock.Qty -= pickQty;
			stock.LockQty -= pickQty;
			if (stock.LockQty < 0)
			{
			stock.LockQty = 0;
			}
			if (stock.Qty <= 0)
			{
			await Db.Deleteable(stock).ExecuteCommandAsync();
			@@ -2367,10 +2375,10 @@
			throw Oops.Bah("该托盘与箱码没有绑定关系");
			}
			var boxQty = boxInfos.First().Qty;
			if (boxQty > needQty)
			{
			throw Oops.Bah("拣货数量不能大于剩余待拣数量");
			}
			//if (boxQty > needQty)
			//{
			// throw Oops.Bah("拣货数量不能大于剩余待拣数量");
			//}

			foreach (var item in boxInfos)
			{
			@@ -2393,10 +2401,10 @@
			{
			throw Oops.Bah("拣货数量不能大于箱内数量");
			}
			if (Convert.ToInt32(pickQty1) > needQty)
			{
			throw Oops.Bah("拣货数量不能大于剩余待拣数量");
			}
			//if (Convert.ToInt32(pickQty1) > needQty)
			//{
			// throw Oops.Bah("拣货数量不能大于剩余待拣数量");
			//}

			biaoShi = "2";
			}
			@@ -2411,10 +2419,10 @@
			throw Oops.Bah("该托盘与箱码没有绑定关系");
			}
			var boxQty = await boxInfo.GroupBy(m => m.BoxNo).Select(m => SqlFunc.AggregateSum(m.Qty)).ToListAsync();
			if (boxQty[0] > needQty)
			{
			throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
			}
			//if (boxQty[0] > needQty)
			//{
			// throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
			//}

			foreach (var item in boxInfos)
			{
			@@ -2488,7 +2496,7 @@
			await Db.Insertable(comList).ExecuteCommandAsync();
			//修改出库分配信息
			allot.CompleteQty += pickQty;
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			if (allot.Status == "5")
			{
			@@ -2500,6 +2508,10 @@
			stockDetail.BitPalletMark = "1";//修改为零托标识
			stockDetail.Qty -= pickQty;
			stockDetail.LockQty -= pickQty;
			if (stockDetail.LockQty < 0)
			{
			stockDetail.LockQty = 0;
			}
			if (stockDetail.Qty == stockDetail.LockQty)
			{
			stockDetail.Status = "2";
			@@ -2523,6 +2535,10 @@
			}
			stock.Qty -= pickQty;
			stock.LockQty -= pickQty;
			if (stock.LockQty < 0)
			{
			stock.LockQty = 0;
			}
			if (stock.Qty <= 0)
			{
			await Db.Deleteable(stock).ExecuteCommandAsync();
			@@ -2576,10 +2592,10 @@
			var k = new OperationSOServer().AddLogOperationSo("PDA模块", "拣货出库", soNo, "拣货", $"在PDA上对出库单号为：{soNo}的托盘码为：{palletNo}的拣货操作", userId);
			Db.CommitTran();
			}
			catch (AppFriendlyException e)
			{
			Db.RollbackTran();
			}
			//catch (AppFriendlyException e)
			//{
			// Db.RollbackTran();
			//}
			catch (Exception e)
			{
			Db.RollbackTran();
			@@ -2627,7 +2643,7 @@
			}
			//出库分配信息
			var allot = await Db.Queryable<BllExportAllot>().FirstAsync(m =>
			m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3") && m.SONo == soNo &&
			m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3" \|\| m.Status == "5") && m.SONo == soNo &&
			m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo);
			if (allot == null)
			{
			@@ -2707,7 +2723,7 @@

			//修改出库分配信息
			allot.CompleteQty += int.Parse(PickQty);
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			await Db.Updateable(allot).ExecuteCommandAsync();

			@@ -2717,6 +2733,10 @@
			stockDetail.BitPalletMark = "1";//修改为零托标识
			stockDetail.Qty -= int.Parse(PickQty);
			stockDetail.LockQty -= int.Parse(PickQty);
			if (stockDetail.LockQty < 0)
			{
			stockDetail.LockQty = 0;
			}
			if (stockDetail.Qty == stockDetail.LockQty)
			{
			stockDetail.Status = "2";
			@@ -2832,7 +2852,7 @@
			throw Oops.Bah("需要垛数大于库存垛数，请重新输入!");
			}
			}
			stockDetail = new AllotSku().GetDataListOrder(stockDetail);
			//stockDetail = new AllotSku().GetDataListOrder(stockDetail);
			//获取库存总表信息
			var stock = await Db.Queryable<DataStock>().FirstAsync(s => s.IsDel == "0" && s.SkuNo == "100099");
			//验证库存总表是否为空
			@@ -3859,7 +3879,7 @@
			await Db.Insertable(comList).ExecuteCommandAsync();
			//修改出库分配信息
			allot.CompleteQty += pickQty;
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			if (allot.Status == "5")
			{
			@@ -3872,6 +3892,10 @@
			stockDetail.InspectMark = "1"; //抽检托标识
			stockDetail.Qty -= pickQty;
			stockDetail.LockQty -= pickQty;
			if (stockDetail.LockQty < 0)
			{
			stockDetail.LockQty = 0;
			}
			if (stockDetail.Qty == stockDetail.LockQty)
			{
			stockDetail.Status = "2";
			@@ -3895,6 +3919,10 @@
			}
			stock.Qty -= pickQty;
			stock.LockQty -= pickQty;
			if (stock.LockQty < 0)
			{
			stock.LockQty = 0;
			}
			stock.IsSampling = "1";
			if (stock.Qty <= 0)
			{
			@@ -4327,7 +4355,7 @@

			//修改出库分配信息
			allot.CompleteQty += int.Parse(PickQty);
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";

			allot.UpdateTime = DateTime.Now;
			await Db.Updateable(allot).ExecuteCommandAsync();
			@@ -4652,7 +4680,7 @@
			await Db.Insertable(comList).ExecuteCommandAsync();
			//修改出库分配信息
			allot.CompleteQty += pickQty;
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			await Db.Updateable(allot).ExecuteCommandAsync();

			@@ -4863,7 +4891,7 @@
			await Db.Insertable(comList).ExecuteCommandAsync();
			//修改出库分配信息
			allot.CompleteQty += pickQty;
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			if (allot.Status == "5")
			{
			@@ -5187,7 +5215,7 @@

			//修改出库分配信息
			allot.CompleteQty += int.Parse(PickQty);
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			await Db.Updateable(allot).ExecuteCommandAsync();