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
			{
			@@ -186,14 +187,7 @@
			}

			}
			//else
			//{
			// result.code = "1";
			// result.msg = $"根据起点{Start},未找到托盘货位绑定关系";
			// AddErrorInfo("托盘查找失败", result.msg, Source);
			// return result;
			//}


			}
			else
			{
			@@ -312,8 +306,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分段任务
			@@ -565,6 +582,15 @@
			AddErrorInfo("库区查找失败", result.msg);
			return result;
			}
			int pri = 1;
			var area = Settings.wareLoc.Where(a => a.AreaCode == endloc.S_WH_CODE).First();
			if (area != null)
			{
			if (area.XbAreaCodes.Contains(endloc.S_AREA_CODE))
			{
			pri = 2;
			}
			}
			//创建wcs任务
			var wcsTask = new WCSTask
			{
			@@ -579,7 +605,7 @@
			S_END_AREA = endloc.S_AREA_CODE,
			N_SCHEDULE_TYPE = 1,
			S_CNTR_CODE = CntrCode,
			N_PRIORITY = taskData.priority,
			N_PRIORITY = pri,
			Z_TYPE = n_type,
			N_START_LAYER = 1,
			N_END_LAYER = 1,
			@@ -744,7 +770,7 @@
			{

			//创建托盘数据绑定关系
			if (ContainerHelper.CreateCntrItem(model.Rfid, model.PartNumber, model.PartDesc, model.LotNumber, model.Weight, model.Qty, model.ProductionTime, model.MaturityTime))
			if (ContainerHelper.CreateCntrItemTray(model.Rfid, model.PartNumber, model.PartDesc, model.LotNumber, model.Weight, model.Qty, model.ProductionTime, model.MaturityTime, model.PowderType))
			{
			//创建成功流程
			}
			@@ -793,7 +819,7 @@
			return result;
			}
			var db = new SqlHelper<object>().GetInstance();
			Location loc = new Location();
			Location loc = null;

			string Start = model.InitialLocation; //起点货位
			string itemcode = model.PartNumber; //物料编码
			@@ -937,6 +963,7 @@
			S_CNTR_CODE = model.Rfid,
			N_START_LAYER = 1,
			N_END_LAYER = 1,
			N_PRIORITY = 1,
			Z_TYPE = n_type
			};
			LogHelper.Info("创建入平库任务：" + JsonConvert.SerializeObject(wcsTask));
			@@ -1066,7 +1093,7 @@
			#region 根据物料编码计算出库货位，送往线边位置
			Location Endloc = null;
			//根据物料编码计算出库货位
			var loc = airlift(areacode, itemcode, model.PartLevel);
			var loc = airlift(areacode, itemcode, model.PartLevel, model.PowderType);
			if (loc != null)
			{
			Start = loc.S_CODE;
			@@ -1135,6 +1162,7 @@
			S_CNTR_CODE = CntrCode,
			N_START_LAYER = 1,
			N_END_LAYER = 1,
			N_PRIORITY = 1,
			Z_TYPE = n_type

			};
			@@ -1335,12 +1363,14 @@
			loc = StorageCompute(itemcode, areacode);
			if (loc == null)
			{

			result.code = "1";
			result.msg = $"库区：{areacode}没有可用货位";
			LogHelper.Info($" {result.msg}");
			AddErrorInfo("查找库区失败", result.msg, Source);
			return result;
			// LogHelper.Info($"库区：{areacode}没有可用货位");

			}
			//else
			//{
			@@ -1392,6 +1422,8 @@
			S_CNTR_CODE = model.Rfid,
			N_START_LAYER = 1,
			N_END_LAYER = endlayer,
			N_PRIORITY = 1,
			S_B_STATE="等待推送",
			Z_TYPE = 5
			};
			LogHelper.Info("创建空托回库任务：" + JsonConvert.SerializeObject(wcsTask));
			@@ -1571,6 +1603,7 @@
			N_START_LAYER = 1,
			N_END_LAYER = 1,
			Z_TYPE = 5,
			N_PRIORITY = 1,
			S_NOTE = "粉料"
			};
			LogHelper.Info("创建呼叫空托任务：" + JsonConvert.SerializeObject(wcsTask));
			@@ -1795,6 +1828,7 @@
			S_CNTR_CODE = model.Rfid,
			N_START_LAYER = 1,
			N_END_LAYER = 1,
			N_PRIORITY = 1,
			Z_TYPE = 5

			};
			@@ -2046,6 +2080,7 @@
			S_CNTR_CODE = CntrCode,
			N_START_LAYER = 1,
			N_END_LAYER = 1,
			N_PRIORITY = 1,
			// N_TYPE = n_type


			@@ -2127,35 +2162,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,
			@@ -2167,7 +2216,9 @@
			N_SCHEDULE_TYPE = 1,
			S_CNTR_CODE = cntr.S_CNTR_CODE,
			N_END_LAYER = 1,
			Z_TYPE = 6
			Z_TYPE = 6,
			N_PRIORITY = 1,
			S_B_STATE = "电梯推送"
			};


			@@ -2228,6 +2279,47 @@

			}


			/// <summary>
			/// 电梯任务推送
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			internal static Result DT(DTModel model)
			{
			Result result = new Result() { code = "200", msg = "电梯任务推送成功" };
			string Source = "WMS";
			if (model == null)
			{
			result.code = "1";
			result.msg = "参数为null";
			AddErrorInfo("参数为空", result.msg, Source);
			return result;
			}
			try
			{
			if (model.prepare == "1")
			{
			var db = new SqlHelper<object>().GetInstance();
			//修改对应电梯任务进行推送
			return result;
			}
			else
			{
			result.code = "1";
			result.msg = $"一楼电梯搬运任务推送失败 prepare{model.prepare}不为1";
			LogHelper.Info(result.msg);
			return result;
			}
			}
			catch (Exception ex)
			{
			result.code = "1";
			result.msg = $"电梯任务推送失败错误信息：{ex}";
			LogHelper.Error("点对点任务 Error：" + ex.ToString(), ex);
			return result;
			}
			}
			/// <summary>
			/// 货位信息上传
			/// </summary>
			@@ -2396,10 +2488,9 @@
			var location = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == loc).First();
			if (location != null)
			{
			var loccntr = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == loc).ToList();
			var loccntr = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == loc.Trim()).ToList();
			if (loccntr.Count > 0)
			{

			var cntrcodes = loccntr.Select(a => a.S_CNTR_CODE.Trim()).ToList();
			if (LocationHelper.Clear(loc, cntrcodes))
			{
			@@ -2560,12 +2651,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).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);

			if (list.Count > 0)
			{
			result = FindEndcolByLocList(list);
			@@ -2581,8 +2674,9 @@
			/// <param name="areacode"></param>
			/// <param name="itemcode"></param>
			/// <param name="level">物料等级</param>
			/// <param name="powderType">机型</param>
			/// <returns></returns>
			internal static Location airlift(string areacode, string itemcode, string level = "")
			internal static Location airlift(string areacode, string itemcode, string level, string powderType)
			{
			var db = new SqlHelper<object>().GetInstance();
			Location result = null;
			@@ -2639,8 +2733,8 @@
			//}

			#endregion
			var loc = LocationHelper.GetLocByItemCode(areacode, itemcode, level);
			LogHelper.Info($"airlift=>根据库区编码:{areacode}，物料编码:{itemcode},物料等级计算出有托盘货位{JsonConvert.SerializeObject(loc)}");
			var loc = LocationHelper.GetLocByItemCode(areacode, itemcode, level, powderType);
			LogHelper.Info($"airlift=>根据库区编码:{areacode}，物料编码:{itemcode},机型{powderType},物料等级计算出有托盘货位{JsonConvert.SerializeObject(loc)}");
			// result = FindStartcolByLoclist(loc);
			if (loc.Count > 0)
			{
			@@ -2685,7 +2779,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);
			}

			}
			@@ -2775,6 +2869,48 @@
			}

			/// <summary>
			/// 合肥佳通接口调用信息
			/// </summary>
			/// <param name="source">系统来源</param>
			/// <param name="name">接口名称</param>
			/// <param name="type">请求地址类型</param>
			/// <param name="body">请求参数</param>
			/// <param name="url">请求地址</param>
			/// <param name="err">错误信息</param>
			/// <returns></returns>
			public static bool AddInfo(string source, string name, string body, string err, string type, string url)
			{
			bool result = false;
			var db = new SqlHelper<object>().GetInstance();
			try
			{
			var error = new GT_Interface_Exc
			{
			S_SOURCE = source,
			S_NAME = name,
			S_TYPE = type,
			S_URL = url,
			S_BODY = body,
			S_ERR = err
			};
			if (result = db.Insertable<GT_Interface_Exc>(error).ExecuteCommand() > 0)
			{

			}
			//else
			//{
			// //添加失败重新添加
			// AddErrorInfo(errorInfo, remake, areacode, taskno);
			//}
			}
			catch (Exception ex)
			{
			LogHelper.Info($"AddInfo Error:{ex.Message}");
			}
			return result;
			}

			/// <summary>
			/// 找终点空货位
			/// </summary>
			/// <param name="locations"></param>
			@@ -2791,14 +2927,14 @@
			{

			var rowList = locations.Where(r => r.N_ROW == rows[i]).ToList();
			LogHelper.Info($"当前排:{rows[i]},获得货位{JsonConvert.SerializeObject(rowList)}");
			// LogHelper.Info($"当前排:{rows[i]},获得货位{JsonConvert.SerializeObject(rowList)}");
			if (rowList.Count(a => a.N_CURRENT_NUM == 0) > 0)
			{
			Location other = null;
			//当前排没有锁并且有空位置

			// other = rowList.OrderBy(a => a.N_COL).Where(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.C_ENABLE == "Y").FirstOrDefault();
			other = rowList.OrderBy(a => a.N_COL).Where(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && !string.IsNullOrEmpty(a.S_CODE.Trim()) && !string.IsNullOrWhiteSpace(a.S_CODE.Trim())).FirstOrDefault();
			other = rowList.OrderBy(a => a.N_COL).Where(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0).FirstOrDefault();
			//if (full == null)
			//{
			// //没有满位，那就找最小的空位
			@@ -2969,7 +3105,6 @@
			{
			lock (AGVDeviceReceiveLock)
			{

			var db = new SqlHelper<HangChaAGV>().GetInstance();
			var agvDeviceInfo = db.Queryable<HangChaAGV>().Where(a => a.agvNo.Trim() == forkliftNo).First();
			if (agvDeviceInfo == null)