JC24WMS.git - Gitblit

			@@ -902,7 +902,7 @@
			{
			throw new Exception("所选区域信息不存在,请检查!");
			}
			EndLocat = GetLocat(areaNo, stockDetail.SkuNo, stockDetail.LotNo);
			EndLocat = GetLocat(areaNo, stockDetail.SkuNo, stockDetail.LotNo,palletNo);
			}
			else
			{
			@@ -1041,7 +1041,7 @@
			throw new Exception("所选区域信息不存在,请检查!");
			}
			string EndLocat = string.Empty;//目标位置
			EndLocat= GetLocat(areaNo, stockDetail.SkuNo, stockDetail.LotNo);
			EndLocat= GetLocat(areaNo, stockDetail.SkuNo, stockDetail.LotNo,palletNo);
			//开启事务
			Db.BeginTran();

			@@ -1102,7 +1102,7 @@
			/// <param name="skuNo"></param>
			/// <param name="lotNo"></param>
			/// <returns></returns>
			private string GetLocat(string areaNo,string skuNo,string lotNo)
			private string GetLocat(string areaNo,string skuNo,string lotNo,string palletNo)
			{
			try
			{
			@@ -1110,7 +1110,7 @@
			//当然区域所有储位信息
			var storageLocatList = Db.Queryable<SysStorageLocat>().Where(w => w.WareHouseNo == "W02" && w.AreaNo == areaNo).ToList();
			//同区域同批次物料的储位信息
			List<string> locatList = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.SkuNo == skuNo && w.LotNo == lotNo && w.WareHouseNo == "W02" && w.AreaNo == areaNo)
			List<string> locatList = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.SkuNo == skuNo && w.LotNo == lotNo && w.WareHouseNo == "W02" && w.AreaNo == areaNo && w.PalletNo != palletNo)
			.OrderByDescending(o=>o.LocatNo).Select(s=>s.LocatNo).Distinct().ToList();
			foreach (var item in locatList)
			{