JC34WMS.git - Gitblit

			@@ -1,6 +1,8 @@
			using System;
			using System.Collections.Generic;
			using System.ComponentModel;
			using System.Linq;
			using System.Reflection.Metadata;
			using System.Security.Cryptography.X509Certificates;
			using System.Text;
			using System.Threading.Tasks;
			@@ -9,6 +11,7 @@
			using Model.ModelDto;
			using Model.ModelDto.BllCheckDto;
			using Model.ModelDto.PdaDto;
			using Model.ModelDto.SysDto;
			using Newtonsoft.Json;
			using SqlSugar;
			using Utility;
			@@ -424,17 +427,107 @@
			// .OrderBy(s => new { s.LotNo, s.LocatNo, s.PalletNo })
			// .ToListAsync();
			//}
			public async Task<List<DataStockDetail>> GetStockQueryList(string locatNo, string palletNo, string boxNo)
			public async Task<List<StockDetailWithQtyDto>> GetStockQueryList(string locatNo, string palletNo, string boxNo)
			{
			return await Db.Queryable<DataStockDetail>()
			.LeftJoin<DataBoxInfo>((stk, box) => stk.LotNo == box.LotNo)
			.Where((stk, box) => stk.IsDel == "0")
			.WhereIF(!string.IsNullOrWhiteSpace(locatNo),(stk, box) => stk.LocatNo.Contains(locatNo))
			.WhereIF(!string.IsNullOrWhiteSpace(palletNo),(stk, box) => stk.PalletNo.Contains(palletNo))
			.WhereIF(!string.IsNullOrWhiteSpace(boxNo),(stk, box) => box.BoxNo.Contains(boxNo))
			.OrderBy((stk, box) => new { stk.LotNo, stk.LocatNo, stk.PalletNo, box.BoxNo })
			.Select((stk, box) => stk)
			.ToListAsync();
			return await Db.Queryable<DataStockDetail>("a")
			.InnerJoin<DataBoxInfo>((a, b) => a.LotNo == b.LotNo)
			.Where((a, b) => a.IsDel == "0")
			.WhereIF(!string.IsNullOrWhiteSpace(locatNo), (a, b) => a.LocatNo.Contains(locatNo))
			.WhereIF(!string.IsNullOrWhiteSpace(palletNo), (a, b) => a.PalletNo.Contains(palletNo))
			.WhereIF(!string.IsNullOrWhiteSpace(boxNo), (a, b) => b.BoxNo.Contains(boxNo))
			.GroupBy((a, b) => new
			{
			a.LotNo,
			a.LotText,
			a.SupplierLot,
			a.OwnerNo,
			a.OwnerName,
			a.SupplierNo,
			a.SupplierName,
			a.SkuNo,
			a.SkuName,
			a.Standard,
			a.LockQty,
			a.FrozenQty,
			a.InspectQty,
			a.ASNNo,
			a.ASNDetailNo,
			a.SONo,
			a.WareHouseNo,
			a.RoadwayNo,
			a.AreaNo,
			a.LocatNo,
			a.PalletNo,
			a.PalletNo2,
			a.PalletNo3,
			a.PalletTags,
			a.CompleteTime,
			a.ProductionTime,
			a.ExpirationTime,
			a.Status,
			a.InspectMark,
			a.BitPalletMark,
			a.InspectStatus,
			a.InspectTime,
			a.PackagNo,
			a.IsBale,
			a.IsBelt,
			a.UDF5,
			a.IsDel,
			a.CreateTime,
			a.CreateUser,
			a.UpdateTime,
			a.UpdateUser,
			a.Demo
			})
			.OrderBy((a, b) => new { a.LotNo, a.LocatNo, a.PalletNo })
			.Select((a, b) => new StockDetailWithQtyDto
			{
			LotNo = a.LotNo,
			LotText = a.LotText,
			SupplierLot = a.SupplierLot,
			OwnerNo = a.OwnerNo,
			OwnerName = a.OwnerName,
			SupplierNo = a.SupplierNo,
			SupplierName = a.SupplierName,
			SkuNo = a.SkuNo,
			SkuName = a.SkuName,
			Standard = a.Standard,
			Qty = SqlFunc.AggregateSum(b.Qty), // DataBoxInfo的Qty字段
			LockQty = a.LockQty,
			FrozenQty = a.FrozenQty,
			InspectQty = a.InspectQty,
			ASNNo = a.ASNNo,
			ASNDetailNo = a.ASNDetailNo,
			SONo = a.SONo,
			WareHouseNo = a.WareHouseNo,
			RoadwayNo = a.RoadwayNo,
			AreaNo = a.AreaNo,
			LocatNo = a.LocatNo,
			PalletNo = a.PalletNo,
			PalletNo2 = a.PalletNo2,
			PalletNo3 = a.PalletNo3,
			PalletTags = a.PalletTags,
			CompleteTime = a.CompleteTime,
			ProductionTime = a.ProductionTime,
			ExpirationTime = a.ExpirationTime,
			Status = a.Status,
			InspectMark = a.InspectMark,
			BitPalletMark = a.BitPalletMark,
			InspectStatus = a.InspectStatus,
			InspectTime = a.InspectTime,
			PackagNo = a.PackagNo,
			IsBale = a.IsBale,
			IsBelt = a.IsBelt,
			UDF5 = a.UDF5,
			IsDel = a.IsDel,
			CreateTime = a.CreateTime,
			CreateUser = a.CreateUser,
			UpdateTime = a.UpdateTime,
			UpdateUser = a.UpdateUser,
			Demo = a.Demo
			})
			.ToListAsync();
			}
			#endregion

			@@ -701,9 +794,9 @@
			{
			throw Oops.Bah("托盘储位信息不存在,请检查!");
			}
			if (models.WareHouseNo != "W04")
			if (models.WareHouseNo != "W04" && models.WareHouseNo != "W02")
			{
			throw Oops.Bah("该托盘未在平库内,请检查!");
			throw Oops.Bah("该托盘未在平库内或货架库内,请检查!");
			}
			return models.LocatNo;
			}
			@@ -731,7 +824,7 @@
			{
			throw Oops.Bah("托盘储位信息不存在,请检查!");
			}
			if (models.WareHouseNo != "W04")
			if (models.WareHouseNo != "W04" && models.WareHouseNo != "W02")
			{
			throw Oops.Bah("该托盘未在平库内,请检查!");
			}
			@@ -741,8 +834,14 @@
			throw Oops.Bah("储位信息不存在,请检查!");
			}


			storageArea = await Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.AreaNo != storageLocat.AreaNo && w.WareHouseNo == "W04").OrderBy(o => o.AreaNo).ToListAsync();
			if (models.WareHouseNo == "W02")
			{
			storageArea = await Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.AreaNo != storageLocat.AreaNo && w.WareHouseNo == "W04" && (w.AreaNo == "B01" \|\| w.AreaNo == "B02")).OrderBy(o => o.AreaNo).ToListAsync();
			}
			else
			{
			storageArea = await Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.AreaNo != storageLocat.AreaNo && w.WareHouseNo == "W04").OrderBy(o => o.AreaNo).ToListAsync();
			}

			}
			return storageArea;
			@@ -839,7 +938,7 @@
			{
			throw Oops.Bah("托盘储位信息不存在,请检查!");
			}
			if (stockDetail.WareHouseNo != "W04")
			if (stockDetail.WareHouseNo != "W04" && stockDetail.WareHouseNo != "W02")
			{
			throw Oops.Bah("该托盘未在平库内,请检查!");
			}
			@@ -1579,9 +1678,9 @@
			}
			//开启事务
			Db.BeginTran();


			//库存箱支明细信息
			var boxList = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.BoxNo == boxNo).ToList();
			var boxList = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.BoxNo == boxNo && w.Status == "2").ToList();
			if (boxList.Count != 1)
			{
			throw new Exception("该箱码信息错误，存在多个此箱码信息");