WMSPrjInstance/HH-0035_HeFeiLiaoTongAGV.git

			@@ -20,6 +20,7 @@
			using static HH.WCS.JiaTong.api.ApiModel;
			using static HH.WCS.JiaTong.api.OtherModel;
			using static HH.WCS.JiaTong.LISTA.process.HttpModel;
			using static HH.WCS.JiaTong.util.Settings;

			namespace HH.WCS.JiaTong.api
			{
			@@ -312,8 +313,31 @@
			}
			else if (startArea.N_FLOOR != endArea.N_FLOOR)
			{
			//楼层电梯分配
			var elevatorLoc = LocationHelper.GetElevatorLoc();
			string deviceName = "电梯1";
			if (startloc.S_WH_CODE == "103")
			{
			deviceName = "电梯2";
			}
			var eleLoc = Settings.deviceInfos.Where(a => a.deviceName.Trim() == deviceName).FirstOrDefault();
			if (eleLoc == null)
			{
			result.code = "1";
			result.msg = $"未找到仓库{startloc.S_WH_CODE}所对应的电梯，请检查配置文件";
			AddErrorInfo("任务创建失败", result.msg, Source);
			return result;
			}
			//根据任务数量判断送往哪个电梯（具体电梯流程根据现场电梯数量）
			string[] state = new string[] { "执行中", "开始取货", "取货完成", "开始卸货", "卸货完成" };


			var elevatorLoc = db.Queryable<Location>().Where(a => a.S_CODE == eleLoc.TN_Location).First();
			if (elevatorLoc == null)
			{
			result.code = "1";
			result.msg = $"根据电梯配置文件货位：{eleLoc.TN_Location}未找到对于货位数据，请检查货位表";
			AddErrorInfo("任务创建失败", result.msg, Source);
			return result;
			}

			if (elevatorLoc != null)
			{ //创建wcs分段任务
			@@ -793,7 +817,7 @@
			return result;
			}
			var db = new SqlHelper<object>().GetInstance();
			Location loc = new Location();
			Location loc = null;

			string Start = model.InitialLocation; //起点货位
			string itemcode = model.PartNumber; //物料编码
			@@ -2129,35 +2153,49 @@
			var cntr = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == startloc.S_CODE).First();
			if (cntr == null)
			{

			result.code = "1";
			result.msg = $"起点{model.Data.start_loc_code}未查询绑定托盘";
			LogHelper.Info($"callfixture:创建空工装呼叫任务==>{result.msg}");
			AddErrorInfo("查找托盘失败", result.msg, Source);
			return result;
			}

			// var startArea = db.Queryable<Area>().Where(a => a.S_CODE.Trim() == startloc.S_AREA_CODE).First();
			//var endArea = db.Queryable<Area>().Where(a => a.S_CODE.Trim() == endloc.S_AREA_CODE).First();

			//string dtcode = "DT-01";
			////楼层电梯分配
			//var Diantiloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == dtcode).First();
			//if (Diantiloc == null)
			//{
			// result.code = "1";
			// result.msg = $"创建任务失败，根据货位编码:{dtcode}未找到电梯货位";
			// AddErrorInfo("查找货位失败", result.msg, Source);
			// return result;
			//}

			string deviceName = "电梯1";
			if (startloc.S_WH_CODE == "103")
			{
			deviceName = "电梯2";
			}
			var eleLoc = Settings.deviceInfos.Where(a => a.deviceName.Trim() == deviceName).FirstOrDefault();
			if (eleLoc == null)
			{
			result.code = "1";
			result.msg = $"未找到仓库{startloc.S_WH_CODE}所对应的电梯，请检查配置文件";
			AddErrorInfo("任务创建失败", result.msg, Source);
			return result;
			}
			//根据任务数量判断送往哪个电梯（具体电梯流程根据现场电梯数量）
			var elevatorLoc = LocationHelper.GetElevatorLoc();
			string[] state = new string[] { "执行中", "开始取货", "取货完成", "开始卸货", "卸货完成" };


			var elevatorLoc = db.Queryable<Location>().Where(a => a.S_CODE == eleLoc.TN_Location).First();
			if (elevatorLoc==null)
			{
			result.code = "1";
			result.msg = $"根据电梯配置文件货位：{eleLoc.TN_Location}未找到对于货位数据，请检查货位表";
			AddErrorInfo("任务创建失败", result.msg, Source);
			return result;
			}
			int mst = db.Queryable<WCSTask>().Where(a => a.S_TYPE.Contains("电梯") && state.Contains(a.S_B_STATE) && (a.S_END_LOC == elevatorLoc.S_CODE \|\| a.S_START_LOC == elevatorLoc.S_CODE)).Count();
			if (mst > 0)
			{
			result.code = "1";
			result.msg = $"电梯存在任务，不允许创建电梯任务";
			AddErrorInfo("任务创建失败", result.msg, Source);
			return result;
			}
			var wcsTask = new WCSTask
			{
			S_CODE = WCSHelper.GenerateTaskNo(),
			S_TYPE = "电梯2",
			S_TYPE = "1楼电梯搬运",
			S_EQ_NO = model.Data.task_no,
			S_START_LOC = elevatorLoc.S_CODE,
			S_END_LOC = endloc.S_CODE,
			@@ -2169,7 +2207,8 @@
			N_SCHEDULE_TYPE = 1,
			S_CNTR_CODE = cntr.S_CNTR_CODE,
			N_END_LAYER = 1,
			Z_TYPE = 6
			Z_TYPE = 6,
			S_B_STATE = "电梯推送"
			};


			@@ -2562,12 +2601,14 @@

			// var aaa = db.Deleteable<Location>(a => a.S_ID == "867C567A-183C-413B-9891-15D8F6DE1620").ExecuteCommand();
			// var aaa = db.Deleteable<Location>(a => a.S_ID.Trim() == "867C567A-183C-413B-9891-15D8F6DE1620").ExecuteCommand();
			LogHelper.Info($"方法：StorageCompute");
			var list = db.Queryable<Location>().Where(a => a.N_CURRENT_NUM == 0 && a.S_AREA_CODE == areacode && a.N_LOCK_STATE == 0 && a.N_ROW > 0 && a.N_COL > 0).ToList();
			LogHelper.Info($"创建空托回库任务,终点货位集合：根据库区编码：{areacode}" + list.Count);

			//LogHelper.Info($"方法：StorageCompute");
			var list = db.Queryable<Location>().Where(a => a.N_CURRENT_NUM == 0 && a.S_AREA_CODE == areacode && a.N_LOCK_STATE == 0).ToList();
			// LogHelper.Info($"创建空托回库任务,终点货位集合：根据库区编码：{areacode}" + list.Count);
			//list.RemoveAll(a => string.IsNullOrEmpty(a.S_CODE.Trim()) \|\| a.S_CODE == null \|\| string.IsNullOrWhiteSpace(a.S_CODE.Trim()));
			list = list.FindAll(a => a.N_ROW > 0 && a.N_COL > 0);
			LogHelper.Info("创建空托回库任务,终点货位集合过滤：" + list.Count);
			// list = list.FindAll(a => a.N_ROW > 0 && a.N_COL > 0);
			//LogHelper.Info("创建空托回库任务,终点货位集合过滤：" + list.Count);

			if (list.Count > 0)
			{
			result = FindEndcolByLocList(list);
			@@ -2687,7 +2728,7 @@
			else
			{
			return ContainerHelper.CreateCntrItem(taskData.pickStation, partData.rfid, partData.partNumber, partData.partDesc, partData.partType, taskData.carrierType, partData.lotNumber, taskData.wmsLot, partData.weight, partData.unit,
			taskData.tyreType, taskData.supplier, taskData.receiveLot, taskData.subpool, partData.productionTime, partData.maturityTime, taskData.level);
			taskData.tyreType, taskData.supplier, taskData.receiveLot, taskData.subpool, partData.productionTime, partData.maturityTime, taskData.level, partData.qty, partData.qtyCfg);
			}

			}