JC24WMS.git - Gitblit

			@@ -17,11 +17,11 @@

			namespace WMS.BLL.SysServer
			{
			public class StorageLocatServer:DbHelper<SysStorageLocat>,IStorageLocatServer
			public class StorageLocatServer : DbHelper<SysStorageLocat>, IStorageLocatServer
			{
			private static readonly SqlSugarScope Db = DataContext.Db;
			public IStorageLocatRepository LocatRst { get; set; }
			public StorageLocatServer(IStorageLocatRepository locatRst):base(Db)
			public StorageLocatServer(IStorageLocatRepository locatRst) : base(Db)
			{
			LocatRst = locatRst;
			}
			@@ -42,7 +42,7 @@
			/// <param name="limit"></param>
			/// <param name="count"></param>
			/// <returns></returns>
			public List<LocatDto> GetStorageLocatList(string houseNo, string roadwayNo, string areaNo, string status, string flag,string locat, int? row, int? col, int? layer, int page, int limit,out int count)
			public List<LocatDto> GetStorageLocatList(string houseNo, string roadwayNo, string areaNo, string status, string flag, string locat, int? row, int? col, int? layer, int page, int limit, out int count)
			{
			try
			{
			@@ -58,10 +58,11 @@
			.AndIF(layer != null, it => it.Layer == layer)
			.ToExpression();//注意这一句不能少


			var data = LocatRst.GetAllByOrderPageAsync(item, limit, page,out int counts)

			var data = LocatRst.GetAllByOrderPageAsync(item, limit, page, out int counts)
			.Includes(x => x.WareHouseInfo)
			.Includes(x => x.AreaInfo)
			.Includes(x => x.RoadwayInfo)
			.Includes(x => x.TemperatureInfo)
			.Includes(x => x.CreateUserInfo)
			.Includes(x => x.UpdateUserInfo).ToList();
			@@ -70,8 +71,11 @@
			{
			Id = m.Id,
			LocatNo = m.LocatNo,
			WareHouseNo = m.WareHouseNo,
			WareHouseName = m.WareHouseInfo == null ? "" : m.WareHouseInfo.WareHouseName,
			RoadwayNo = m.RoadwayNo,
			RoadwayName = m.RoadwayInfo == null ? "" : m.RoadwayInfo.RoadwayName,
			AreaNo = m.AreaNo,
			AreaName = m.AreaInfo == null ? "" : m.AreaInfo.AreaName,
			Status = m.Status,
			StatusName = GetStatus(m.Status),
			@@ -115,7 +119,7 @@
			}
			}



			public bool EditStorageLocat(EditLocateVm model, int userId)
			{
			try
			@@ -125,7 +129,7 @@
			return bl;
			}
			catch (Exception e)
			{
			{
			throw new Exception(e.Message);
			}
			}
			@@ -183,12 +187,12 @@
			c1 = c.ToString();
			}
			var area = l <= 7 ? "A12" : "A11";//区域
			for (int d = 1; d<= int.Parse(dept); d++) //深度
			for (int d = 1; d <= int.Parse(dept); d++) //深度
			{
			var s = "0" + d;//深度
			q += await LocatRst.AddAsync(new SysStorageLocat()
			{
			LocatNo = r1 + c1 + l1+s,
			LocatNo = r1 + c1 + l1 + s,
			WareHouseNo = houseNo,
			RoadwayNo = roadwayNo,
			AreaNo = area,
			@@ -201,11 +205,11 @@
			CreateUser = userId
			});
			}








			}
			}
			}
			@@ -217,11 +221,57 @@
			throw new Exception(e.Message);
			}
			}

			/// <summary>
			/// 添加储位信息（平库）用于开发人员添加基础信息
			/// </summary>
			/// <param name="model"></param>
			/// <param name="userId"></param>
			/// <returns></returns>
			public async Task<int> AddPkStorageLocat(AddLocateVm model, int userId)
			{
			try
			{
			var q = 0;
			// 排(组)循环
			for (int i = 1; i <= model.Row; i++)
			{
			// 列循环
			for (int z = 1; z <= model.Col; z++)
			{
			q += await LocatRst.AddAsync(new SysStorageLocat()
			{
			// 区域+排+列+层
			LocatNo = model.AreaNo + i.ToString().PadLeft(2, '0') + z.ToString().PadLeft(2, '0') + "01",
			WareHouseNo = model.HouseNo,
			RoadwayNo = "",
			AreaNo = model.AreaNo,
			Status = "0",
			AisleOne = "1",
			AisleTwo = "",
			Flag = "0",
			Depth = z.ToString(),
			Row = i,
			Column = z,
			Layer = 1,
			CreateUser = userId
			}); ;
			}
			}

			return q;
			}
			catch (Exception e)
			{
			throw new Exception(e.Message);
			}
			}

			public bool EditStorageLocatList(EditLocateListVm model, int userId)
			{
			try
			{
			var bl = LocatRst.EditStorageLocatList(model.Id, model.Status, model.Flag,model.Temperature ,userId);
			var bl = LocatRst.EditStorageLocatList(model.Id, model.Status, model.Flag, model.Temperature, userId);

			return bl;
			}
			@@ -306,25 +356,22 @@
			/// <param name="wareHouseNo">仓库</param>
			/// <param name="roadway">巷道号</param>
			/// <param name="row">排 1 or 2</param>
			/// <param name="depth">深度</param>
			/// <returns></returns>
			public List<SysStorageLocat> GetStorageLocatLists(string wareHouseNo, string roadway, string row)
			public List<SysStorageLocat> GetStorageLocatLists(string wareHouseNo, string roadway, string row, string depth)
			{
			try
			{
			var road = roadway.Substring(1, roadway.Length - 1);
			var num = int.Parse(road);
			var rows = (num - 1) * 2 + int.Parse(row);//排

			var list = Db.Queryable<SysStorageLocat>().Where(m =>
			m.IsDel == "0" && m.WareHouseNo == wareHouseNo && m.RoadwayNo == roadway && m.Row == rows).ToList();

			m.IsDel == "0" && m.WareHouseNo == wareHouseNo && m.RoadwayNo == roadway && m.Row == int.Parse(row) && m.Depth == depth).ToList();

			return list;
			}
			catch (Exception e)
			{
			throw new Exception(e.Message);
			}


			}

			/// <summary>
			@@ -337,20 +384,20 @@
			public int GetMaxLayer(string wareHouseNo, string roadway, string row)
			{
			try
			{
			{
			var road = roadway.Substring(1, roadway.Length - 1);
			var num = int.Parse(road);
			var rows = (num - 1) * 2 + int.Parse(row);//排

			var maxLayer = Db.Queryable<SysStorageLocat>().Where(m =>
			m.IsDel == "0" && m.WareHouseNo == wareHouseNo && m.RoadwayNo == roadway && m.Row == rows).Max(m=>m.Layer);
			m.IsDel == "0" && m.WareHouseNo == wareHouseNo && m.RoadwayNo == roadway && m.Row == int.Parse(row)).Max(m => m.Layer);

			return maxLayer;
			}
			catch (Exception e)
			{
			throw new Exception(e.Message);
			}
			}
			}

			/// <summary>
			@@ -369,7 +416,7 @@
			var rows = (num - 1) * 2 + int.Parse(row);//排

			var maxColumn = Db.Queryable<SysStorageLocat>().Where(m =>
			m.IsDel == "0" && m.WareHouseNo == wareHouseNo && m.RoadwayNo == roadway && m.Row == rows).Max(m => m.Column);
			m.IsDel == "0" && m.WareHouseNo == wareHouseNo && m.RoadwayNo == roadway && m.Row == int.Parse(row)).Max(m => m.Column);

			return maxColumn;
			}
			@@ -401,7 +448,7 @@
			return depthlist;
			}




			/// <summary>
			/// 获取库位占比(圆)
			@@ -426,8 +473,8 @@
			int b = 0; //1：有物品
			int c = 0; //2：入库中
			int d = 0; //3：出库中
			//int e = 0; //4：移入中
			//int f = 0; //5：移出中
			int e = 0; //4：移入中
			int f = 0; //5：移出中
			int g = 0; //6：损坏\屏蔽

			foreach (var item in getLocateVms)
			@@ -456,18 +503,18 @@
			d = 1; //3：出库中
			continue;
			}
			////4：移入中
			//if (item.Status == "4")
			//{
			// e = 1; //4：移入中
			// continue;
			//}
			////5：移出中
			//if (item.Status == "5")
			//{
			// f = 1; //5：移出中
			// continue;
			//}
			//4：移入中
			if (item.Status == "4")
			{
			e = 1; //4：移入中
			continue;
			}
			//5：移出中
			if (item.Status == "5")
			{
			f = 1; //5：移出中
			continue;
			}
			//6：损坏\屏蔽
			if (item.Status == "6")
			{
			@@ -512,24 +559,24 @@
			getLocateVm.Status = "3";
			getLocateVms.Add(getLocateVm);
			}
			////4：移入中
			//if (e == 0)
			//{
			// getLocateVm = new GetLocateVm();
			// getLocateVm.WareHouseNo = wareHouseNo; //仓库号
			// getLocateVm.StatusNum = "0";
			// getLocateVm.Status = "4";
			// getLocateVms.Add(getLocateVm);
			//}
			////5：移出中
			//if (f == 0)
			//{
			// getLocateVm = new GetLocateVm();
			// getLocateVm.WareHouseNo = wareHouseNo; //仓库号
			// getLocateVm.StatusNum = "0";
			// getLocateVm.Status = "5";
			// getLocateVms.Add(getLocateVm);
			//}
			//4：移入中
			if (e == 0)
			{
			getLocateVm = new GetLocateVm();
			getLocateVm.WareHouseNo = wareHouseNo; //仓库号
			getLocateVm.StatusNum = "0";
			getLocateVm.Status = "4";
			getLocateVms.Add(getLocateVm);
			}
			//5：移出中
			if (f == 0)
			{
			getLocateVm = new GetLocateVm();
			getLocateVm.WareHouseNo = wareHouseNo; //仓库号
			getLocateVm.StatusNum = "0";
			getLocateVm.Status = "5";
			getLocateVms.Add(getLocateVm);
			}
			//6：损坏\屏蔽
			if (g == 0)
			{
			@@ -560,7 +607,7 @@
			{
			//根据仓库号以及巷道号获取储位各状态数据
			string str = "select Row,Status,COUNT(Status) StatusNum from SysStorageLocat where WareHouseNo = @warehouseno and RoadwayNo = @roadwayno group by Row,Status order by Row,Status";


			List<GetLocateVm> getLocateVms = Db.Ado.SqlQuery<GetLocateVm>(str, new
			{
			warehouseno = wareHouseNo, //仓库号
			@@ -588,8 +635,13 @@
			{
			try
			{
			string str = "select RoadwayNo,RoadwayName from SysStorageRoadway where IsDel = @isdel and WareHouseNo = @warehouseno";

			string str = "select RoadwayNo,RoadwayName,WareHouseNo from SysStorageRoadway where IsDel = @isdel";

			if (!string.IsNullOrWhiteSpace(wareHouseNo))
			{
			str += " and WareHouseNo = @warehouseno";
			}

			List<RoadwayDto> roadway = Db.Ado.SqlQuery<RoadwayDto>(str, new
			{
			isdel = "0", //是否删除
			@@ -620,7 +672,7 @@
			throw new Exception("未找到对应储位");
			}
			//有物品、出库中数据源（库存明细表）
			if (storageLocat.Status == "1" \|\| storageLocat.Status == "3")
			if (storageLocat.Status == "1" \|\| storageLocat.Status == "3" \|\| storageLocat.Status == "5")
			{
			//库存明细
			List<DataStockDetail> stockDetailList = Db.Queryable<DataStockDetail>().Where(w => w.LocatNo == locatNo && w.IsDel == "0").ToList();
			@@ -631,7 +683,7 @@
			model.LocatNo = locatNo;
			model.Status = storageLocat.Status;
			model.PalletNo = stockDetailList[0].PalletNo;


			List<LocateGoodsInfoVm> goodsList = new List<LocateGoodsInfoVm>();
			foreach (var item in stockDetailList)
			{
			@@ -649,7 +701,8 @@
			else if (storageLocat.Status == "2")
			{
			//托盘绑定信息
			List<BllPalletBind> palletBindList = Db.Queryable<BllPalletBind>().Where(w => w.LocatNo == locatNo && w.IsDel == "0").ToList();
			List<BllPalletBind> palletBindList = Db.Queryable<BllPalletBind>()
			.Where(w => w.LocatNo == locatNo && w.IsDel == "0" && w.Status == "1").ToList();
			if (palletBindList == null \|\| palletBindList.Count <= 0)
			{
			throw new Exception("未找到对应的托盘绑定信息");
			@@ -697,6 +750,12 @@
			case "3":
			model.Status = "出库中";
			break;
			case "4":
			model.Status = "移入中";
			break;
			case "5":
			model.Status = "移出中";
			break;
			default:
			model.Status = "";
			break;
			@@ -708,5 +767,64 @@
			throw new Exception(e.Message);
			}
			}

			#region 平库图例

			/// <summary>
			/// 获取储位信息(平库图例)
			/// </summary>
			/// <param name="wareHouseNo">仓库</param>
			/// <param name="row">排</param>
			/// <returns></returns>
			public List<SysStorageLocat> GetFlatLibraryLegend(string wareHouseNo, string row)
			{
			try
			{
			//一楼区域
			//List<string> row1 = new List<string>()
			//{
			// "B01",
			// "B02",
			// "B03",
			// "B04",
			// "B05",
			// "B06",
			// "B07",
			//};
			////二楼区域
			//List<string> row3 = new List<string>()
			//{
			// "B11",
			// "B12",
			// "B13",
			// "B14",
			// "B15",
			//};
			string row1 = "'B01','B02','B03','B04','B05','B06','B07'";
			string row3 = "'B11','B12','B13','B14','B15'";
			string str = $"select * from SysStorageLocat where IsDel = '0' and WareHouseNo = '{wareHouseNo}' and ";
			if (row == "1")
			{
			str += $" AreaNo in ({row1})";
			}
			else if (row == "3")
			{
			str += $" AreaNo in ({row3})";
			}

			var list = Db.Ado.SqlQuery<SysStorageLocat>(str);

			//var list = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.WareHouseNo == wareHouseNo && row == "1" ? row1.Contains(m.AreaNo) : row3.Contains(m.AreaNo)).ToList();

			return list;
			}
			catch (Exception e)
			{
			throw new Exception(e.Message);
			}

			}

			#endregion
			}
			}