JC26WMS.git - Gitblit

			@@ -430,6 +430,7 @@
			IsWave = "0",
			WaveNo = "",
			IsIssueLotNo = string.IsNullOrWhiteSpace(d.LotNo) ? "0" : "1",
			IsMixBox = d.IsMixBox,

			OrderDetailCode = d.OrderDetailCode,

			@@ -540,7 +541,7 @@
			var item = new BllExportNoticeDetail()
			{
			SONo = billNo,
			OrderDetailCode=d.OrderDetailCode,
			OrderDetailCode = d.OrderDetailCode,
			SkuNo = sku.SkuNo,
			SkuName = sku.SkuName,
			Standard = sku.Standard,
			@@ -559,6 +560,7 @@
			IsWave = "0",
			WaveNo = "",
			IsIssueLotNo = string.IsNullOrWhiteSpace(d.LotNo) ? "0" : "1",
			IsMixBox = d.IsMixBox,

			CreateUser = 0,
			};
			@@ -4307,6 +4309,8 @@
			var noticeDetail = Db.Queryable<BllExportNoticeDetail>().Where(m => m.IsDel == "0" && m.SONo == soNo).ToList();
			//库存总表信息
			var data = Db.Queryable<DataStock>().Where(m => m.IsDel == "0").ToList();
			//库存明细中检验合格批次集合
			var dataDetail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.InspectStatus == "1").GroupBy(g => g.LotNo).Select(s => s.LotNo).ToList();
			//库存明细表信息
			var dataBoxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0").ToList();

			@@ -4315,8 +4319,10 @@
			foreach (var item in noticeDetail)
			{
			//验证先进先出原则

			var forData = data.Where(m => m.SkuNo == item.SkuNo && m.LotNo != item.LotNo && (m.Qty - m.FrozenQty - m.LockQty) > 0 ).Select(m=>m.LotNo).ToList(); //获取当前物料的所有批次信息(排除单据的批次，防止单据所在批次锁定数量后验证小于等于0)
			//获取当前物料的所有批次信息(排除单据的批次，防止单据所在批次锁定数量后验证小于等于0)
			var forData = data.Where(m => m.SkuNo == item.SkuNo
			&& m.LotNo != item.LotNo && (m.Qty - m.FrozenQty - m.LockQty) > 0
			&& dataDetail.Contains(m.LotNo)).Select(m=>m.LotNo).ToList();

			forData.Add(item.LotNo); //集合添加单据的批次
			//获取排序后的第一个批次
			@@ -4329,15 +4335,37 @@

			//验证效期优先原则
			var forDataBox = dataBoxInfo.Where(m => m.SkuNo == item.SkuNo && m.LotNo != item.LotNo && m.Qty > 0).ToList();
			var expirationTime = dataBoxInfo.Where(m => m.SkuNo == item.SkuNo && m.LotNo == item.LotNo && m.Qty > 0).OrderBy(m=>m.ExpirationTime).Select(m=>m.ExpirationTime).First(); //获取当前单据批次的最近效期
			var num = forDataBox.Count(m => m.ExpirationTime > expirationTime); //获取库存中其它批次效期大于当前单据批次的效期数量
			//判断是否大于0
			if (num>0)
			//获取当前单据批次的最近效期
			var expirationTimedt = dataBoxInfo.Where(m => m.SkuNo == item.SkuNo
			&& m.LotNo == item.LotNo && m.Qty > 0).ToList();
			if (expirationTimedt.Count > 0)
			{
			bl = false;
			break;
			var expirationTime = expirationTimedt.OrderBy(m => m.ExpirationTime).Select(m => m.ExpirationTime).First();
			//获取库存中其它批次效期大于当前单据批次的效期数量
			var num = forDataBox.Count(m => m.ExpirationTime > expirationTime);
			//判断是否大于0
			if (num > 0)
			{
			bl = false;
			break;
			}
			}
			else
			{
			var dataDetailtime = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.InspectStatus == "1").
			Where(m => m.SkuNo == item.SkuNo
			&& m.LotNo == item.LotNo && m.Qty > 0)
			.OrderBy(m => m.ExpirationTime)
			.Select(m => m.ExpirationTime).First();

			var num = forDataBox.Count(m => m.ExpirationTime > dataDetailtime);
			//判断是否大于0
			if (num > 0)
			{
			bl = false;
			break;
			}
			}
			}


			@@ -4376,7 +4404,6 @@

			var exAllotList = new List<BllExportAllot>();
			var assign = new AllotSku();
			var specialSku = new List<string>();//特殊物料集合，无需托盘上全部分配的
			Db.BeginTran();
			try
			{
			@@ -4424,12 +4451,6 @@
			{
			stockDetail = stockDetail.Where(m => m.InspectStatus == "2").ToList();
			}
			if (notice.Type == "1" && !specialSku.Contains(detail.SkuNo))
			{
			//分配整个托盘上的物料只查询未分配的托盘
			stockDetail = stockDetail.Where(m => m.Status == "0").ToList();

			}
			if (stockDetail.Sum(m=>m.Qty-m.LockQty) < needQty)
			{
			throw new Exception("库存明细数量不足");
			@@ -4447,16 +4468,7 @@
			Dictionary<int, decimal> stockQtyDic = new Dictionary<int, decimal>();//托出库物品数
			var qty = 0m;
			//分配货物
			if (notice.Type == "1" && !specialSku.Contains(detail.SkuNo))//判断是否未领料出库
			{
			//分配四楼备料投料的物料
			qty += assign.LingLiaoAllotPallets(stockDetail, needQty, pNum, bNum, stockQtyDic);
			}
			else
			{
			qty += assign.AllotPallets(stockDetail, needQty, pNum, bNum, stockQtyDic);
			}

			qty += assign.AllotPallets(stockDetail, needQty, pNum, bNum, stockQtyDic, detail.LotNo, detail.IsMixBox);
			foreach (var sc in stockQtyDic)
			{
			var s = stockDetail.FirstOrDefault(m => m.Id == sc.Key);
			@@ -4514,7 +4526,9 @@
			if (qty > detail.Qty)
			{
			//库存总表
			var stock = Db.Queryable<DataStock>().First(d => d.IsDel == "0" && d.SkuNo == detail.SkuNo && d.LotNo == detail.LotNo);
			var stock = Db.Queryable<DataStock>().First(d => d.IsDel == "0"
			&& d.SkuNo == detail.SkuNo
			&& d.LotNo == detail.LotNo);
			stock.LockQty += qty-detail.Qty;
			Db.Updateable(stock).ExecuteCommand();

			@@ -4575,7 +4589,8 @@
			var zd = Db.Updateable(notice).ExecuteCommand();

			//添加操作日志记录
			var k = new OperationSOServer().AddLogOperationSo("出库作业", "出库单据", notice.SONo, "分配", $"自动分配了单据号为{notice.SONo}的单据信息", userId);
			var k = new OperationSOServer().AddLogOperationSo("出库作业", "出库单据",
			notice.SONo, "分配", $"自动分配了单据号为{notice.SONo}的单据信息", userId);

			if (zd > 0 && mx > 0 && fp > 0 && k)
			{