JC34WMS.git - Gitblit

			@@ -38,8 +38,8 @@
			dataStock = dataStock.Where(m => m.LotNo == lotNo);
			}
			//库存查找相同物料/批次的巷道
			var yiYouRoad = dataStock.GroupBy(m => m.RoadwayNo).Select(m => m.RoadwayNo).OrderBy(m => m).ToList();
			foreach (var l in yiYouRoad)
			var yiYouRoad = dataStock.GroupBy(m => m.RoadwayNo).Select(m => m.RoadwayNo).ToList();
			foreach (var l in yiYouRoad.OrderBy(m=>m).ToList())
			{
			// 判断当前巷道(组)是否有空余储位

			@@ -56,7 +56,6 @@
			//获取库存内已有物料的巷道
			var dataStockRoad = db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.WareHouseNo == house).GroupBy(m => m.RoadwayNo).OrderBy(m => m.RoadwayNo).Select(m => m.RoadwayNo).ToList();
			//排除掉已有物料的巷道

			roadways = roadways.Where(m => !dataStockRoad.Contains(m)).ToList();
			foreach (var l in roadways)
			{
			@@ -79,18 +78,18 @@

			}
			}
			if (bl)
			}
			if (bl)
			{
			// 判断当前巷道(组)是否有空余储位

			var locateCount = db.Queryable<SysStorageLocat>().Count(m => m.Status == "0" && m.Flag == "0" && areaList.Contains(m.AreaNo) && m.RoadwayNo == l);

			var bindNum = db.Queryable<LogTask>().Where(m => m.IsDel == "0" && (m.Status == "0" \|\| m.Status == "1") && m.EndRoadway == l)
			.GroupBy(m => m.PalletNo).Select(m => m.PalletNo).Count();
			if (locateCount - bindNum > 0)
			{
			// 判断当前巷道(组)是否有空余储位

			var locateCount = db.Queryable<SysStorageLocat>().Count(m => m.Status == "0" && m.Flag == "0" && areaList.Contains(m.AreaNo) && m.RoadwayNo == l);

			var bindNum = db.Queryable<LogTask>().Where(m => m.IsDel == "0" && (m.Status == "0" \|\| m.Status == "1") && m.EndRoadway == l)
			.GroupBy(m => m.PalletNo).Select(m => m.PalletNo).Count();
			if (locateCount - bindNum > 0)
			{
			return l;
			}
			return l;
			}
			}
			}
			@@ -105,16 +104,16 @@
			/// <param name="areaList">区域集合</param>
			/// <param name="lotNo">批次号</param>
			/// <returns></returns>
			public SysStorageLocat GetMiJiSuiTableLocate(SysStorageRoadway roadway, List<string> areaList, string sku, string lotNo = "")
			public SysStorageLocat GetMiJiSuiTableLocate(string roadwayNo, List<string> areaList)
			{

			var db = DataContext.Db;

			// 判断当前巷道(组)是否有空余储位
			var locateList = db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.RoadwayNo == roadway.RoadwayNo && areaList.Contains(m.AreaNo)).ToList();
			var locateList = db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.RoadwayNo == roadwayNo && areaList.Contains(m.AreaNo) && m.Status == "0").ToList();
			if (locateList.Count(m => m.Status == "0") > 0)
			{
			var bl = GetLocateASCOrDesc(roadway.RoadwayNo);
			var bl = GetLocateASCOrDesc(roadwayNo);

			var locate = locateList.OrderBy(m => m.LocatNo).First();

			@@ -146,7 +145,7 @@
			var locate = db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.RoadwayNo == roadStr);
			var a = locate.LocatNo.Substring(2,2);//储位列
			var b = locate.AisleOne.Substring(2, 2);//通道口列
			return int.Parse(a) < int.Parse(b);
			return int.Parse(a) > int.Parse(b);
			}

			/// <summary>
			@@ -166,6 +165,17 @@
			var locatList2 = db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.RoadwayNo == locate.RoadwayNo && m.Column > a).ToList();
			if (bl)
			{
			if (locatList1.Count(m => str2.Contains(m.Status)) > 0)
			{
			return false;
			}
			if (locatList2.Count(m => str1.Contains(m.Status)) > 0)
			{
			return false;
			}
			}
			else
			{
			if (locatList1.Count(m => str1.Contains(m.Status)) > 0)
			{
			return false;
			@@ -175,20 +185,105 @@
			return false;
			}
			}
			else
			{
			if (locatList1.Count(m => str2.Contains(m.Status)) > 0)
			{
			return false;
			}
			if (locatList2.Count(m => str1.Contains(m.Status)) > 0)
			{
			return false;
			}
			}
			return true;

			}

			/// <summary>
			/// 根据起始组获取位置最优的四项车取货工位
			/// </summary>
			/// <param name="straRoadway">起始组</param>
			/// <param name="outModel">出库口工位 9、 17、 18</param>
			/// <returns></returns>
			public string RoadwayToStationNum(string straRoadway, string outModel)
			{
			var db = DataContext.Db;
			string stationNum = "";

			string[] lists = straRoadway.Split("MR");
			var model = db.Queryable<SysStorageLocat>().First(m => m.RoadwayNo == straRoadway && m.IsDel == "0");
			string stat = model.AisleOne;

			if (model.Layer == 1)
			{ // 一层
			switch (outModel) // 申请的入库口
			{
			case "9":

			var path13 = Math.Abs(19 - int.Parse(stat.Substring(0, 2))) + Math.Abs(6 - int.Parse(stat.Substring(2, 2)));
			var path14 = Math.Abs(19 - int.Parse(stat.Substring(0, 2))) + Math.Abs(12 - int.Parse(stat.Substring(2, 2)));

			if (path13 <= path14)
			{
			stationNum = "190601";
			}
			else
			{
			stationNum = "191201";
			}
			break;
			case "17":
			stationNum = "030401";
			break;
			case "18":
			var path03 = Math.Abs(03 - int.Parse(stat.Substring(0, 2))) + Math.Abs(06 - int.Parse(stat.Substring(2, 2)));
			var path05 = Math.Abs(03 - int.Parse(stat.Substring(0, 2))) + Math.Abs(12 - int.Parse(stat.Substring(2, 2)));

			if (path03 <= path05)
			{
			stationNum = "030601";
			}
			else
			{
			stationNum = "031201";
			}
			break;
			default: break;
			}
			}
			else
			{ // 二层
			switch (outModel) // 申请的入库口
			{
			case "9":

			var path15 = Math.Abs(19 - int.Parse(stat.Substring(0, 2))) + Math.Abs(6 - int.Parse(stat.Substring(2, 2)));
			var path16 = Math.Abs(19 - int.Parse(stat.Substring(0, 2))) + Math.Abs(12 - int.Parse(stat.Substring(2, 2)));

			if (path15 <= path16)
			{
			stationNum = "190602";
			}
			else
			{
			stationNum = "191202";
			}

			break;
			case "17":
			stationNum = "030402";
			break;
			case "18":
			var path03 = Math.Abs(03 - int.Parse(stat.Substring(0, 2))) + Math.Abs(06 - int.Parse(stat.Substring(2, 2)));
			var path05 = Math.Abs(03 - int.Parse(stat.Substring(0, 2))) + Math.Abs(12 - int.Parse(stat.Substring(2, 2)));

			if (path03 <= path05)
			{
			stationNum = "030602";
			}
			else
			{
			stationNum = "031202";
			}

			break;
			default: break;
			}
			}

			return stationNum;
			}


			/// <summary>
			/// 获取合适的库位
			@@ -197,10 +292,14 @@
			/// <param name="areaList">区域集合</param>
			/// <param name="roadwayNo">巷道号(可空)</param>
			/// <returns></returns>
			public SysStorageLocat GetSuiTableLocate(string houseNo, List<string> areaList,string roadwayNo = "")
			public SysStorageLocat GetSuiTableLocate(string houseNo, List<string> areaList,string roadwayNo = "",string ceng = "")
			{
			try
			{
			if (string.IsNullOrWhiteSpace(ceng))
			{
			throw new Exception($"申请货架库位层数不能为空");
			}
			var db = DataContext.Db;
			/* 1.先判断仓库（立库或者平库）
			* 2.如果是立库再判断是否指定巷道号
			@@ -239,7 +338,7 @@

			//查询该巷道并且标志为正常的的储位
			roadwayList.Add(roadway);
			var locate = GetLocateByRoadways(roadwayList,areaList,true,houseNo);
			var locate = GetLocateByRoadways(roadwayList,areaList,true,houseNo, ceng);
			if (locate == null)
			{
			throw new Exception($"{roadwayNo}巷道没有合适的空储位");
			@@ -251,7 +350,7 @@
			{
			var roadwayList = db.Queryable<SysStorageRoadway>().Where(m => m.WareHouseNo == houseNo && m.Status == "0" && roadList.Contains(m.RoadwayNo)).OrderBy(m => new { m.Priority, m.RoadwayNo }).ToList();

			var locate = GetLocateByRoadways(roadwayList,areaList,false, houseNo);
			var locate = GetLocateByRoadways(roadwayList,areaList,false, houseNo,ceng);
			if (locate == null)
			{
			throw new Exception($"{houseNo}仓库已启用的巷道中没有合适的空储位");
			@@ -285,7 +384,7 @@
			/// <param name="areaList">区域集合</param>
			/// <param name="isRoadway">是否指定巷道</param>
			/// <returns></returns>
			private SysStorageLocat GetLocateByRoadways(List<SysStorageRoadway> roadways,List<string> areaList,bool isRoadway = false ,string houseNo = "W01")
			private SysStorageLocat GetLocateByRoadways(List<SysStorageRoadway> roadways,List<string> areaList,bool isRoadway = false ,string houseNo = "W02",string ceng = "")
			{
			try
			{
			@@ -374,24 +473,28 @@
			var count = 0;
			do
			{
			locate = GetLocateByRoadway(l.RoadwayNo, topOrBom, leftOrRight, areaList, list, ref count);
			locate = GetLocateByRoadway(l.RoadwayNo, topOrBom, leftOrRight, areaList, list, ref count, ceng);
			if (locate != null)
			{
			list.Add(locate.LocatNo);
			var isOk = LocateIsOk(locate);
			if (!isOk)
			{
			locate = null;
			}
			if (isOk)
			{
			break;
			}
			break;
			//list.Add(locate.LocatNo);
			//var isOk = LocateIsOk(locate);
			//if (!isOk)
			//{
			// locate = null;
			//}
			//if (isOk)
			//{
			// break;
			//}
			}


			} while (count != 0 && locate == null);//当查询储位数量不等0 并且储位为空时，再次循环巷道、区域查找储位

			if (locate!=null)
			{
			break;
			}
			}
			//如果跳巷道并且未找到合适空储位,则跳到最后一次使用的巷道查询
			if (!isRoadway)
			@@ -404,15 +507,16 @@
			var count = 0;
			do
			{
			locate = GetLocateByRoadway(log.RoadwayNo, topOrBom, leftOrRight, areaList, list, ref count);
			locate = GetLocateByRoadway(log.RoadwayNo, topOrBom, leftOrRight, areaList, list, ref count,ceng);
			if (locate != null)
			{
			list.Add(locate.LocatNo);
			var isOk = LocateIsOk(locate);
			if (!isOk)
			{
			locate = null;
			}
			break;
			//list.Add(locate.LocatNo);
			//var isOk = LocateIsOk(locate);
			//if (!isOk)
			//{
			// locate = null;
			//}
			}


			@@ -431,24 +535,28 @@
			var count = 0;
			do
			{
			locate = GetLocateByRoadway(item.RoadwayNo, topOrBom, leftOrRight, areaList, list, ref count);
			locate = GetLocateByRoadway(item.RoadwayNo, topOrBom, leftOrRight, areaList, list, ref count,ceng);
			if (locate != null)
			{
			list.Add(locate.LocatNo);
			var isOk = LocateIsOk(locate);
			if (!isOk)
			{
			locate = null;
			}
			if (isOk)
			{
			break;
			}
			break;
			//list.Add(locate.LocatNo);
			//var isOk = LocateIsOk(locate);
			//if (!isOk)
			//{
			// locate = null;
			//}
			//if (isOk)
			//{
			// break;
			//}
			}


			} while (count != 0 && locate == null);//当查询储位数量不等0 并且储位为空时，再次循环巷道、区域查找储位

			if (locate != null)
			{
			break;
			}
			}
			}

			@@ -471,7 +579,7 @@
			/// <param name="areaList">区域集合</param>
			/// <param name="locateNoStr">排除的储位集合</param>
			/// <returns></returns>
			private SysStorageLocat GetLocateByRoadway(string roadwayNo, int topOrBom, int leftOrRight,List<string> areaList,List<string> locateNoStr,ref int count)
			private SysStorageLocat GetLocateByRoadway(string roadwayNo, int topOrBom, int leftOrRight,List<string> areaList,List<string> locateNoStr,ref int count,string ceng = "")
			{
			var db = DataContext.Db;
			var str = "";
			@@ -492,7 +600,11 @@

			foreach (var area in areaList)
			{
			var sql = $@"select * from SysStorageLocat where IsDel = 0 and Flag = 0 and [Status] = 0 and RoadwayNo = '{roadwayNo}' and AreaNo = '{area}' and LocatNo not in({str}) ";
			var sql = $@"select * from SysStorageLocat where IsDel = 0 and Layer!= '3' and Flag = 0 and [Status] = 0 and RoadwayNo = '{roadwayNo}' and AreaNo = '{area}' and LocatNo not in({str}) ";
			if (!string.IsNullOrWhiteSpace(ceng))
			{
			sql += $"and Layer = '{ceng}' ";
			}
			sql += "order by ";
			sql += topOrBom == 0 ? "Layer desc, " : "Layer, ";
			sql += leftOrRight == 0 ? "[Column], " : "[Column] desc, ";
			@@ -515,7 +627,7 @@
			}

			/// <summary>
			/// 验证储位是否可入库
			/// 验证储位是否可入库双深位验证
			/// </summary>
			/// <param name="locate"></param>
			/// <returns></returns>