WMSPrjInstance/HH-0103_ShuangQianLunTai.git

			@@ -197,16 +197,16 @@
			var target = new TN_EquipProDetail()
			{
			S_ID = tN_CG_Detail.S_ID,
			TaskType = "PLC满托下线入库",
			TASKTYPE = "PLC满托下线入库",
			RFID = result.RfidData,
			Spec = woInfo.S_ITEM_SPEC,
			CarCode = modelCI.S_CAR_CODE,
			Weight = result.Weight,
			ItemState = "待检",
			ItemCode = woInfo.S_ITEM_CODE,
			LoginName = woInfo.S_LINE_NO,
			Shift = "None",
			StartLoc = startLoc.S_CODE,
			SPEC = woInfo.S_ITEM_SPEC,
			CARCODE = modelCI.S_CAR_CODE,
			WEIGHT = result.Weight,
			ITEMSTATE = "待检",
			ITEMCODE = woInfo.S_ITEM_CODE,
			LOGINNAME = woInfo.S_LINE_NO,
			SHIFT = "None",
			STARTLOC = startLoc.S_CODE,
			};
			SpecHelper.InsertEquipProDetail(target);
			});
			@@ -217,12 +217,12 @@
			{
			S_ID = tN_CG_Detail.S_ID,
			RFID = result.RfidData,
			Spec = woInfo.S_ITEM_SPEC,
			Weight = result.Weight,
			ItemState = "待检",
			ItemCode = woInfo.S_ITEM_CODE,
			LoginName = woInfo.S_LINE_NO,
			Shift = "None",
			SPEC = woInfo.S_ITEM_SPEC,
			WEIGHT = result.Weight,
			ITEMSTATE = "待检",
			ITEMCODE = woInfo.S_ITEM_CODE,
			LOGINNAME = woInfo.S_LINE_NO,
			SHIFT = "None",
			};
			SpecHelper.InsertInventoryM(target);
			});
			@@ -347,7 +347,7 @@
			}

			/// <summary>
			/// 满托过期出库满托过期回库，满托过期回炉
			/// 满托过期出库过期合格回库，过期次品回炉
			/// </summary>
			internal static void FullOutTime()
			{
			@@ -378,12 +378,17 @@
			LocationHelper.LockLoc(startLoc_1.S_CODE, 2);//起点出库锁，
			LocationHelper.LockLoc(endLoc_1.S_CODE, 1);//终点入库锁
			LogHelper.Info($"生成满托过期出库任务成功，容器号{outTimeCg.S_CNTR_CODE}，起点{startLoc_1.S_CODE}，终点{endLoc_1.S_CODE}");

			Task task27 = Task.Run(() =>
			{
			SpecHelper.DeleteInventoryM(outTimeCg.S_ID);
			});
			}
			}
			}


			//满托过期回库
			//过期合格回库
			var startLoc_2 = db.Queryable<TN_Location>()
			.LeftJoin<TN_Loc_Container>((o, i) => o.S_CODE == i.S_LOC_CODE)
			.LeftJoin<TN_CG_Detail>((o, i, s) => i.S_CNTR_CODE == s.S_CNTR_CODE)
			@@ -391,10 +396,92 @@
			&& o.S_AREA_CODE == Settings.Areas[12] && o.N_CURRENT_NUM > 0
			&& o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无").First();

			if (startLoc_2 != null)
			{
			var endLoc_2 = db.Queryable<TN_Location>()
			.First(o => o.S_AREA_CODE == Settings.Areas[2] &&
			o.N_CURRENT_NUM == 0 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无");

			if (endLoc_2 != null)
			{
			var cntCode = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == startLoc_2.S_CODE);
			var outTimeCg = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == cntCode.S_CNTR_CODE);
			if (WCSHelper.CreateTask(startLoc_2.S_CODE, endLoc_2.S_CODE, "过期合格回库", 3, outTimeCg.S_CNTR_CODE, outTimeCg.S_SPE))
			{
			LocationHelper.LockLoc(startLoc_2.S_CODE, 2);//起点出库锁，
			LocationHelper.LockLoc(endLoc_2.S_CODE, 1);//终点入库锁

			Task task27 = Task.Run(() =>
			{
			var target = new TN_InventoryM()
			{
			S_ID = outTimeCg.S_ID,
			RFID = outTimeCg.S_CNTR_CODE,
			SPEC = outTimeCg.S_SPE,
			WEIGHT = outTimeCg.F_QTY,
			ITEMSTATE = outTimeCg.S_ITEM_STATE,
			ITEMCODE = outTimeCg.S_ITEM_CODE,
			LOGINNAME = "过期合格回库轮询",
			SHIFT = "None",
			};
			SpecHelper.InsertInventoryM(target);
			});

			LogHelper.Info($"生成过期合格回库任务成功，容器号{outTimeCg.S_CNTR_CODE}，起点{startLoc_2.S_CODE}，终点{endLoc_2.S_CODE}");
			}
			}
			}

			//过期次品回炉
			var startLoc_3 = db.Queryable<TN_Location>()
			.LeftJoin<TN_Loc_Container>((o, i) => o.S_CODE == i.S_LOC_CODE)
			.LeftJoin<TN_CG_Detail>((o, i, s) => i.S_CNTR_CODE == s.S_CNTR_CODE)
			.Where((o, i, s) => s.N_ITEM_STATE == 2 && s.S_ITEM_STATE == "不合格"
			&& o.S_AREA_CODE == Settings.Areas[12] && o.N_CURRENT_NUM > 0
			&& o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无").First();

			if (startLoc_3 != null)
			{
			var endLoc_3 = db.Queryable<TN_Location>()
			.First(o => o.S_AREA_CODE == Settings.Areas[11] &&
			o.N_CURRENT_NUM == 0 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无");

			if (endLoc_3 != null)
			{
			var cntCode = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == startLoc_3.S_CODE);
			var outTimeCg = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == cntCode.S_CNTR_CODE);
			if (WCSHelper.CreateTask(startLoc_3.S_CODE, endLoc_3.S_CODE, "过期次品回炉", 3, outTimeCg.S_CNTR_CODE,out string taskno, outTimeCg.S_SPE))
			{
			LocationHelper.LockLoc(startLoc_3.S_CODE, 2);//起点出库锁，
			LocationHelper.LockLoc(endLoc_3.S_CODE, 1);//终点入库锁

			Task task2 = Task.Run(() =>
			{
			var target = new TN_RemeltDetail()
			{
			TASKNO = taskno,
			CNTCODE = outTimeCg.S_CNTR_CODE,
			STARTLOC = startLoc_3.S_CODE,
			LOGINNAME = "过期次品回炉轮询",
			ITEMCODE = outTimeCg.S_ITEM_CODE,
			SPEC = outTimeCg.S_SPE,
			CARCODE = outTimeCg.S_CAR_CODE,
			WEIGHT = outTimeCg.F_QTY,
			REMELTTIME = DateTime.Now,
			SHIFT = "None",
			};
			SpecHelper.InsertRemeltDetail(target);
			});

			LogHelper.Info($"生成过期次品回炉任务成功，容器号{outTimeCg.S_CNTR_CODE}，起点{startLoc_3.S_CODE}，终点{endLoc_3.S_CODE}");
			}
			}
			}

			}
			catch (Exception ex)
			{
			LogHelper.Error($"发生了异常，满托过期出库满托过期回库，满托过期回炉异常，{ex.Message}", ex);
			LogHelper.Error($"发生了异常，满托过期出库过期合格回库，过期次品回炉异常，{ex.Message}", ex);
			}
			}

			@@ -409,137 +496,223 @@

			// 同步 TN_EquipProDetail 与 TN_CG_Detail
			var targetEPD = db.Queryable<TN_EquipProDetail>().LeftJoin<TN_CG_Detail>((o, i) => o.S_ID == i.S_ID).
			Where((o, i) => o.ItemState != i.S_ITEM_STATE && i.S_ITEM_STATE != "待检").First();
			if (targetEPD != null)
			{
			targetEPD.ItemState = db.Queryable<TN_CG_Detail>().First(a => a.S_ID == targetEPD.S_ID).S_ITEM_STATE;
			Where((o, i) => o.ITEMSTATE != i.S_ITEM_STATE && i.S_ITEM_STATE != "待检" && i.N_ITEM_STATE != 1).First();

			db.Updateable<TN_EquipProDetail>(targetEPD).ExecuteCommand();
			if (targetEPD != null)//同步货品状态
			{
			targetEPD.ITEMSTATE = db.Queryable<TN_CG_Detail>().First(a => a.S_ID == targetEPD.S_ID).S_ITEM_STATE;
			db.Updateable<TN_EquipProDetail>(targetEPD).UpdateColumns(it => new { it.ITEMSTATE }).ExecuteCommand();
			}

			targetEPD = db.Queryable<TN_EquipProDetail>().LeftJoin<TN_CG_Detail>((o, i) => o.S_ID == i.S_ID).
			Where((o, i) => System.DateTime.Now >= o.Expiration).First();
			if (targetEPD != null)
			Where((o, i) => System.DateTime.Now >= o.EXPIRATION && i.S_ITEM_STATE == "待检" && i.N_ITEM_STATE == 1).First();

			if (targetEPD != null)//检测出过期的货品
			{
			targetEPD.ItemState = "过期";
			db.Updateable<TN_EquipProDetail>(targetEPD).ExecuteCommand();
			targetEPD.ITEMSTATE = "过期";
			db.Updateable<TN_EquipProDetail>(targetEPD).UpdateColumns(it => new { it.ITEMSTATE }).ExecuteCommand();

			var cginfo = db.Queryable<TN_CG_Detail>().First(a => a.S_ID == targetEPD.S_ID);
			cginfo.S_ITEM_STATE = "过期";
			cginfo.N_ITEM_STATE = 3;
			db.Updateable<TN_CG_Detail>(cginfo).ExecuteCommand();
			}

			// 同步 TN_DayProDetail
			var curDay = System.DateTime.Now.Date;
			var targetDay = db.Queryable<TN_DayProDetail>().First(a => a.DayTime == curDay);
			if (targetDay == null)
			{
			targetDay = new TN_DayProDetail()
			{
			DayTime = curDay,
			};
			db.Insertable(targetDay).ExecuteCommand();
			}

			var targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DownLineTime >= curDay && a.DownLineTime <= curDay.AddDays(1)).ToList();

			var sumWeight = targetEPDs.Sum(a => a.Weight);

			if (targetEPDs.Count > 0)
			{
			if (targetDay.Weight != sumWeight)
			{
			targetDay.Weight = sumWeight;
			db.Updateable(targetDay).ExecuteCommand();
			}

			}

			// 同步 TN_WeekProSpcDetail
			var curWeek = System.DateTime.Now.Date.AddDays(-(int)System.DateTime.Now.DayOfWeek + 1);
			var targetWeek = db.Queryable<TN_WeekProDetail>().First(a => a.DayTime == curWeek);
			if (targetWeek == null)
			{
			targetWeek = new TN_WeekProDetail()
			{
			DayTime = curWeek,
			};
			db.Insertable(targetWeek).ExecuteCommand();
			}

			targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DownLineTime >= curWeek && a.DownLineTime <= curWeek.AddDays(7)).ToList();
			if (targetEPDs.Count > 0)
			{
			if (targetWeek.Weight != sumWeight)
			{
			targetWeek.Weight = sumWeight;
			db.Updateable(targetWeek).ExecuteCommand();
			}
			}

			// 同步 TN_MonthProSpcDetail
			var curMonth = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1).Date;
			var targetMonth = db.Queryable<TN_MonthProDetail>().First(a => a.DayTime == curMonth);
			if (targetMonth == null)
			{
			targetMonth = new TN_MonthProDetail()
			{
			DayTime = curMonth,
			};
			db.Insertable(targetMonth).ExecuteCommand();
			}
			targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DownLineTime >= curMonth && a.DownLineTime <= curMonth.AddMonths(1)).ToList();
			if (targetEPDs.Count > 0)
			{
			if (targetMonth.Weight != sumWeight)
			{
			targetMonth.Weight = sumWeight;
			db.Updateable(targetMonth).ExecuteCommand();
			}
			}

			// 同步 TN_YearProSpcDetail
			var curYear = new DateTime(DateTime.Now.Year, 1, 1).Date;
			var targetYear = db.Queryable<TN_YearProDetail>().First(a => a.DayTime == curYear);
			if (targetYear == null)
			{
			targetYear = new TN_YearProDetail()
			{
			DayTime = curYear,
			};
			db.Insertable(targetYear).ExecuteCommand();
			}
			targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DownLineTime >= curYear && a.DownLineTime <= curYear.AddYears(1)).ToList();
			if (targetEPDs.Count > 0)
			{
			if (targetYear.Weight != sumWeight)
			{
			targetYear.Weight = sumWeight;
			db.Updateable(targetYear).ExecuteCommand();
			}
			db.Updateable<TN_CG_Detail>(cginfo).UpdateColumns(it => new { it.S_ITEM_STATE, it.N_ITEM_STATE }).ExecuteCommand();
			}

			// 同步 TN_InventoryM 与 TN_CG_Detail
			var targetInM = db.Queryable<TN_InventoryM>().LeftJoin<TN_CG_Detail>((o, i) => o.S_ID == i.S_ID).
			Where((o, i) => o.ItemState != i.S_ITEM_STATE && i.S_ITEM_STATE != "待检").First();
			if (targetInM != null)
			{
			targetInM.ItemState = db.Queryable<TN_CG_Detail>().First(a => a.S_ID == targetInM.S_ID).S_ITEM_STATE;
			Where((o, i) => o.ITEMSTATE != i.S_ITEM_STATE && i.S_ITEM_STATE != "待检" && i.N_ITEM_STATE != 1).First();

			db.Updateable<TN_InventoryM>(targetInM).ExecuteCommand();
			}
			targetInM = db.Queryable<TN_InventoryM>().LeftJoin<TN_CG_Detail>((o, i) => o.S_ID == i.S_ID).
			Where((o, i) => System.DateTime.Now >= o.Expiration).First();
			if (targetInM != null)
			if (targetInM != null)//同步货品状态
			{
			targetInM.ItemState = "过期";
			db.Updateable<TN_InventoryM>(targetInM).ExecuteCommand();
			targetInM.ITEMSTATE = db.Queryable<TN_CG_Detail>().First(a => a.S_ID == targetInM.S_ID).S_ITEM_STATE;
			db.Updateable<TN_InventoryM>(targetInM).UpdateColumns(it => new { it.ITEMSTATE }).ExecuteCommand();
			}

			targetInM = db.Queryable<TN_InventoryM>().LeftJoin<TN_CG_Detail>((o, i) => o.S_ID == i.S_ID).
			Where((o, i) => System.DateTime.Now >= o.EXPIRATION && i.S_ITEM_STATE == "待检" && i.N_ITEM_STATE == 1).First();

			if (targetInM != null)//检测出已过期的货品
			{
			targetInM.ITEMSTATE = "过期";
			targetInM.EXPIRATION_DAY = 0;
			db.Updateable<TN_InventoryM>(targetInM).UpdateColumns(it => new { it.ITEMSTATE }).ExecuteCommand();

			var cginfo = db.Queryable<TN_CG_Detail>().First(a => a.S_ID == targetInM.S_ID);
			cginfo.S_ITEM_STATE = "过期";
			cginfo.N_ITEM_STATE = 3;
			db.Updateable<TN_CG_Detail>(cginfo).ExecuteCommand();
			db.Updateable<TN_CG_Detail>(cginfo).UpdateColumns(it => new { it.S_ITEM_STATE, it.N_ITEM_STATE }).ExecuteCommand();
			}

			targetInM = db.Queryable<TN_InventoryM>().LeftJoin<TN_CG_Detail>((o, i) => o.S_ID == i.S_ID).
			Where((o, i) => System.DateTime.Now < o.EXPIRATION && i.S_ITEM_STATE == "待检" && i.N_ITEM_STATE == 1).First();

			if (targetInM != null)//检测出快过期的货品
			{
			targetInM.EXPIRATION_DAY = SpecHelper.CalculateDaysDifference(System.DateTime.Now,targetInM.EXPIRATION);
			db.Updateable<TN_InventoryM>(targetInM).UpdateColumns(it => new { it.EXPIRATION_DAY }).ExecuteCommand();
			}

			targetInM = db.Queryable<TN_InventoryM>().First(a => a.EXPIRATION_DAY > 0 && a.ITEMSTATE == "过期");//已过期的货品，剩余天数改为0
			if (targetInM != null)
			{
			targetInM.EXPIRATION_DAY = 0;
			db.Updateable<TN_InventoryM>(targetInM).UpdateColumns(it => new { it.EXPIRATION_DAY }).ExecuteCommand();
			}

			// 同步 TN_DayProDetail
			var curDay = System.DateTime.Now.Date;
			var targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DOWNLINETIME >= curDay && a.DOWNLINETIME <= curDay.AddDays(1)).ToList();

			var specList = targetEPDs.Select(a => a.SPEC).Distinct().ToList();//当天的货品有哪些规格

			if (specList.Count>0)
			{
			foreach (var item in specList)
			{
			var targetDay = db.Queryable<TN_DayProDetail>().First(a => a.DAYTIME == curDay && a.SPEC == item);
			if (targetDay == null)
			{
			targetDay = new TN_DayProDetail()
			{
			DAYTIME = curDay,
			SPEC = item,
			};
			db.Insertable(targetDay).ExecuteCommand();
			}
			else
			{
			var sumWeight = targetEPDs.Where(b=>b.SPEC == item).Sum(a => a.WEIGHT);

			if (targetDay.WEIGHT != sumWeight)
			{
			targetDay.WEIGHT = sumWeight;
			db.Updateable(targetDay).ExecuteCommand();
			}
			else
			{
			LogHelper.Info("重量相等，同步TN_DayProDetail跳过");
			}
			}
			}
			}
			else
			{
			LogHelper.Info("当天的货品规格列表为0，同步TN_DayProDetail跳过");
			}

			// 同步 TN_WeekProSpcDetail
			var curWeek = System.DateTime.Now.Date.AddDays(-(int)System.DateTime.Now.DayOfWeek + 1);
			targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DOWNLINETIME >= curWeek && a.DOWNLINETIME <= curWeek.AddDays(7)).ToList();
			specList = targetEPDs.Select(a => a.SPEC).Distinct().ToList();//当周的货品有哪些规格
			if (specList.Count > 0)
			{
			foreach (var item in specList)
			{
			var targetWeek = db.Queryable<TN_WeekProDetail>().First(a => a.DAYTIME == curWeek && a.SPEC == item);
			if (targetWeek == null)
			{
			targetWeek = new TN_WeekProDetail()
			{
			DAYTIME = curWeek,
			SPEC = item,
			};
			db.Insertable(targetWeek).ExecuteCommand();
			}
			else
			{
			var sumWeight = targetEPDs.Where(b => b.SPEC == item).Sum(a => a.WEIGHT);
			if (targetWeek.WEIGHT != sumWeight)
			{
			targetWeek.WEIGHT = sumWeight;
			db.Updateable(targetWeek).ExecuteCommand();
			}
			else
			{
			LogHelper.Info("重量相等，同步TN_WeekProSpcDetail跳过");
			}
			}
			}
			}
			else
			{
			LogHelper.Info("当周的货品规格列表为0，同步TN_WeekProSpcDetail跳过");
			}

			// 同步 TN_MonthProSpcDetail
			var curMonth = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1).Date;
			targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DOWNLINETIME >= curMonth && a.DOWNLINETIME <= curMonth.AddMonths(1)).ToList();
			specList = targetEPDs.Select(a => a.SPEC).Distinct().ToList();//当月的货品有哪些规格
			if (specList.Count > 0)
			{
			foreach (var item in specList)
			{
			var targetMonth = db.Queryable<TN_MonthProDetail>().First(a => a.DAYTIME == curMonth && a.SPEC == item);
			if (targetMonth == null)
			{
			targetMonth = new TN_MonthProDetail()
			{
			DAYTIME = curMonth,
			SPEC = item,
			};
			db.Insertable(targetMonth).ExecuteCommand();
			}
			else
			{
			var sumWeight = targetEPDs.Where(b => b.SPEC == item).Sum(a => a.WEIGHT);
			if (targetMonth.WEIGHT != sumWeight)
			{
			targetMonth.WEIGHT = sumWeight;
			db.Updateable(targetMonth).ExecuteCommand();
			}
			else
			{
			LogHelper.Info("重量相等，同步TN_MonthProSpcDetail跳过");
			}
			}
			}
			}
			else
			{
			LogHelper.Info("当月的货品规格列表为0，同步TN_MonthProSpcDetail跳过");
			}

			// 同步 TN_YearProSpcDetail
			var curYear = new DateTime(DateTime.Now.Year, 1, 1).Date;

			targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DOWNLINETIME >= curYear && a.DOWNLINETIME <= curYear.AddYears(1)).ToList();
			specList = targetEPDs.Select(a => a.SPEC).Distinct().ToList();//当年的货品有哪些规格
			if (specList.Count > 0)
			{
			foreach (var item in specList)
			{
			var targetYear = db.Queryable<TN_YearProDetail>().First(a => a.DAYTIME == curYear && a.SPEC == item);
			if (targetYear == null)
			{
			targetYear = new TN_YearProDetail()
			{
			DAYTIME = curYear,
			SPEC = item,
			};
			db.Insertable(targetYear).ExecuteCommand();
			}
			else
			{
			var sumWeight = targetEPDs.Where(b => b.SPEC == item).Sum(a => a.WEIGHT);
			if (targetYear.WEIGHT != sumWeight)
			{
			targetYear.WEIGHT = sumWeight;
			db.Updateable(targetYear).ExecuteCommand();
			}
			else
			{
			LogHelper.Info("重量相等，同步TN_YearProSpcDetail跳过");
			}
			}
			}
			}
			else
			{
			LogHelper.Info("当年的货品规格列表为0，同步TN_YearProSpcDetail跳过");
			}
			}
			catch (Exception ex)
			@@ -610,21 +783,24 @@
			var db = new SqlHelper<object>().GetInstance();
			try
			{
			var endLoc = db.Queryable<TN_Location>().First(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.S_AREA_CODE == Settings.Areas[7]);
			if (endLoc == null)
			{
			LogHelper.Info($"未找到合适的终点货位，要求a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == 无 && a.S_AREA_CODE == Settings.Areas[7]");
			return;
			}

			var startLoc = db.Queryable<TN_Location>().
			LeftJoin<TN_Loc_Container>((o, i) => o.S_CODE == i.S_LOC_CODE).
			LeftJoin<TN_CG_Detail>((o, i, s) => i.S_CNTR_CODE == s.S_CNTR_CODE).
			Where((o, i, s) => o.N_CURRENT_NUM == 1 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无" && o.S_AREA_CODE == Settings.Areas[1]
			&& s.N_ITEM_STATE == 2 && s.S_ITEM_STATE == "不合格").First();

			if (endLoc == null)

			if (startLoc == null)
			{
			LogHelper.Info($"未找到合适的起点货位，要求o.N_CURRENT_NUM == 1 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == 无 && o.S_AREA_CODE == Settings.Areas[1] && s.N_ITEM_STATE ==2 && s.S_ITEM_STATE==不合格");
			return;
			}


			var endLoc = db.Queryable<TN_Location>().First(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.S_AREA_CODE == Settings.Areas[7]);
			if (endLoc == null)
			{
			LogHelper.Info($"未找到合适的终点货位，要求a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == 无 && a.S_AREA_CODE == Settings.Areas[7]");
			return;
			}

			@@ -642,11 +818,16 @@
			LocationHelper.LockLoc(startLoc.S_CODE, 2);//起点出库锁，
			LocationHelper.LockLoc(endLoc.S_CODE, 1);//终点入库锁

			LogHelper.Info($"生成满托出库复检任务成功，容器：{cntId.S_CNTR_CODE}，起点：{startLoc.S_CODE}");
			LogHelper.Info($"生成满托出库复检任务成功，容器：{cntId.S_CNTR_CODE}，起点：{startLoc.S_CODE}，终点：{endLoc.S_CODE}");

			Task task27 = Task.Run(() =>
			{
			SpecHelper.DeleteInventoryM(cgInfo.S_ID);
			});
			}
			else
			{
			LogHelper.Info($"生成满托出库复检任务失败，容器：{cntId.S_CNTR_CODE}，起点：{startLoc.S_CODE}");
			LogHelper.Info($"生成满托出库复检任务失败，容器：{cntId.S_CNTR_CODE}，起点：{startLoc.S_CODE}，终点：{endLoc.S_CODE}");
			}