WMSPrjInstance/HH-0014_NongFu_QingXi.git

			@@ -1051,7 +1051,7 @@
			{

			var lolist = LocationHelper.GetAreaNormalLocList(area);// LocationHelper.GetList<Location>(x => x.S_AREA_CODE == area && x.S_LOCK_STATE != "报废");
			var lgrow = lolist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key);
			var lgrow = lolist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key).ToList();
			Dictionary<string, List<Location>> dsll = new Dictionary<string, List<Location>>();
			foreach (var rows in lgrow)
			{
			@@ -1120,12 +1120,12 @@
			//查询任务数
			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;
			}
			//var list = db.Queryable<Location>().Where(a => AreaLi.Contains(a.S_AREA_CODE) && a.S_LOCK_STATE == "入库锁").ToList();
			//if (list.Count() >= 3)
			//{
			// LogHelper.Info($"CreateTransport- CreateTask Error" + $"终点库区为YWLRGDD或者YWLWJJB 则最多只能生成两个任务");
			// continue;
			//}
			}
			string Last = string.Join(",", ccr.Skip(1));

			@@ -1197,71 +1197,38 @@
			if (CDlist.Contains(EdnRarea))
			{
			isCd = true;
			//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();
			//}
			inlock = RGRow.FirstOrDefault();
			if (inlock != null)
			{
			//当入库的任务能放满一排并且还有余的时候开第二排
			//先判断起点有多少相同的能入的物料
			if (_cl.S_AREA_CODE == "YWLRGDD")//判断起点是否是人工堆叠区
			{
			inlockLis = RGRow.FindAll(e => e.S_AREA_CODE == EdnRarea && e.S_LOCK_SRC == cir1.S_ITEM_CODE + cir1.S_ITEM_NAME + cir1.S_CJ_NAME).ToList();
			//然后判断人工堆叠区需要入库多少托同品种物料 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()).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();
			LogHelper.Info($"终点CD排有多少空托能入{lstCanOutL.Count()}");
			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();
			}
			}
			else
			{
			if (_cl.S_AREA_CODE == "YWLRGDD")
			{
			//查询是否有已经入了的排
			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 == EdnRarea);
			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()).ToList();
			LogHelper.Info($"终点有相同的物料的货位有{lstCanOutL.Count()}");

			var ca1 = Expressionable.Create<Location, LocCntrRel, CntrItemRel>();
			ca1.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 == EdnRarea);
			var lstCanOutLSta = 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(ca1.ToExpression()).ToList();
			if (lstCanOutL.Count() > 0)
			if (_cl.S_AREA_CODE == "YWLRGDD")
			{
			//查询是否有已经入了的排
			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 == EdnRarea);
			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()).ToList();
			LogHelper.Info($"终点有相同的物料的货位有{lstCanOutL.Count()}");

			var ca1 = Expressionable.Create<Location, LocCntrRel, CntrItemRel>();
			ca1.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 == EdnRarea);
			var lstCanOutLSta = 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(ca1.ToExpression()).ToList();
			if (lstCanOutL.Count() > 0)
			{
			var ProRow = lstCanOutL.GroupBy(e => e.N_ROW).Select(f => f.First()).ToList();
			//这些排能入的货位数
			var EndMum = dbll.Queryable<Location>().Where(l => l.S_AREA_CODE == EdnRarea && l.N_CURRENT_NUM == 0 && l.S_LOCK_STATE == "无" && lstCanOutL.Select(e => e.N_ROW).ToList().Contains(l.N_ROW)).ToList();

			//查询每一排最大的列小于这些列的不允许入
			foreach (var item in ProRow)
			{
			var EndMum = dbll.Queryable<Location>().Where(l => l.S_AREA_CODE == EdnRarea && l.N_CURRENT_NUM == 0 && l.S_LOCK_STATE == "无" && lstCanOutL.Select(e => e.N_ROW).ToList().Contains(l.N_ROW)).ToList();
			if (EndMum.Count() > 0)
			var MaxCol = lstCanOutL.FindAll(d => d.N_ROW == item.N_ROW).OrderByDescending(f => f.N_COL).First();
			EndMum.RemoveAll(f => f.N_ROW == item.N_ROW && f.N_COL < MaxCol.N_COL);
			}
			if (EndMum.Count() > 0)
			{
			if (lstCanOutL.Count() <= EndMum.Count())
			{
			if (lstCanOutL.Count() <= EndMum.Count())
			{
			arloclist = arloclist.FindAll(x => lstCanOutL.Select(e => e.N_ROW).ToList().Contains(x.N_ROW)).ToList();
			}
			arloclist = arloclist.FindAll(x => lstCanOutL.Select(e => e.N_ROW).ToList().Contains(x.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))
			@@ -1327,18 +1294,18 @@
			var sign = Settings.GetTimeStamp();
			var res = TaskProcess.CreateTransport(sign, _cl.S_LOC_CODE, endbit.S_LOC_CODE, "原物料搬运-纸箱", _clrel.Select(x => x.S_CNTR_CODE).ToList(), 1, endbit.N_CURRENT_NUM + 1, 1, 50, Last);///, EdnRarea == "YWLYLTKQ" ? _clrel0.S_TYPE : "");
			LogHelper.Info($"{r.Key}原物料搬运 {sign} 任务，创建{res} ");
			if (CDlist.Contains(endbit.S_AREA_CODE) && res)
			{
			LogHelper.Info($"添加内存排锁");
			var ggf = inlockLis.Find(e => e.S_LOCK_SRC == cir1.S_ITEM_CODE + cir1.S_ITEM_NAME + cir1.S_CJ_NAME && e.S_AREA_CODE == endbit.S_AREA_CODE && e.N_ROW == endbit.N_ROW);
			LogHelper.Info($"添加内存排锁是否查询到数据:{JsonConvert.SerializeObject(ggf)}");
			if (ggf == null)
			{
			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 };
			inlockLis.Add(rrrr);
			LogHelper.Info($"添加内存排锁添加数据到内存排锁中:{JsonConvert.SerializeObject(inlockLis)}");
			}
			}
			//if (CDlist.Contains(endbit.S_AREA_CODE) && res)
			//{
			// LogHelper.Info($"添加内存排锁");
			// var ggf = inlockLis.Find(e => e.S_LOCK_SRC == cir1.S_ITEM_CODE + cir1.S_ITEM_NAME + cir1.S_CJ_NAME && e.S_AREA_CODE == endbit.S_AREA_CODE && e.N_ROW == endbit.N_ROW);
			// LogHelper.Info($"添加内存排锁是否查询到数据:{JsonConvert.SerializeObject(ggf)}");
			// if (ggf == null)
			// {
			// 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 };
			// inlockLis.Add(rrrr);
			// LogHelper.Info($"添加内存排锁添加数据到内存排锁中:{JsonConvert.SerializeObject(inlockLis)}");
			// }
			//}
			//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 };
			@@ -1485,6 +1452,7 @@
			}
			}
			var locsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("标签-") && x.S_TYPE == WJ_BQ.RK_BBHJQ);
			var SblocsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("标签-") && x.S_NOTE.Contains("水") && !x.S_NOTE.Contains("饮料") && x.S_TYPE == SX_BQ.RK_BBHJQ);
			var SlocsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("标签-") && x.S_TYPE == SX_BQ.RK_BBHJQ);
			var TKlocsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("提扣-"));
			var PElocsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("收缩膜-"));
			@@ -1496,57 +1464,55 @@
			//}

			var TASKs = new List<Task>();
			var task1 = Task.Run(() =>
			//var task1 = Task.Run(() =>
			//{
			try
			{
			try
			// var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "无菌标签出库" && x.WorkType == 6 && x.SQL_State == "执行中").FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
			var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "无菌标签出库" && x.WorkType == 6 && x.SQL_State == "执行中").FindAll(x => x.OutNum > 0).OrderBy(x => x.TagOverTime).ToList();
			if (LocLock(WJ_BQ.RK_BBHJQ))
			{
			// var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "无菌标签出库" && x.WorkType == 6 && x.SQL_State == "执行中").FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
			var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "无菌标签出库" && x.WorkType == 6 && x.SQL_State == "执行中").FindAll(x => x.OutNum > 0).OrderBy(x => x.TagOverTime).ToList();
			if (LocLock(WJ_BQ.RK_BBHJQ))
			{
			//标签入库
			YwlBQ_CreInwork(locsFirst, WJ_BQ.RK_BQDDQ, WJ_BQ.RK_BBHJQ);
			}
			if (yuworders.Any())
			{
			LogHelper.Info($" 无菌出库工单开启中 ");
			// 标签出库。货架直接出到线边
			YwlBQ_CreWJOutOrder();
			}

			// 标签无菌退库。
			YwlBQ_CreWJTK();
			//标签入库
			YwlBQ_CreInwork(locsFirst, WJ_BQ.RK_BQDDQ, WJ_BQ.RK_BBHJQ);
			}
			catch (Exception ex)
			if (yuworders.Any())
			{
			LogHelper.Error(ex.Message, ex);
			LogHelper.Info($" 无菌出库工单开启中 ");
			// 标签出库。货架直接出到线边
			YwlBQ_CreWJOutOrder();
			}
			});

			var task11 = Task.Run(() =>
			// 标签无菌退库。
			YwlBQ_CreWJTK();
			}
			catch (Exception ex)
			{
			try
			LogHelper.Error(ex.Message, ex);
			}
			//});

			try
			{
			// var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "无菌标签出库" && x.WorkType == 6 && x.SQL_State == "执行中").FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
			var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "中水标签出库" && x.WorkType == 6 && x.SQL_State == "执行中").FindAll(x => x.OutNum > 0).OrderBy(x => x.TagOverTime).ToList();
			if (LocLock(SX_BQ.RK_BBHJQ))
			{
			// var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "无菌标签出库" && x.WorkType == 6 && x.SQL_State == "执行中").FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
			var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "中水标签出库" && x.WorkType == 6 && x.SQL_State == "执行中").FindAll(x => x.OutNum > 0).OrderBy(x => x.TagOverTime).ToList();
			if (LocLock(SX_BQ.RK_BBHJQ))
			{
			YwlBQ_CreInwork(locsFirst, SX_BQ.RK_BQDDQ, SX_BQ.RK_BBHJQ);
			}
			if (yuworders.Any())
			{
			LogHelper.Info($" 无菌出库工单开启中 ");
			// 中水标签退库。货架直接出到线边
			ZsBQ_CreWJOutOrder();
			}
			// 中水标签退库。
			ZsBQ_CreWJTK();
			//水标入库
			YwlBQ_CreInwork(SblocsFirst, SX_BQ.RK_BQDDQ, SX_BQ.RK_BBHJQ);
			}
			catch (Exception ex)
			if (yuworders.Any())
			{
			LogHelper.Error(ex.Message, ex);
			LogHelper.Info($" 无菌出库工单开启中 ");
			// 中水标签退库。货架直接出到线边
			ZsBQ_CreWJOutOrder();
			}
			});
			// 中水标签退库。
			ZsBQ_CreWJTK();
			}
			catch (Exception ex)
			{
			LogHelper.Error(ex.Message, ex);
			}


			var plc = Settings.GetDeviceInfoList().Where(a => a.deviceName == "T2提升机").FirstOrDefault();
			var task2 = Task.Run(() =>
			@@ -1559,11 +1525,11 @@

			var tklist = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 1 && x.SQL_State == "执行中");

			if (LocLock(SX_BQ.RK_BBHJQ))
			{
			//水线标签入库
			YwlBQ_CreInwork(SlocsFirst, SX_BQ.RK_BQDDQ, SX_BQ.RK_BBHJQ);
			}
			//if (LocLock(SX_BQ.RK_BBHJQ))
			//{
			// //水线标签入库
			// YwlBQ_CreInwork(SblocsFirst, SX_BQ.RK_BQDDQ, SX_BQ.RK_BBHJQ);
			//}
			if (tklist.Count() > 0)
			{
			var tk = tklist.FirstOrDefault();
			@@ -1601,271 +1567,278 @@
			LogHelper.Error(ex.Message, ex);
			}
			});
			var task3 = Task.Run(() =>
			//var task3 = Task.Run(() =>
			//{
			try
			{
			try
			//return;
			if (LocLock("YWLTKMKQ"))
			{
			//return;
			YwlPETKtkOrder("YWLZSXBKQ", "YWLTKMKQ", "提扣叉运");//提扣中水退库。
			YwlPETKOutOrder("YWLTKMKQ", "YWLZSXBKQ", "提扣叉运", 1);//提扣中水出库
			YwlPEZsOutOrder("YWLTKMKQ", "YWLZSXBKQ", "中水膜叉运", 1);//中水出库
			}
			catch (Exception ex)
			{
			LogHelper.Error(ex.Message, ex);
			}
			});
			var task4 = Task.Run(() =>
			YwlPETKOutOrder("YWLTKMKQ", "YWLZSXBKQ", "提扣叉运", 1);//提扣中水出库

			YwlPEZsOutOrder("YWLTKMKQ", "YWLZSXBKQ", "中水膜叉运", 1);//中水出库
			}
			catch (Exception ex)
			{
			try
			LogHelper.Error(ex.Message, ex);
			}
			//});
			//var task4 = Task.Run(() =>
			//{
			try
			{
			//return;
			///起点数据。终点库区堆叠层数。
			if (LocLock("YWLTKMKQ"))
			{
			//return;
			///起点数据。终点库区堆叠层数。
			YwlPETK_CreInwork(PElocsFirst, "YWLTKMKQ", "收缩膜叉运", 2);//PE膜
			YwlPETK_CreInwork(TKlocsFirst, "YWLTKMKQ", "提扣叉运", 1); //提扣
			//YwlPETKtkOrder("YWLZSXBKQ", "YWLTKMKQ", "收缩膜叉运");
			//YwlPETKOutOrder("YWLTKMKQ", "YWLZSXBKQ", "收缩膜叉运");// PE中出库
			}
			//YwlPETKtkOrder("YWLZSXBKQ", "YWLTKMKQ", "收缩膜叉运");
			//YwlPETKOutOrder("YWLTKMKQ", "YWLZSXBKQ", "收缩膜叉运");// PE中出库

			var tklist = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "T2提升机-收缩膜" && x.WorkType == 1 && x.SQL_State == "执行中");
			if (tklist.Count() > 0)
			var tklist = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "T2提升机-收缩膜" && x.WorkType == 1 && x.SQL_State == "执行中");
			if (tklist.Count() > 0)
			{
			LogHelper.Info("-收缩膜退库！");
			var tk = tklist.FirstOrDefault();

			var loc = LocationHelper.GetLoc(plc.location[0]);
			if (loc.N_CURRENT_NUM > 0 && loc.S_LOCK_STATE == "无")
			{
			LogHelper.Info("-收缩膜退库！");
			var tk = tklist.FirstOrDefault();

			var loc = LocationHelper.GetLoc(plc.location[0]);
			if (loc.N_CURRENT_NUM > 0 && loc.S_LOCK_STATE == "无")
			var rr_clrel = LocationHelper.GetLocCntrRel(loc.S_LOC_CODE);
			if (rr_clrel.FirstOrDefault()?.S_TYPE == BQ_PRA.B && DateTime.Now.Subtract(rr_clrel.FirstOrDefault()?.T_CREATE ?? DateTime.Now).TotalSeconds > 10)
			{
			var rr_clrel = LocationHelper.GetLocCntrRel(loc.S_LOC_CODE);
			if (rr_clrel.FirstOrDefault()?.S_TYPE == BQ_PRA.B && DateTime.Now.Subtract(rr_clrel.FirstOrDefault()?.T_CREATE ?? DateTime.Now).TotalSeconds > 10)
			var cir = ContainerHelper.GetCntrItemRel(rr_clrel.FirstOrDefault().S_CNTR_CODE).FirstOrDefault();
			if (cir == null)
			{ LogHelper.CErrorLog($"{loc.S_LOC_CODE} 没有托盘物料数据！！"); return; }
			var s_type = cir?.N_BQ_TRAY_TYPE ?? 0;
			if (s_type == 0)
			{
			var cir = ContainerHelper.GetCntrItemRel(rr_clrel.FirstOrDefault().S_CNTR_CODE).FirstOrDefault();
			if (cir == null)
			{ LogHelper.CErrorLog($"{loc.S_LOC_CODE} 没有托盘物料数据！！"); return; }
			var s_type = cir?.N_BQ_TRAY_TYPE ?? 0;
			if (s_type == 0)
			{
			LogHelper.CErrorLog($"{tk.SQL_WorkNo}-{tk.SQL_PLineNo} 退库工单开启，绑定的零整标记");
			}
			Location Endbit = null;
			//Endbit = hjs.FindAll(x => x.N_LAYER == (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3))).OrderBy(x => x.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();
			//if (Endbit != null)
			//{
			// var re = TaskProcess.CreateTransport("", loc.S_LOC_CODE.Trim(), Endbit.S_LOC_CODE, "收缩膜叉运-T2退库", rr_clrel.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, 1, 62);
			// LogHelper.CSucessLog($"from {loc.S_LOC_CODE} to {Endbit.S_LOC_CODE} 标签叉运-T2退库，创建{re}");
			//}
			string v = "YWLTKMKQ";
			var rklist = LocationHelper.GetRowLock(v);
			int hof = (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3));

			var inlock = rklist.Find(x => x.S_LOCK_SRC == (cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim() + hof) && x.S_LOCK_STATE.Contains("入库锁"));
			Location EndBit = null;
			var NormalList = LocationHelper.GetAreaNormalLocList(v);
			//有入库锁排。能入就入。不能就等。
			if (inlock != null)
			{
			var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));
			foreach (var rs in loclist1.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * -1))
			{
			var srloclist = rs.OrderBy(x => x.N_COL).ToList();
			var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
			if (lastfull != null)
			{
			var c = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
			var xcirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
			if (!xcirs.Any()) continue;
			var xcir = xcirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
			if (cir.S_ITEM_CODE != xcir.S_ITEM_CODE \|\| cir.S_ITEM_NAME != xcir.S_ITEM_NAME \|\| xcir.S_CJ_NAME != cir.S_CJ_NAME)
			continue;
			}
			EndBit = srloclist.Find(x => x.S_LOCK_STATE == "无" && x.N_CURRENT_NUM < Math.Min(x.N_CAPACITY, 3) && x.S_LOCK_STATE != "报废" && x.N_COL >= (lastfull?.N_COL ?? 0));
			if (EndBit != null)
			break;
			}
			}
			else
			{
			var hasNum = NormalList.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
			var EptRowlist = NormalList.FindAll(x => !hasNum.Contains(x.N_ROW));
			if (EptRowlist.Any())
			{
			EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (-1)).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
			}
			}
			if (EndBit != null)
			{
			var res = TaskProcess.CreateTransport("", loc.S_LOC_CODE.Trim(), EndBit.S_LOC_CODE, "收缩膜叉运-入库", new List<string> { cir.S_CNTR_CODE }, 1, EndBit.N_CURRENT_NUM + 1, 1, 62);
			LogHelper.CSucessLog($"from {loc.S_LOC_CODE} to {EndBit.S_LOC_CODE} {("收缩膜叉运-入库")} ，创建{res} ");

			if (res && inlock == null)
			{
			var r = new RowLock { S_LOCK_SRC = (cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim() + hof), T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "入库锁", S_AREA_CODE = EndBit.S_AREA_CODE, N_ROW = EndBit.N_ROW };
			var row = db.Queryable<RowLock>().Where(x => x.S_AREA_CODE == r.S_AREA_CODE && r.N_ROW == x.N_ROW).First();
			if (row != null)
			{
			if (row.S_LOCK_SRC != r.S_LOCK_SRC)
			{
			db.Deleteable(row).ExecuteCommand();
			db.Insertable(r).ExecuteCommand();
			}
			}
			else db.Insertable(r).ExecuteCommand();
			}
			}
			Thread.Sleep(1000);

			LogHelper.CErrorLog($"{tk.SQL_WorkNo}-{tk.SQL_PLineNo} 退库工单开启，绑定的零整标记");
			}
			}
			}
			else
			//YwlPETKOutOrder("YWLTKMKQ", "", "PE叉运");// PE小出库
			{
			LogHelper.Info("-收缩膜出库！");
			var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "T2提升机-收缩膜" && x.WorkType == 6 && x.SQL_State == "执行中").FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
			if (!yuworders.Any())
			{
			LogHelper.Info("-收缩膜出库！没有出库单。");
			return;
			}
			var ploc = plc.location[0];
			retuse:
			var order = yuworders.FirstOrDefault();
			if (yuworders.Count() > 0)
			{
			//var Cjsj = LocationHelper.GetList<CjTimeOrder>(x => yuworders.Select(c => c.S_CJ_NAME).ToList().Contains(x.S_CJ_NAME) && yuworders.Select(c => c.SQL_ItemCode).ToList().Contains(x.S_ITEM_CODE));
			//if (Cjsj.Count() > 0)
			Location Endbit = null;
			//Endbit = hjs.FindAll(x => x.N_LAYER == (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3))).OrderBy(x => x.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();
			//if (Endbit != null)
			//{
			// var Cj = Cjsj.OrderBy(e => e.T_CJ_TIME).ToList().FirstOrDefault();
			// order = yuworders.Find(e => e.S_CJ_NAME == Cj.S_CJ_NAME && e.SQL_ItemCode == Cj.S_ITEM_CODE);
			// var re = TaskProcess.CreateTransport("", loc.S_LOC_CODE.Trim(), Endbit.S_LOC_CODE, "收缩膜叉运-T2退库", rr_clrel.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, 1, 62);
			// LogHelper.CSucessLog($"from {loc.S_LOC_CODE} to {Endbit.S_LOC_CODE} 标签叉运-T2退库，创建{re}");
			//}
			}
			if (order != null)
			{
			var Porder = WCSHelper.GetWorkOrder(order.SQL_LinkLineNO);
			if (Porder == null)
			{
			LogHelper.CErrorLog("小水出库：" + (order.SQL_LinkLineNO) + "没有【执行中】的工单");
			yuworders.Remove(order);
			goto retuse;
			}
			var oto = new List<string>();
			//if (!string.IsNullOrEmpty(order.TagOver))
			// oto = order.TagOver.Split(',').ToList();
			var oic = order.SQL_ItemCode?.Trim();
			var oin = order.SQL_ItemName?.Trim();
			if (string.IsNullOrEmpty(oic) \|\| string.IsNullOrEmpty(oin))
			{
			LogHelper.CErrorLog("小水出库：" + (order.SQL_WorkNo) + "没有【指定物料；");
			goto retuse;
			}
			LogHelper.Info("-收缩膜出库！" + oic + oin);

			string v = "YWLTKMKQ";
			int ord = -1;
			locCntItem StartBit = null;
			Location EndBit = null;
			CntrItemRel cir = null;
			var rklist = LocationHelper.GetRowLock(v);
			var outlock = rklist.Find(x => x.S_AREA_CODE == v && x.S_LOCK_SRC == (oic + "&" + oin) && x.S_LOCK_STATE.Contains("出库锁"));
			var NormalList = LocationHelper.GetAreaNormalLocList(v);
			if (outlock != null)
			{
			NormalList = NormalList.FindAll(x => outlock.N_ROW == (x.N_ROW));
			}
			var taglist = new List<string>() { oic };
			foreach (var item in NormalList.GroupBy(X => X.N_ROW).OrderBy(x => x.Key * ord))
			{
			locCntItem Temp = null;
			var y = item.OrderBy(x => x.N_COL).ToList();
			var lastfull = y.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
			if (lastfull != null)
			{
			var CNTR = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
			if (!CNTR.Any()) continue;
			var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
			if (!cirs.Any()) continue;
			cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
			LogHelper.Info($"收缩膜出库！{item.Key}排 [{cir.S_ITEM_CODE}-{order.SQL_ItemCode}] [{cir.S_ITEM_NAME}-{order.SQL_ItemName}] [{cir.S_CJ_NAME}-{order.S_CJ_NAME}] {(cir.S_ITEM_CODE == order.SQL_ItemCode && cir.S_ITEM_NAME == order.SQL_ItemName && cir.S_CJ_NAME == order.S_CJ_NAME)}");
			if (cir.S_ITEM_CODE == order.SQL_ItemCode && cir.S_ITEM_NAME == order.SQL_ItemName && cir.S_CJ_NAME == order.S_CJ_NAME)
			{
			//plg 2025年6月13日 09:08:10
			Temp = new locCntItem
			{
			N_CURRENT_NUM = lastfull.N_CURRENT_NUM,
			S_CNTR_CODE = cir.S_CNTR_CODE,
			S_LOC_CODE = lastfull.S_LOC_CODE,
			HalfOrFull = (cir.N_BQ_TRAY_TYPE == .5 ? 1 : (cir.N_BQ_TRAY_TYPE == .75 ? 2 : 3)),
			S_NOTE = cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim(),
			S_CJ_NAME = cir.S_CJ_NAME
			};
			if (outlock != null)
			{
			StartBit = Temp;
			break;
			}
			}
			if (Temp != null)
			{
			if (StartBit == null)
			StartBit = Temp;
			else if (StartBit.HalfOrFull > Temp.HalfOrFull)
			{
			StartBit = Temp;
			}
			if (StartBit.HalfOrFull == 1) break;
			}
			}
			}
			if (StartBit != null)
			{
			var tagLoc = StartBit;
			// 直接出提升机位
			int hof = (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3));

			LogHelper.Info(order.SQL_PLineNo + $"-收缩膜出库！终点{ploc}-{DeviceProcess.doorStatus[ploc]?.info}");
			if (!string.IsNullOrEmpty(ploc) && plc != null && DeviceProcess.doorStatus[ploc]?.info == "1")
			var inlock = rklist.Find(x => x.S_LOCK_SRC == (cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim() + hof) && x.S_LOCK_STATE.Contains("入库锁"));
			Location EndBit = null;
			var NormalList = LocationHelper.GetAreaNormalLocList(v);
			//有入库锁排。能入就入。不能就等。
			if (inlock != null)
			{
			var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));
			foreach (var rs in loclist1.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * -1))
			{
			var loc = LocationHelper.GetLoc(ploc);
			LogHelper.Info(order.SQL_PLineNo + $"-收缩膜出库！终点{loc.N_CURRENT_NUM}-{loc.S_LOCK_STATE}");
			if (loc.N_CURRENT_NUM == 0 && loc.S_LOCK_STATE == "无")
			var srloclist = rs.OrderBy(x => x.N_COL).ToList();
			var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
			if (lastfull != null)
			{
			var re = TaskProcess.CreateTransport("", tagLoc.S_LOC_CODE.Trim(), loc.S_LOC_CODE, "收缩膜叉运-货架出提升机", new List<string> { tagLoc.S_CNTR_CODE }, StartBit.N_CURRENT_NUM, 1, 1, 62);
			LogHelper.CSucessLog($"from {tagLoc.S_LOC_CODE} to {loc.S_LOC_CODE} 收缩膜叉运-货架出提升机，创建{re} ");
			if (re)
			{
			oto.Add(oic);
			if (outlock == null)
			{
			var r = new RowLock { S_LOCK_SRC = (StartBit.S_NOTE /+ StartBit.HalfOrFull/), T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "出库锁", S_AREA_CODE = StartBit.S_AREA_CODE, N_ROW = StartBit.N_ROW };
			db.Insertable(r).ExecuteCommand();
			}
			}
			var c = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
			var xcirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
			if (!xcirs.Any()) continue;
			var xcir = xcirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
			if (cir.S_ITEM_CODE != xcir.S_ITEM_CODE \|\| cir.S_ITEM_NAME != xcir.S_ITEM_NAME \|\| xcir.S_CJ_NAME != cir.S_CJ_NAME)
			continue;
			}
			EndBit = srloclist.Find(x => x.S_LOCK_STATE == "无" && x.N_CURRENT_NUM < Math.Min(x.N_CAPACITY, 3) && x.S_LOCK_STATE != "报废" && x.N_COL >= (lastfull?.N_COL ?? 0));
			if (EndBit != null)
			break;
			}
			}
			else
			{
			LogHelper.Info(order.SQL_PLineNo + "-收缩膜出库！没有可用物料");
			var hasNum = NormalList.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
			var EptRowlist = NormalList.FindAll(x => !hasNum.Contains(x.N_ROW));
			if (EptRowlist.Any())
			{
			EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (-1)).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
			}
			}
			var set1 = new HashSet<string>(oto);
			var set2 = new HashSet<string>(taglist);

			if (set1.SetEquals(set2))
			if (EndBit != null)
			{
			//order.OutNum++;
			var res = TaskProcess.CreateTransport("", loc.S_LOC_CODE.Trim(), EndBit.S_LOC_CODE, "收缩膜叉运-入库", new List<string> { cir.S_CNTR_CODE }, 1, EndBit.N_CURRENT_NUM + 1, 1, 62);
			LogHelper.CSucessLog($"from {loc.S_LOC_CODE} to {EndBit.S_LOC_CODE} {("收缩膜叉运-入库")} ，创建{res} ");

			order.OutNum--;
			order.TagOverTime = DateTime.Now;
			//order.TagOver = string.Empty;
			db.Updateable(order).UpdateColumns(it => new { /it.TagOver,/it.OutNum, it.TagOverTime }).ExecuteCommand();
			LogHelper.CSucessLog($"{order.SQL_PLineNo}-{order.SQL_LinkLineNO} 标签完成。重置数据");
			if (res && inlock == null)
			{
			var r = new RowLock { S_LOCK_SRC = (cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim() + hof), T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "入库锁", S_AREA_CODE = EndBit.S_AREA_CODE, N_ROW = EndBit.N_ROW };
			var row = db.Queryable<RowLock>().Where(x => x.S_AREA_CODE == r.S_AREA_CODE && r.N_ROW == x.N_ROW).First();
			if (row != null)
			{
			if (row.S_LOCK_SRC != r.S_LOCK_SRC)
			{
			db.Deleteable(row).ExecuteCommand();
			db.Insertable(r).ExecuteCommand();
			}
			}
			else db.Insertable(r).ExecuteCommand();
			}
			}
			Thread.Sleep(1000);

			}
			}
			}
			catch (Exception ex)
			else
			//YwlPETKOutOrder("YWLTKMKQ", "", "PE叉运");// PE小出库
			{
			LogHelper.Error(ex.Message, ex);
			LogHelper.Info("-收缩膜出库！");
			var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "T2提升机-收缩膜" && x.WorkType == 6 && x.SQL_State == "执行中").FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
			if (!yuworders.Any())
			{
			LogHelper.Info("-收缩膜出库！没有出库单。");
			return;
			}
			var ploc = plc.location[0];
			retuse:
			var order = yuworders.FirstOrDefault();
			if (yuworders.Count() > 0)
			{
			//var Cjsj = LocationHelper.GetList<CjTimeOrder>(x => yuworders.Select(c => c.S_CJ_NAME).ToList().Contains(x.S_CJ_NAME) && yuworders.Select(c => c.SQL_ItemCode).ToList().Contains(x.S_ITEM_CODE));
			//if (Cjsj.Count() > 0)
			//{
			// var Cj = Cjsj.OrderBy(e => e.T_CJ_TIME).ToList().FirstOrDefault();
			// order = yuworders.Find(e => e.S_CJ_NAME == Cj.S_CJ_NAME && e.SQL_ItemCode == Cj.S_ITEM_CODE);
			//}
			}
			if (order != null)
			{
			var Porder = WCSHelper.GetWorkOrder(order.SQL_LinkLineNO);
			if (Porder == null)
			{
			LogHelper.CErrorLog("小水出库：" + (order.SQL_LinkLineNO) + "没有【执行中】的工单");
			yuworders.Remove(order);
			goto retuse;
			}
			var oto = new List<string>();
			//if (!string.IsNullOrEmpty(order.TagOver))
			// oto = order.TagOver.Split(',').ToList();
			var oic = order.SQL_ItemCode?.Trim();
			var oin = order.SQL_ItemName?.Trim();
			if (string.IsNullOrEmpty(oic) \|\| string.IsNullOrEmpty(oin))
			{
			LogHelper.CErrorLog("小水出库：" + (order.SQL_WorkNo) + "没有【指定物料；");
			goto retuse;
			}
			LogHelper.Info("-收缩膜出库！" + oic + oin);

			string v = "YWLTKMKQ";
			int ord = -1;
			locCntItem StartBit = null;
			Location EndBit = null;
			CntrItemRel cir = null;
			var rklist = LocationHelper.GetRowLock(v);
			var outlock = rklist.Find(x => x.S_AREA_CODE == v && x.S_LOCK_SRC == (oic + "&" + oin) && x.S_LOCK_STATE.Contains("出库锁"));
			var NormalList = LocationHelper.GetAreaNormalLocList(v);
			if (outlock != null)
			{
			NormalList = NormalList.FindAll(x => outlock.N_ROW == (x.N_ROW));
			}
			var taglist = new List<string>() { oic };
			foreach (var item in NormalList.GroupBy(X => X.N_ROW).OrderBy(x => x.Key * ord))
			{
			locCntItem Temp = null;
			var y = item.OrderBy(x => x.N_COL).ToList();
			var lastfull = y.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
			if (lastfull != null)
			{
			var CNTR = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
			if (!CNTR.Any()) continue;
			var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
			if (!cirs.Any()) continue;
			cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
			LogHelper.Info($"收缩膜出库！{item.Key}排 [{cir.S_ITEM_CODE}-{order.SQL_ItemCode}] [{cir.S_ITEM_NAME}-{order.SQL_ItemName}] [{cir.S_CJ_NAME}-{order.S_CJ_NAME}] {(cir.S_ITEM_CODE == order.SQL_ItemCode && cir.S_ITEM_NAME == order.SQL_ItemName)}");
			if (cir.S_ITEM_CODE == order.SQL_ItemCode && cir.S_ITEM_NAME == order.SQL_ItemName)
			{
			//plg 2025年6月13日 09:08:10
			Temp = new locCntItem
			{
			N_CURRENT_NUM = lastfull.N_CURRENT_NUM,
			S_CNTR_CODE = cir.S_CNTR_CODE,
			S_LOC_CODE = lastfull.S_LOC_CODE,
			HalfOrFull = (cir.N_BQ_TRAY_TYPE == .5 ? 1 : (cir.N_BQ_TRAY_TYPE == .75 ? 2 : 3)),
			S_NOTE = cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim(),
			S_CJ_NAME = cir.S_CJ_NAME
			};
			if (outlock != null)
			{
			StartBit = Temp;
			break;
			}
			}
			if (Temp != null)
			{
			if (StartBit == null)
			StartBit = Temp;
			else if (StartBit.HalfOrFull > Temp.HalfOrFull)
			{
			StartBit = Temp;
			}
			if (StartBit.HalfOrFull == 1) break;
			}
			}
			}
			if (StartBit != null)
			{
			var tagLoc = StartBit;
			// 直接出提升机位

			LogHelper.Info(order.SQL_PLineNo + $"-收缩膜出库！终点{ploc}-{DeviceProcess.doorStatus[ploc]?.info}");
			if (!string.IsNullOrEmpty(ploc) && plc != null && DeviceProcess.doorStatus[ploc]?.info == "1")
			{
			var loc = LocationHelper.GetLoc(ploc);
			LogHelper.Info(order.SQL_PLineNo + $"-收缩膜出库！终点{loc.N_CURRENT_NUM}-{loc.S_LOCK_STATE}");
			if (loc.N_CURRENT_NUM == 0 && loc.S_LOCK_STATE == "无")
			{
			var re = TaskProcess.CreateTransport("", tagLoc.S_LOC_CODE.Trim(), loc.S_LOC_CODE, "收缩膜叉运-货架出提升机", new List<string> { tagLoc.S_CNTR_CODE }, StartBit.N_CURRENT_NUM, 1, 1, 62);
			LogHelper.CSucessLog($"from {tagLoc.S_LOC_CODE} to {loc.S_LOC_CODE} 收缩膜叉运-货架出提升机，创建{re} ");
			if (re)
			{
			oto.Add(oic);
			//if (outlock == null)
			//{
			// var r = new RowLock { S_LOCK_SRC = (StartBit.S_NOTE /+ StartBit.HalfOrFull/), T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "出库锁", S_AREA_CODE = StartBit.S_AREA_CODE, N_ROW = StartBit.N_ROW };
			// db.Insertable(r).ExecuteCommand();
			//}
			}
			}
			}
			}
			else
			{
			LogHelper.Info(order.SQL_PLineNo + "-收缩膜出库！没有可用物料");
			}
			var set1 = new HashSet<string>(oto);
			var set2 = new HashSet<string>(taglist);

			if (set1.SetEquals(set2))
			{
			//order.OutNum++;

			order.OutNum--;
			order.TagOverTime = DateTime.Now;
			//order.TagOver = string.Empty;
			db.Updateable(order).UpdateColumns(it => new { /it.TagOver,/it.OutNum, it.TagOverTime }).ExecuteCommand();
			LogHelper.CSucessLog($"{order.SQL_PLineNo}-{order.SQL_LinkLineNO} 标签完成。重置数据");
			}
			}
			}
			});
			}
			catch (Exception ex)
			{
			LogHelper.Error(ex.Message, ex);
			}
			// });
			// Task.WaitAll(task1, task2, task3, task4);
			LogHelper.CoCo(DateTime.Now + "标签-提扣-PE膜- Over=============== ", ConsoleColor.Cyan);
			}
			@@ -1907,16 +1880,24 @@
			{
			continue;
			}

			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 == cir.S_ITEM_CODE && t.S_ITEM_NAME == cir.S_ITEM_NAME && t.S_CJ_NAME == cir.S_CJ_NAME && o.S_AREA_CODE == v2);
			var lstCanOutL = db.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()).ToList();

			Location EndBit = null;
			var NormalList = LocationHelper.GetAreaNormalLocList(v2);
			NormalList = NormalList.FindAll(e => lstCanOutL.Select(c => c.N_ROW).ToList().Contains(e.N_ROW));
			if (lstCanOutL.Any())
			{
			var NormalListt = NormalList.FindAll(e => lstCanOutL.Select(c => c.N_ROW).ToList().Contains(e.N_ROW));
			var lastfull = NormalListt.FindAll(x => x.N_CURRENT_NUM > 0).ToList();
			if (lastfull.Count() > 0)
			{
			NormalList = NormalListt;
			}
			}

			//有入库锁排。能入就入。不能就等。
			if (NormalList.Count() > 0)
			if (NormalList.Count() > 0 && lstCanOutL.Any())
			{
			var loclist1 = NormalList.ToList();
			foreach (var rs in loclist1.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * -1))
			@@ -1943,11 +1924,9 @@
			LogHelper.CSucessLog($"from {lastfull1.S_LOC_CODE} to {EndBit.S_LOC_CODE} {v3}-退库，创建{res} ");

			}

			}
			}
			}

			//执行退库。。。
			Console.WriteLine($"{v.FirstOrDefault()?.S_LOC_CODE} 需要退库-- 自动退库-未实现");
			}
			@@ -2026,8 +2005,9 @@
			Location Endbit = null;
			//if (area == area/* WJ_BQ.RK_BQJBQ*/)
			//{
			var hjs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BBHJQ, true, false);
			Endbit = hjs.FindAll(x => x.N_CURRENT_NUM == 0 && x.N_LAYER == (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3))).OrderBy(x => x.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();
			var hjs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BBHJQ, false, false);
			var Type = s_type == .5 ? 1 : (s_type == .75 ? 2 : 3);
			Endbit = hjs.FindAll(x => x.N_CURRENT_NUM == 0 && x.N_LAYER == Type).OrderBy(x => x.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();
			if (Endbit != null)
			{
			var re = TaskProcess.CreateTransport("", lastfull.S_LOC_CODE.Trim(), Endbit.S_LOC_CODE, "标签叉运-线边标签退库", CNTR.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, 1, 62);
			@@ -2154,39 +2134,61 @@
			{
			NormalList2 = NormalList2.FindAll(e => e.N_ROW == 2).ToList();
			}
			if (EndBit == null && NormalList2.Count() > 0)
			{
			var NormalList3 = NormalList2.FindAll(e => e.N_CURRENT_NUM == 0).ToList();

			var ManLoc = NormalList2.FindAll(e => e.N_CURRENT_NUM > 0).ToList();
			if (ManLoc.Count() > 0)
			{
			var MaxCol = ManLoc.OrderByDescending(e => e.N_COL).ToList().FirstOrDefault();
			LogHelper.Info($"提扣出库获取最大列 {MaxCol.N_COL} ");
			NormalList3 = NormalList3.FindAll(e => e.N_COL > MaxCol.N_COL).ToList();
			var srloclist = NormalList3.OrderBy(x => x.N_COL).FirstOrDefault();
			EndBit = srloclist;
			}
			else
			{
			var srloclist = NormalList2.OrderBy(x => x.N_COL).FirstOrDefault();
			EndBit = srloclist;
			}
			}
			//if (inlock != null)
			//{
			// var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));
			foreach (var rs in NormalList2.GroupBy(x => x.N_ROW).OrderBy(x => x.Key))
			{
			var srloclist = rs.OrderBy(x => x.N_COL).ToList();
			var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
			if (lastfull != null)
			{
			var CNTR = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
			if (!CNTR.Any()) continue;
			if (CNTR.Find(x => x.S_TYPE == BQ_PRA.B) != null) continue;
			var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
			if (!cirs.Any()) continue;
			var cir2 = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
			if (cir2.S_ITEM_CODE != od.SQL_ItemCode \|\| cir2.S_ITEM_NAME != od.SQL_ItemName \|\| StartBit.HalfOrFull != (cir.N_BQ_TRAY_TYPE == .5 ? 1 : (cir.N_BQ_TRAY_TYPE == .75 ? 2 : 3)))
			continue;
			EndBit = srloclist.Find(x => x.S_LOCK_STATE == "无" && x.N_CURRENT_NUM < Math.Min(x.N_CAPACITY, v3) && x.S_LOCK_STATE != "报废" && x.N_COL >= (lastfull?.N_COL ?? 0));
			}
			if (EndBit != null)
			break;
			}

			//foreach (var rs in NormalList2.GroupBy(x => x.N_ROW).OrderBy(x => x.Key))
			//{
			// var srloclist = rs.OrderBy(x => x.N_COL).ToList();
			// var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM == 0).LastOrDefault();
			// if (lastfull != null)
			// {
			// var CNTR = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
			// if (!CNTR.Any()) continue;
			// if (CNTR.Find(x => x.S_TYPE == BQ_PRA.B) != null) continue;
			// var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
			// if (!cirs.Any()) continue;
			// var cir2 = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
			// // if (cir2.S_ITEM_CODE != od.SQL_ItemCode \|\| cir2.S_ITEM_NAME != od.SQL_ItemName \|\| StartBit.HalfOrFull != (cir.N_BQ_TRAY_TYPE == .5 ? 1 : (cir.N_BQ_TRAY_TYPE == .75 ? 2 : 3)))
			// //if (cir2.S_ITEM_CODE != od.SQL_ItemCode \|\| cir2.S_ITEM_NAME != od.SQL_ItemName)
			// // continue;
			// EndBit = srloclist.Find(x => x.S_LOCK_STATE == "无" && x.N_CURRENT_NUM < Math.Min(x.N_CAPACITY, v3) && x.S_LOCK_STATE != "报废" && x.N_COL >= (lastfull?.N_COL ?? 0));
			// }
			// if (EndBit != null)
			// break;
			//}
			//else
			if (EndBit == null)
			{
			var hasNum = NormalList2.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
			var EptRowlist = NormalList2.FindAll(x => !hasNum.Contains(x.N_ROW));
			if (EptRowlist.Any())
			{
			EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
			}
			}

			////}
			////else
			//if (EndBit == null)
			//{
			// var hasNum = NormalList2.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
			// var EptRowlist = NormalList2.FindAll(x => !hasNum.Contains(x.N_ROW));
			// if (EptRowlist.Any())
			// {
			// EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
			// }
			//}

			//foreach (var item in sLocs.GroupBy(X => X.N_ROW).OrderBy(x => x.Key * ord))
			//{
			@@ -2324,35 +2326,53 @@
			//if (inlock != null)
			//{
			// var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));

			var srloclist = NormalList2.OrderBy(x => x.N_COL).ToList();
			var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
			if (lastfull != null)
			if (EndBit == null && NormalList2.Count() > 0)
			{
			var CNTR = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
			if (!CNTR.Any()) continue;
			if (CNTR.Find(x => x.S_TYPE == BQ_PRA.B) != null) continue;
			var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
			if (!cirs.Any()) continue;
			var cir2 = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
			if (cir2.S_ITEM_CODE != od.SQL_ItemCode \|\| cir2.S_ITEM_NAME != od.SQL_ItemName)
			continue;
			EndBit = srloclist.Find(x => x.S_LOCK_STATE == "无" && x.N_CURRENT_NUM < Math.Min(x.N_CAPACITY, v3) && x.S_LOCK_STATE != "报废" && x.N_COL >= (lastfull?.N_COL ?? 0));
			}
			if (EndBit != null)
			break;
			var NormalList3 = NormalList2.FindAll(e => e.N_CURRENT_NUM == 0).ToList();

			//}
			//else
			if (EndBit == null)
			{
			var hasNum = NormalList2.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
			var EptRowlist = NormalList2.FindAll(x => !hasNum.Contains(x.N_ROW));
			if (EptRowlist.Any())
			var ManLoc = NormalList2.FindAll(e => e.N_CURRENT_NUM > 0).ToList();
			if (ManLoc.Count() > 0)
			{
			EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
			var MaxCol = ManLoc.OrderByDescending(e => e.N_COL).ToList().FirstOrDefault();
			LogHelper.Info($"中水出库获取最大列 {MaxCol.N_COL} ");
			NormalList3 = NormalList3.FindAll(e => e.N_COL > MaxCol.N_COL).ToList();
			var srloclist = NormalList3.OrderBy(x => x.N_COL).FirstOrDefault();
			EndBit = srloclist;
			}
			else
			{
			var srloclist = NormalList2.OrderBy(x => x.N_COL).FirstOrDefault();
			EndBit = srloclist;
			}
			}
			//var srloclist = NormalList2.OrderBy(x => x.N_COL).ToList();
			//var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
			//if (lastfull != null)
			//{
			// var CNTR = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
			// if (!CNTR.Any()) continue;
			// if (CNTR.Find(x => x.S_TYPE == BQ_PRA.B) != null) continue;
			// var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
			// if (!cirs.Any()) continue;
			// var cir2 = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
			// if (cir2.S_ITEM_CODE != od.SQL_ItemCode \|\| cir2.S_ITEM_NAME != od.SQL_ItemName)
			// continue;
			// EndBit = srloclist.Find(x => x.S_LOCK_STATE == "无" && x.N_CURRENT_NUM < Math.Min(x.N_CAPACITY, v3) && x.S_LOCK_STATE != "报废" && x.N_COL >= (lastfull?.N_COL ?? 0));
			//}
			//if (EndBit != null)
			// break;

			////}
			////else
			//if (EndBit == null)
			//{
			// var hasNum = NormalList2.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
			// var EptRowlist = NormalList2.FindAll(x => !hasNum.Contains(x.N_ROW));
			// if (EptRowlist.Any())
			// {
			// EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
			// }
			//}

			//foreach (var item in sLocs.GroupBy(X => X.N_ROW).OrderBy(x => x.Key * ord))
			//{
			@@ -2420,6 +2440,7 @@
			private static void YwlPETK_CreInwork(List<locCntItem> klocsFirst, string v, string v2, int v1 = 3)
			{
			bool ord = v2.Contains("提扣");
			var db = new SqlHelper<object>().GetInstance();
			foreach (var ptR in klocsFirst.GroupBy(x => x.N_ROW).OrderBy(x => x.Key))
			{
			Location EndBit = null;
			@@ -2431,18 +2452,67 @@
			var rklist = LocationHelper.GetRowLock(v);
			var inlock = rklist.Find(x => x.S_AREA_CODE == v && x.S_LOCK_SRC == (rsfull.S_NOTE + rsfull.HalfOrFull) && x.S_LOCK_STATE.Contains("入库锁"));
			var NormalList = LocationHelper.GetAreaNormalLocList(v);
			//有入库锁排。能入就入。不能就等。
			if (inlock != null)

			//查询是否有已经入了的排
			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 == rsfull.S_ITEM_CODE && t.S_ITEM_NAME == rsfull.S_ITEM_NAME && t.S_CJ_NAME == rsfull.S_CJ_NAME && o.S_AREA_CODE == v);
			var lstCanOutL = db.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()).ToList();

			if (lstCanOutL.Count() > 0)
			{
			var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));
			foreach (var rs in loclist1.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (ord ? 1 : -1)))
			//var ProRow = lstCanOutL.GroupBy(e => e.N_ROW).Select(f => f.First()).ToList();
			////这些排能入的货位数
			//var EndMum = db.Queryable<Location>().Where(l => l.S_AREA_CODE == v && l.N_CURRENT_NUM == 0 && l.S_LOCK_STATE == "无" && ProRow.Select(e => e.N_ROW).ToList().Contains(l.N_ROW)).ToList();

			////查询每一排最大的列小于这些列的不允许入
			//foreach (var item in ProRow)
			//{
			// var MaxCol = lstCanOutL.FindAll(d => d.N_ROW == item.N_ROW).OrderByDescending(f => f.N_COL).First();
			// EndMum.RemoveAll(f => f.N_ROW == item.N_ROW && f.N_COL < MaxCol.N_COL);
			//}
			//if (EndMum.Count() > 0)
			//{
			//if (lstCanOutL.Count() <= EndMum.Count())
			//{
			// NormalList = NormalList.FindAll(x => lstCanOutL.Select(e => e.N_ROW).ToList().Contains(x.N_ROW)).ToList();
			//}
			//var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));
			foreach (var rs in lstCanOutL.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (ord ? 1 : -1)))
			{
			var srloclist = rs.OrderBy(x => x.N_COL).ToList();
			var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
			EndBit = srloclist.Find(x => x.S_LOCK_STATE == "无" && (x.N_CURRENT_NUM + cntrlist.Count()) <= Math.Min(x.N_CAPACITY, v1) && x.S_LOCK_STATE != "报废" && x.N_COL >= (lastfull?.N_COL ?? 0));
			if (EndBit != null)
			break;

			var zuidad = NormalList.FindAll(e => e.N_ROW == srloclist.FirstOrDefault().N_ROW).ToList();
			if (zuidad.Any())
			{
			var lastfull = zuidad.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
			var EndBitList = zuidad.FindAll(x => x.S_LOCK_STATE == "无" && (x.N_CURRENT_NUM + cntrlist.Count()) <= Math.Min(x.N_CAPACITY, v1) && x.S_LOCK_STATE != "报废" && x.N_COL >= (lastfull?.N_COL ?? 0)).ToList();
			if (EndBitList.Count() > 0)
			{
			EndBit = EndBitList.OrderBy(e => e.N_COL).FirstOrDefault();
			if (EndBit != null)
			break;
			}
			}
			}
			if (EndBit == null)
			{
			var hasNum = NormalList.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
			var EptRowlist = NormalList.FindAll(x => !hasNum.Contains(x.N_ROW));
			if (EptRowlist.Any())
			{
			EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (ord ? 1 : -1)).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
			}
			}
			//}
			//else
			//{
			// var hasNum = NormalList.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
			// var EptRowlist = NormalList.FindAll(x => !hasNum.Contains(x.N_ROW));
			// if (EptRowlist.Any())
			// {
			// EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (ord ? 1 : -1)).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
			// }
			//}
			}
			else
			{
			@@ -2453,39 +2523,84 @@
			EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (ord ? 1 : -1)).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
			}
			}

			////有入库锁排。能入就入。不能就等。
			//if (inlock != null)
			//{
			// var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));
			// var Khw = loclist1.FindAll(f => f.N_CURRENT_NUM == 0).ToList();
			// if (Khw.Count() == 0)
			// {
			// db.Deleteable(inlock).ExecuteCommand();
			// }

			// foreach (var rs in loclist1.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (ord ? 1 : -1)))
			// {
			// var srloclist = rs.OrderBy(x => x.N_COL).ToList();
			// var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
			// EndBit = srloclist.Find(x => x.S_LOCK_STATE == "无" && (x.N_CURRENT_NUM + cntrlist.Count()) <= Math.Min(x.N_CAPACITY, v1) && x.S_LOCK_STATE != "报废" && x.N_COL >= (lastfull?.N_COL ?? 0));
			// if (EndBit != null)
			// break;
			// }
			//}
			//else
			//{
			// var hasNum = NormalList.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
			// var EptRowlist = NormalList.FindAll(x => !hasNum.Contains(x.N_ROW));
			// if (EptRowlist.Any())
			// {
			// EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (ord ? 1 : -1)).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
			// }
			//}
			if (EndBit != null)
			{
			var res = TaskProcess.CreateTransport("", rsfull.S_LOC_CODE.Trim(), EndBit.S_LOC_CODE, v2 + "-入库", cntrlist.ToList(), rsfull.N_CURRENT_NUM + 1 - cntrlist.Count(), EndBit.N_CURRENT_NUM + 1, 1, 62);
			LogHelper.CSucessLog($"from {rsfull.S_LOC_CODE} to {EndBit.S_LOC_CODE} {(v2 + "-入库")} ，创建{res} ");

			if (res && inlock == null)
			{
			var r = new RowLock { S_LOCK_SRC = rsfull.S_NOTE + rsfull.HalfOrFull, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "入库锁", S_AREA_CODE = EndBit.S_AREA_CODE, N_ROW = EndBit.N_ROW };
			var db = new SqlHelper<object>().GetInstance();
			db.Insertable(r).ExecuteCommand();
			//else
			//{
			// if (inlock.N_ROW != EndBit.N_ROW)
			// {
			// db.Deleteable(inlock).ExecuteCommand();
			// var row = db.Queryable<RowLock>().Where(x => x.S_AREA_CODE == r.S_AREA_CODE && r.N_ROW == x.N_ROW).First();
			// if (row != null)
			// {
			// if (row.S_LOCK_SRC != r.S_LOCK_SRC)
			// {
			// db.Deleteable(row).ExecuteCommand();
			// db.Insertable(r).ExecuteCommand();
			// }
			// }
			// else db.Insertable(r).ExecuteCommand();
			// }
			//}
			}
			// var r = new RowLock { S_LOCK_SRC = rsfull.S_NOTE + rsfull.HalfOrFull, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "入库锁", S_AREA_CODE = EndBit.S_AREA_CODE, N_ROW = EndBit.N_ROW };
			//if (res && inlock == null)
			//{
			// db.Insertable(r).ExecuteCommand();
			// //else
			// //{
			// //if (inlock?.N_ROW != EndBit.N_ROW)
			// //{
			// // db.Deleteable(inlock).ExecuteCommand();
			// // var row = db.Queryable<RowLock>().Where(x => x.S_AREA_CODE == r.S_AREA_CODE && r.N_ROW == x.N_ROW).First();
			// // if (row != null)
			// // {
			// // if (row.S_LOCK_SRC != r.S_LOCK_SRC)
			// // {
			// // db.Deleteable(row).ExecuteCommand();
			// // db.Insertable(r).ExecuteCommand();
			// // }
			// // }
			// // else db.Insertable(r).ExecuteCommand();
			// //}
			// //}
			//}
			//else
			//{
			// if (inlock?.N_ROW != EndBit.N_ROW)
			// {
			// db.Deleteable(inlock).ExecuteCommand();
			// var row = db.Queryable<RowLock>().Where(x => x.S_AREA_CODE == r.S_AREA_CODE && r.N_ROW == x.N_ROW).First();
			// if (row != null)
			// {
			// if (row.S_LOCK_SRC != r.S_LOCK_SRC)
			// {
			// db.Deleteable(row).ExecuteCommand();
			// db.Insertable(r).ExecuteCommand();
			// }
			// }
			// else db.Insertable(r).ExecuteCommand();
			// }
			//}
			}
			Thread.Sleep(1000);
			}
			}
			}



			private static void YwlBQ_CreSXOutOrder(Settings.deviceInfo plc, List<YWLWorkOrder> yuworders)
			@@ -4600,21 +4715,21 @@
			else
			{
			//检测指定库区的物料排总数量
			if (dsi.TryGetValue(od.S_ROW, out var dictitems1))
			{
			//var rows = dictitems1.Select(x => x.Row).Distinct();
			//var loclist = LocationHelper.GetLocList(x => x.S_AREA_CODE == od.S_ROW && rows.Contains(x.N_ROW));
			////查询可用货位有多少
			//List<string> Ky = new List<string>() { "无", "出库锁", "入库锁" };
			//var loclistK = loclist.FindAll(x => Ky.Contains(x.S_LOCK_STATE)).Count();
			//var count = loclist.FindAll(x => x.N_CURRENT_NUM > 0 && x.S_LOCK_STATE == "无").Sum(x => x.N_CURRENT_NUM);
			//LogHelper.Info("AutoRun13TSJ" + $"od.S_ROW 出库余量判断是否需要转运。-{count}< 总共能用的货位数{loclistK} -7");
			//if (count < loclistK - 7)
			//{
			// autoTurn = true;
			// _sAB没物料或者余量不足开始触发跟根据自动转运_名字越长越好(od);
			//}
			}
			//if (dsi.TryGetValue(od.S_ROW, out var dictitems1))
			//{
			// //var rows = dictitems1.Select(x => x.Row).Distinct();
			// //var loclist = LocationHelper.GetLocList(x => x.S_AREA_CODE == od.S_ROW && rows.Contains(x.N_ROW));
			// ////查询可用货位有多少
			// //List<string> Ky = new List<string>() { "无", "出库锁", "入库锁" };
			// //var loclistK = loclist.FindAll(x => Ky.Contains(x.S_LOCK_STATE)).Count();
			// //var count = loclist.FindAll(x => x.N_CURRENT_NUM > 0 && x.S_LOCK_STATE == "无").Sum(x => x.N_CURRENT_NUM);
			// //LogHelper.Info("AutoRun13TSJ" + $"od.S_ROW 出库余量判断是否需要转运。-{count}< 总共能用的货位数{loclistK} -7");
			// //if (count < loclistK - 7)
			// //{
			// // autoTurn = true;
			// // _sAB没物料或者余量不足开始触发跟根据自动转运_名字越长越好(od);
			// //}
			//}
			}
			Location Endbit = null;

			@@ -4663,10 +4778,14 @@
			var db = new SqlHelper<object>().GetInstance();
			od.TagOverTime = DateTime.Now;
			od.TagOver = StartBit.S_AREA_CODE;
			var ggf = db.Updateable(od).UpdateColumns(it => new { it.TagOverTime, it.TagOver }).ExecuteCommand();
			if (od.OutNum >= StartBit.N_CURRENT_NUM)
			{
			od.OutNum = od.OutNum - StartBit.N_CURRENT_NUM;
			}
			var ggf = db.Updateable(od).UpdateColumns(it => new { it.TagOverTime, it.TagOver, it.OutNum }).ExecuteCommand();
			LogHelper.Info($"上提升机任务更新工单的时间影响行数: {ggf}");

			var r = new RowLock { S_LOCK_SRC = od.SQL_ItemCode, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "出库锁", S_AREA_CODE = StartBit.S_AREA_CODE, N_ROW = StartBit.N_ROW };
			// var r = new RowLock { S_LOCK_SRC = od.SQL_ItemCode, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "出库锁", S_AREA_CODE = StartBit.S_AREA_CODE, N_ROW = StartBit.N_ROW };

			//给终点锁定住
			if (od.S_ROW == "YWLCQSX" \|\| od.S_ROW == "YWLDQWJ")
			@@ -4731,6 +4850,7 @@
			}

			}
			// list = new List<string>() { "YWLAQWJ", "YWLBQWJ", "YWLCQSX", "YWLDQWJ" };
			foreach (var area in list.Distinct())
			{
			var AreaRowlist = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == area && x.N_CURRENT_NUM > 0);