JC24WMS.git - Gitblit

			@@ -67,6 +67,11 @@
			{
			throw new Exception("托盘码为空，请输入托盘码");
			}
			var palletInfo = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo);
			if (!string.IsNullOrEmpty(palletInfo.WareHouseNo))
			{
			throw new Exception("该托盘还未出库");
			}
			if (type == "1")//平库出库获取单据
			{
			var allotList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.Status == "1" && m.PalletNo == palletNo).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToList();
			@@ -242,7 +247,19 @@
			{
			foreach (var demo in list)
			{
			var com = comInfo.FirstOrDefault(m => m.IsDel == "0" && m.BoxNo3 == demo.BoxNo);
			//if (!string.IsNullOrWhiteSpace(boxNo3))
			//{
			// var com = comInfo.FirstOrDefault(m => m.IsDel == "0" && m.BoxNo3 == demo.BoxNo);
			//}
			//else if (!string.IsNullOrWhiteSpace(boxNo))
			//{
			// if (expr)
			// {

			// }

			//}
			var com = comInfo.FirstOrDefault(m => m.IsDel == "0" && m.BoxNo3 != null && m.BoxNo3 == demo.BoxNo);
			if (com != null)
			{
			demo.PickedQty = com.CompleteQty;
			@@ -309,7 +326,7 @@
			throw new Exception($"未查询到对应出库单总单信息，请核实！");
			}
			//分配信息
			var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.SONo == notice.SONo && a.SODetailNo == noticeDetail.Id && a.PalletNo == palletNo && a.Status == "2" \|\| a.Status == "3");
			var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.SONo == notice.SONo && a.SODetailNo == noticeDetail.Id && a.PalletNo == palletNo && (a.Status == "2" \|\| a.Status == "3"));
			if (allot == null)
			{
			throw new Exception($"未查询到对应分配信息，请核实！");
			@@ -1541,7 +1558,7 @@
			throw new Exception("未查询到该箱码及追溯码的信息");
			}
			boxInfos = boxInfo.ToList();

			var comDetailList = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot2.Id && m.PalletNo == palletNo).ToList();
			if (!string.IsNullOrWhiteSpace(boxNo3)) //散支拣货
			{
			boxInfos = boxInfos.Where(m => m.BoxNo3 == boxNo3).ToList();
			@@ -1559,7 +1576,13 @@
			{
			throw new Exception("该托盘与箱码没有绑定关系");
			}

			foreach (var item in boxInfos)
			{
			if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
			{
			throw new Exception($"当前{item.BoxNo}中{item.BoxNo3}已拣货完成，请勿重复拣货");
			}
			}
			biaoShi = "1";
			}
			else if (!string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)//数量拣货
			@@ -1586,17 +1609,23 @@
			{
			throw new Exception("该托盘与箱码没有绑定关系");
			}

			foreach (var item in boxInfos)
			{
			if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo == item.BoxNo))
			{
			throw new Exception($"当前{item.BoxNo}已拣货完成，请勿重复拣货");
			}
			}
			}
			var pickQty = 0;//拣货的数量
			var comDetailList = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot2.Id && m.PalletNo == palletNo).ToList();

			var comList = new List<BllCompleteDetail>();
			foreach (var item in boxInfos)
			{
			if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
			{
			throw new Exception($"当前{item.BoxNo}中{item.BoxNo3}已拣货完成，请勿重复拣货");
			}
			//if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
			//{
			// throw new Exception($"当前{item.BoxNo}中{item.BoxNo3}已拣货完成，请勿重复拣货");
			//}
			//添加拣货明细
			var completeDetail = new BllCompleteDetail()
			{
			@@ -1778,6 +1807,7 @@
			throw new Exception("未查询到该箱码及追溯码的信息");
			}
			boxInfos = boxInfo.ToList();
			var comDetailList = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToList();
			if (!string.IsNullOrWhiteSpace(boxNo3)) //散支拣货
			{
			boxInfos = boxInfos.Where(m => m.BoxNo3 == boxNo3).ToList();
			@@ -1800,7 +1830,13 @@
			{
			throw new Exception("拣货数量不能大于剩余待拣数量");
			}

			foreach (var item in boxInfos)
			{
			if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
			{
			throw new Exception($"当前{item.BoxNo}中{item.BoxNo3}已拣货完成，请勿重复拣货");
			}
			}
			biaoShi = "1";
			}
			else if (!string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)//数量拣货
			@@ -1836,16 +1872,23 @@
			{
			throw new Exception("拣货数量不能大于箱内剩余待拣数量");
			}
			foreach (var item in boxInfos)
			{
			if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo == item.BoxNo))
			{
			throw new Exception($"当前{item.BoxNo}已拣货完成，请勿重复拣货");
			}
			}
			}
			var pickQty = 0;//拣货的数量
			var comDetailList = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToList();

			var comList = new List<BllCompleteDetail>();
			foreach (var item in boxInfos)
			{
			if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
			{
			throw new Exception($"当前{item.BoxNo}中{item.BoxNo3}已拣货完成，请勿重复拣货");
			}
			//if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
			//{
			// throw new Exception($"当前{item.BoxNo}中{item.BoxNo3}已拣货完成，请勿重复拣货");
			//}
			//添加拣货明细
			var completeDetail = new BllCompleteDetail()
			{