JC34WMS.git - Gitblit

			@@ -701,9 +701,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 +731,7 @@
			{
			throw Oops.Bah("托盘储位信息不存在,请检查!");
			}
			if (models.WareHouseNo != "W04")
			if (models.WareHouseNo != "W04" && models.WareHouseNo != "W02")
			{
			throw Oops.Bah("该托盘未在平库内,请检查!");
			}
			@@ -741,8 +741,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 +845,7 @@
			{
			throw Oops.Bah("托盘储位信息不存在,请检查!");
			}
			if (stockDetail.WareHouseNo != "W04")
			if (stockDetail.WareHouseNo != "W04" && stockDetail.WareHouseNo != "W02")
			{
			throw Oops.Bah("该托盘未在平库内,请检查!");
			}
			@@ -1579,9 +1585,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("该箱码信息错误，存在多个此箱码信息");