WMSPrjInstance/HH-0014_NongFu_QingXi.git

			@@ -8,7 +8,6 @@
			using System.Linq;
			using System.Threading;
			using System.Threading.Tasks;
			using System.Web.UI.WebControls.WebParts;

			namespace HH.WCS.QingXigongchang.core
			{
			@@ -1029,7 +1028,7 @@
			static bool InworkLock = false;
			/// <summary>
			/// 原材料检测各流转位置。写入托盘货位s_type 中下一个目的地。就开始中转。
			/// 原物料纸箱，入库堆叠区转运
			/// 原物料纸箱，入库堆叠区转运 YWLRGDD--人工堆叠区
			/// </summary>
			internal static void BottTask()
			{
			@@ -1037,9 +1036,9 @@
			var usingSpace = new List<string> { "入库接驳区", "库内接驳区", "出库接驳区", "提升机退料口" };
			//usingSpace = new List<string> { "YWLRGDD", "YWLWJJB", "YWLYLTKQ", "YWLTKKTQ", "YWLKTDDQ", "YWLT1TSJ", "YWLT1TSJCD", "YWLT2TSJ", "YWLT2TSJCD" };
			usingSpace = new List<string> { "YWLYLTKQ", "YWLTKKTQ", "YWLWJJB", "YWLRGDD", "YWLT1TSJ", "YWLT2TSJ" };
			var dbll = new SqlHelper<object>().GetInstance();
			///----------------------------退余料中间库区，退空中间库区，
			/// /托盘货位表的 S_TYPE。库区1,库区,/

			foreach (var area in usingSpace)
			{
			try
			@@ -1105,6 +1104,19 @@
			//else
			var ccr = _clrel0.S_TYPE.Split(',');
			string EdnRarea = ccr.First();

			if (EdnRarea == "YWLBQWJ" \|\| EdnRarea == "YWLWJJB")//到B区的移库工单最多只能生成两条任务
			{
			//查询任务数
			List<string> AreaLi = new List<string>() { "YWLBQWJ", "YWLWJJB" };
			var db = new SqlHelper<object>().GetInstance();
			var list = db.Queryable<Location>().Where(a => AreaLi.Contains(a.S_AREA_CODE) && a.S_LOCK_STATE == "入库锁").ToList();
			if (list.Count() >= 2)
			{
			LogHelper.Info($"CreateTransport- CreateTask Error" + $"终点库区为YWLRGDD或者YWLWJJB 则最多只能生成两个任务");
			continue;
			}
			}
			string Last = string.Join(",", ccr.Skip(1));

			if (ABlist.Contains(EdnRarea))
			@@ -1122,9 +1134,20 @@
			var cir1 = cntritems.First();

			var arloclist = LocationHelper.GetAreaNormalLocList(EdnRarea);// LocationHelper.GetList<Location>(x => x.S_AREA_CODE == _clrel0.S_TYPE && x.S_LOCK_STATE != "报废");

			//有移库工单排除移库工单上所对应的排
			var order = LocationHelper.GetList<YWLZXtake>(X => X.S_ZX_STATE == "执行").ToList();
			if (order.Count() > 0)
			{
			foreach (var item in order)
			{
			LogHelper.Info($"有移库工单排除对应的库区{item.S_START_AREA} 排{item.N_START_ROW}");
			arloclist.RemoveAll(e => e.S_AREA_CODE == item.S_START_AREA && e.N_ROW == item.N_START_ROW);
			}
			}
			if (arloclist.Any())
			{
			if (EdnRarea == "YWLWJJB")
			if (EdnRarea == "YWLWJJB")//纸箱无菌接驳区
			// InworkLock = true;
			//else InworkLock = false;
			//if (od.S_ZZ_AREA == "YWLWJJB")
			@@ -1138,14 +1161,46 @@
			Location endbit = null;
			//foreach (var rss in arloclist.GroupBy(x => x.N_ROW).OrderByDescending(x => x.Count(y => y.N_CURRENT_NUM > 0)).ThenBy(xx => xx.Key))
			RowLock inlock = null;
			List<RowLock> inlockLis = new List<RowLock>();
			bool isCd = false;
			if (CDlist.Contains(EdnRarea))
			{
			isCd = true;
			inlock = LocationHelper.GetList<RowLock>(x => x.S_AREA_CODE == EdnRarea && x.S_LOCK_SRC == cir1.S_ITEM_CODE + cir1.S_ITEM_NAME + cir1.S_CJ_NAME && x.S_LOCK_STATE == "入库锁").FirstOrDefault();
			inlockLis = LocationHelper.GetList<RowLock>(x => x.S_AREA_CODE == EdnRarea && x.S_LOCK_SRC == cir1.S_ITEM_CODE + cir1.S_ITEM_NAME + cir1.S_CJ_NAME && x.S_LOCK_STATE == "入库锁").ToList();
			if (inlockLis.Count() > 0)
			{
			inlock = inlockLis.FirstOrDefault();
			}
			if (inlock != null)
			{
			arloclist = arloclist.FindAll(x => x.N_ROW == inlock.N_ROW).ToList();
			//当入库的任务能放满一排并且还有余的时候开第二排
			//先判断起点有多少相同的能入的物料
			if (_cl.S_AREA_CODE == "YWLRGDD")//判断起点是否是人工堆叠区
			{
			//然后判断人工堆叠区需要入库多少托同品种物料 startMum
			//货位托盘物料表联查
			LogHelper.Info($"查起点有多少同品种的物料开始");
			var ca = Expressionable.Create<Location, LocCntrRel, CntrItemRel>();
			ca.And((o, p, t) => o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "无" && t.S_ITEM_CODE == cir1.S_ITEM_CODE && t.S_ITEM_NAME == cir1.S_ITEM_NAME && t.S_CJ_NAME == cir1.S_CJ_NAME && o.S_AREA_CODE == "YWLRGDD" && p.S_TYPE == _clrel0.S_TYPE);
			var lstCanOutL = dbll.Queryable<Location>().InnerJoin<LocCntrRel>((o, p) => o.S_LOC_CODE == p.S_LOC_CODE).InnerJoin<CntrItemRel>((o, p, t) => p.S_CNTR_CODE == t.S_CNTR_CODE).Where(ca.ToExpression()).Includes(e => e.LocCntrRel, p => p.CntrItemRel).ToList();
			LogHelper.Info($"起点要入CD的有多少托盘数量为{lstCanOutL.Count()}");
			//判断终点排能入多少少于入库托盘数则多开一排 EndMum
			var EndMum = dbll.Queryable<Location>().Where(l => l.S_AREA_CODE == EdnRarea && l.N_CURRENT_NUM == 0 && l.S_LOCK_STATE == "无" && inlockLis.Select(e => e.N_ROW).ToList().Contains(l.N_ROW)).ToList();
			if (lstCanOutL.Count <= EndMum.Count())
			{
			arloclist = arloclist.FindAll(x => inlockLis.Select(e => e.N_ROW).ToList().Contains(x.N_ROW)).ToList();
			}
			else
			{
			arloclist = arloclist.FindAll(x => !inlockLis.Select(e => e.N_ROW).ToList().Contains(x.N_ROW)).ToList();
			inlock = null;
			}
			LogHelper.Info($"查起点有多少同品种的物料结束");
			}
			else
			{
			arloclist = arloclist.FindAll(x => x.N_ROW == inlock.N_ROW).ToList();
			}
			}
			}
			foreach (var rss in arloclist.GroupBy(x => x.N_ROW).OrderByDescending(x => x.Count(y => y.N_CURRENT_NUM > 0)).ThenBy(x => x.Key))
			@@ -1214,6 +1269,7 @@
			if (res && inlock == null && isCd)
			{
			var rrrr = new RowLock { S_LOCK_SRC = cir1.S_ITEM_CODE + cir1.S_ITEM_NAME + cir1.S_CJ_NAME, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "入库锁", S_AREA_CODE = endbit.S_AREA_CODE, N_ROW = endbit.N_ROW };
			LogHelper.Info($"原物料入库添加排锁信息{JsonConvert.SerializeObject(rrrr)} ");
			WCSHelper.Do(db => db.Insertable(rrrr).ExecuteCommand());
			}
			if (EdnRarea == "YWLWJJB") InworkLock = false;
			@@ -3589,7 +3645,6 @@
			/// </summary>
			public static void AutoRun13TSJ()
			{

			Action<YWLWorkOrder> _sAB没物料或者余量不足开始触发跟根据自动转运_名字越长越好 = (od) =>
			{
			LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}对应工单的{od.S_ROW} 物料数量不足。触发转运。");
			@@ -3699,15 +3754,18 @@
			{
			var l2 = new List<string>() { "YWLAQWJ", "YWLBQWJ" };//, "YWLCQSX", "YWLDQWJ" };
			l2.Remove(od.S_ROW);
			l2.Remove(od.TagOver);
			var odsr = new List<string> { od.TagOver, od.S_ROW }.Concat(l2).Distinct().ToList();
			//l2.Remove(od.TagOver);
			//var odsr = new List<string> { od.TagOver, od.S_ROW }.Concat(l2).Distinct().ToList();
			var odsr = new List<string> { od.S_ROW }.Concat(l2).Distinct().ToList();

			///汇总仓库里最大层是几层。
			Dictitems Lart = null;
			foreach (var area in odsr)//od.S_ROW.Split('$'))
			{
			if (string.IsNullOrEmpty(area)) continue;

			if (string.IsNullOrEmpty(area))
			{
			continue;
			}
			if (dsi.TryGetValue(area, out var dictitems1))
			{
			foreach (var d in dictitems1.FindAll(x => x.ItemCode == od.SQL_ItemCode && x.ItemName == od.SQL_ItemName && x.S_CJ_NAME == od.S_CJ_NAME))
			@@ -4028,6 +4086,19 @@
			var locS = LocationHelper.GetAreaNormalLocList(ODs.Key);
			foreach (var od in ODs)
			{
			if (od.S_END_AREA == "YWLBQWJ" \|\| od.S_END_AREA == "YWLAQWJ")//到B区的移库工单最多只能生成两条任务
			{

			//查询任务数
			List<string> AreaLi = new List<string>() { "YWLBQWJ", "YWLWJJB" };
			var db = new SqlHelper<object>().GetInstance();
			var list = db.Queryable<Location>().Where(a => AreaLi.Contains(a.S_AREA_CODE) && a.S_LOCK_STATE == "入库锁").ToList();
			if (list.Count() >= 2)
			{
			LogHelper.Info($"CreateTransport- CreateTask Error" + $"终点库区为YWLRGDD或者YWLWJJB 则最多只能生成两个任务");
			continue;
			}
			}
			LogHelper.Info($"YWL_ZX_Turn from{od.S_START_AREA} mid:{od.S_ZZ_AREA} to{od.S_END_AREA} 开始》》》");
			if (string.IsNullOrEmpty(od.S_ZZ_AREA) && string.IsNullOrEmpty(od.S_END_AREA))
			{