JC23WMS-2.git - Gitblit

			@@ -42,216 +42,264 @@
			string taskMsg = "";
			if (string.IsNullOrEmpty(model.Location))
			{
			throw new Exception("设备所在位置不可为空");
			throw new Exception("设备编码不可为空");
			}
			//叫桶设备所在储位信息（目标储位）
			var endLoction = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.Location);
			if (endLoction == null)
			//通过设备号查找到所属设备（区域）
			var deviceInfo = Db.Queryable<SysStorageArea>().First(w => w.IsDel == "0" && w.DeviceCode.Contains(model.Location));
			if (deviceInfo == null)
			{
			throw new Exception("设备储位信息不存在");
			throw new Exception("设备信息不存在");
			}
			var houseNo = endLoction.WareHouseNo;//叫桶位置，后续根据位置关联或定义，来判断叫桶位置所属车间
			var houseNo = deviceInfo.WareHouseNo;//叫桶设备所属车间编号

			//叫桶设备所在储位信息（目标储位）
			var endLoction = new SysStorageLocat();

			var urlMes = "";//回传MES的接口地址
			var noticeNo = "0";//出入库单据明细ID
			var stockDetail = Db.Queryable<DataStockDetail>().Where(w => w.Status == "0");//所有待分配的桶

			//所有待分配的桶
			var stockDetail = Db.Queryable<DataStockDetail>().Where(w => w.Status == "0");
			//分配桶信息
			var pallet = new DataStockDetail();

			//开始事务
			Db.BeginTran();
			DataStockDetail pallet = new DataStockDetail();

			switch (model.Type)
			{
			case "0"://叫净桶
			//查找到该车间净桶区
			List<string> areaNoList = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "0" && w.WareHouseNo == houseNo).Select(s=>s.AreaNo).ToList();
			//查找净桶
			pallet = stockDetail.Where(w => w.WareHouseNo == houseNo && w.PalletStatus == "0" && w.Status == "0"
			&& areaNoList.Contains(w.AreaNo)).OrderByDescending(o => o.CreateTime).First();
			if (pallet == null)
			case "0"://接料设备叫净桶
			{
			throw new Exception("暂无净桶可分配");
			//叫桶目标储位地址信息
			endLoction = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.AreaNo == deviceInfo.AreaNo);
			if (endLoction == null)
			{
			throw new Exception("叫桶设备目标储位信息不存在");
			}
			//查找到该车间净桶区
			List<string> areaNoList = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "0" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
			//查找净桶
			pallet = stockDetail.Where(w => w.WareHouseNo == houseNo && w.PalletStatus == "0" && w.Status == "0"
			&& areaNoList.Contains(w.AreaNo)).OrderByDescending(o => o.CreateTime).First();
			if (pallet == null)
			{
			throw new Exception("暂无净桶可分配");
			}
			pallet.Status = "2";//分配状态 0:待分配，1：部分分配， 2:已分配
			//更新桶库存明细
			Db.Updateable(pallet).ExecuteCommand();

			taskMsg = "设备叫净桶任务";
			}
			break;
			case "1"://混料设备叫料桶（混料）
			{
			//叫桶目标储位地址信息
			endLoction = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.AreaNo == deviceInfo.AreaNo);
			if (endLoction == null)
			{
			throw new Exception("叫桶设备目标储位信息不存在");
			}
			//判断是否有批次号
			if (string.IsNullOrWhiteSpace(model.LotNo))
			{
			throw new Exception("批次号为空！");
			}
			//查找到该车间预混区
			List<string> areaNoList2 = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "1" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
			//查找库存中是否有可用的此批次的混料桶
			pallet = stockDetail.Where(w => w.WareHouseNo == houseNo && w.PalletStatus == "1" && w.Status == "0" && w.LotNo == model.LotNo
			&& areaNoList2.Contains(w.AreaNo)).OrderByDescending(o => o.CompleteTime).First();
			if (pallet == null)
			{
			throw new Exception("暂无混料桶可分配");
			}
			pallet.Status = "2";//分配状态 0:待分配，1：部分分配， 2:已分配
			//更新桶库存明细
			Db.Updateable(pallet).ExecuteCommand();

			taskMsg = "设备叫料桶混料任务";
			}
			break;
			case "2"://下料设备叫料桶（下料）
			{
			if (houseNo == "M04")//除了喷干车间下料口都是2个储位（投料储位、投完料储位）
			{
			//叫桶目标储位地址信息
			endLoction = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.AreaNo == deviceInfo.AreaNo);
			}
			else
			{
			//叫桶目标储位地址信息
			endLoction = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.AreaNo == deviceInfo.AreaNo && w.Column == 1);// Column=1 投料储位，Column=2 投完料储位
			}
			if (endLoction == null)
			{
			throw new Exception("叫桶设备目标储位信息不存在");
			}
			//判断是否有批次号
			if (string.IsNullOrWhiteSpace(model.LotNo))
			{
			throw new Exception("批次号为空！");
			}
			//查找是否有此批次出库单明细
			var soNoticeDetail = Db.Queryable<BllExportNoticeDetail>().Where(w => w.IsDel == "0" && w.LotNo == model.LotNo).OrderBy(o => o.CreateTime).First();
			if (soNoticeDetail == null)
			{
			throw new Exception("该批次没有对应的出库单明细");
			}
			noticeNo = soNoticeDetail.Id.ToString();
			//出库总单
			var soNotice = Db.Queryable<BllExportNotice>().Where(w => w.IsDel == "0" && w.SONo == soNoticeDetail.SONo).First();
			if (soNotice == null)
			{
			throw new Exception("该批次没有对应的出库单");
			}
			soNotice.Status = "3";//正在执行
			soNotice.UpdateTime = DateTime.Now;
			//更新出库单
			Db.Updateable(soNotice).ExecuteCommand();

			//查找到该车间半成品区
			List<string> areaNoList3 = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "2" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
			//查找库存中是否有此批次的合格下料桶
			pallet = stockDetail.Where(w => w.WareHouseNo == houseNo && w.PalletStatus == "2" && w.Status == "0" && w.LotNo == model.LotNo && w.InspectStatus == "1"
			&& areaNoList3.Contains(w.AreaNo)).OrderByDescending(o => o.CompleteTime).First();
			if (pallet == null)
			{
			throw new Exception("暂无下料桶可分配");
			}
			pallet.Status = "2";//分配状态 0:待分配，1：部分分配， 2:已分配
			//更新桶库存明细
			Db.Updateable(pallet).ExecuteCommand();

			taskMsg = "设备叫料桶下料任务";
			}
			break;
			case "3"://清洗设备叫脏桶
			{
			//叫桶目标储位地址信息
			endLoction = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.AreaNo == deviceInfo.AreaNo && w.Column == 1);// Column=1 清洗储位，Column=2 清洗完料储位
			if (endLoction == null)
			{
			throw new Exception("叫桶设备目标储位信息不存在");
			}
			//查找到该车间脏桶区
			List<string> areaNoList4 = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "3" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
			List<DataStockDetail> palletList = stockDetail.Where(w => w.WareHouseNo == houseNo && w.PalletStatus == "3" && w.Status == "0"
			&& areaNoList4.Contains(w.AreaNo)).OrderByDescending(o => o.CompleteTime).ToList();
			if (palletList.Count <= 0)
			{
			throw new Exception("暂无脏桶可分配");
			}
			taskMsg = "设备叫脏桶任务";
			//遍历库存脏桶，返回MES验证
			foreach (var item in palletList)
			{
			#region 去掉MES
			//string jsonReq = JsonConvert.SerializeObject(item.PalletNo);
			//var response = HttpHelper.DoPost(urlMes, jsonReq, "回传MES脏桶编号", "RCS").ToString();
			//var obj = JsonConvert.DeserializeObject<ReMes>(response);//解析返回数据
			//if (obj.Success == "0")
			//{
			// if (obj.Result != "1")//不可清洗，将脏桶冻结
			// {
			// item.Status = "5";//异常冻结
			// //修改该桶库存状态
			// Db.Updateable(item).ExecuteCommand();

			// continue;
			// }
			// //下发小车任务
			// var task2 = new TaskDetial
			// {
			// Startport = item.LocatNo,
			// Endport = model.Location,
			// Pallno = item.PalletNo,
			// Type = model.Type,
			// Crtype = "1",
			// Noticedetailno = int.Parse(noticeno),
			// };
			// CreateLotTask(task2);
			// return;
			//}
			//else
			//{
			// throw new Exception("回传MES净桶编号失败！");
			//}
			#endregion

			item.Status = "2";//分配状态 0:待分配，1：部分分配， 2:已分配
			//更新桶库存明细
			Db.Updateable(item).ExecuteCommand();
			//起始储位地址信息
			var startLoction2 = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == item.LocatNo);
			if (startLoction2 == null)
			{
			throw new Exception($"起始目标储位信息不存在，桶号：{item.LocatNo}");
			}

			taskNo = new Common().GetMaxNo("TK");//任务号
			var logTaskEntry2 = new LogTask
			{
			TaskNo = taskNo,
			Sender = "WMS",
			Receiver = "RCS",
			//IsSuccess = 1, //是否下发成功 0失败 1成功
			SendDate = DateTime.Now, //发送时间
			//BackDate = DateTime.Now, //返回时间
			StartLocat = item.LocatNo,//起始位置
			EndLocat = model.Location,//目标位置
			PalletNo = item.PalletNo,//托盘码
			IsSend = 1,//是否可再次下发
			IsCancel = 1,//是否可取消
			IsFinish = 1,//是否可完成
			Type = "1",//任务类型 0 入库任务 1 出库任务 2 移库任务
			OrderType = "3",//单据类型 0 入库 1 出库 3 移库
			Status = "0",//任务状态0：等待执行1正在执行2执行完成
			NoticeDetailNo = int.Parse(noticeNo),
			Msg = taskMsg, //关键信息
			};
			//组织下发小车任务信息
			var task2 = new TaskDetial
			{
			Taskno = taskNo,//任务号
			Startport = item.LocatNo,
			Endport = model.Location,
			Pallno = item.PalletNo,
			Crtype = "1",//叫桶
			WareHouseNo = houseNo
			};
			//给下车下发任务
			logTaskEntry2.SendDate = DateTime.Now;//发送时间
			var agvResult2 = CreateTaskForAgv(task2, url);
			if (agvResult2)//成功
			{
			//请求成功修改任务表相应字段状态
			logTaskEntry2.IsSuccess = 1;
			logTaskEntry2.IsSend = 0;
			//logTaskEntry2.IsCancel = 0;
			logTaskEntry2.BackDate = DateTime.Now;
			logTaskEntry2.Status = "1";
			Db.Insertable(logTaskEntry2).ExecuteCommand();

			startLoction2.Status = "3";//出库中
			Db.Updateable(startLoction2).ExecuteCommand();

			endLoction.Status = "2";//入库中
			Db.Updateable(endLoction).ExecuteCommand();
			}
			else//失败
			{
			logTaskEntry2.IsSuccess = 0;
			Db.Insertable(logTaskEntry2).ExecuteCommand();

			}
			//提交事务
			Db.CommitTran();
			return;
			}
			}
			pallet.Status = "2";//分配状态 0:待分配，1：部分分配， 2:已分配
			//更新桶库存明细
			Db.Updateable(pallet).ExecuteCommand();

			taskMsg = "设备叫净桶任务";
			break;
			case "1"://叫料桶（混料）
			//判断是否有批次号
			if (string.IsNullOrWhiteSpace(model.LotNo))
			{
			throw new Exception("批次号为空！");
			}
			//查找到该车间预混区
			List<string> areaNoList2 = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "1" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
			//查找库存中是否有可用的此批次的混料桶
			pallet = stockDetail.Where(w => w.WareHouseNo == houseNo && w.PalletStatus == "1" && w.Status == "0" && w.LotNo == model.LotNo
			&& areaNoList2.Contains(w.AreaNo)).OrderByDescending(o => o.CompleteTime).First();
			if (pallet == null)
			{
			throw new Exception("暂无混料桶可分配");
			}
			pallet.Status = "2";//分配状态 0:待分配，1：部分分配， 2:已分配
			//更新桶库存明细
			Db.Updateable(pallet).ExecuteCommand();

			taskMsg = "设备叫料桶混料任务";
			break;
			case "2"://叫料桶（下料）
			//判断是否有批次号
			if (string.IsNullOrWhiteSpace(model.LotNo))
			{
			throw new Exception("批次号为空！");
			}
			//查找是否有此批次出库单明细
			var soNoticeDetail = Db.Queryable<BllExportNoticeDetail>().Where(w => w.IsDel == "0" && w.LotNo == model.LotNo).OrderBy(o => o.CreateTime).First();
			if (soNoticeDetail == null)
			{
			throw new Exception("该批次没有对应的出库单明细");
			}
			noticeNo = soNoticeDetail.Id.ToString();
			//出库总单
			var soNotice = Db.Queryable<BllExportNotice>().Where(w => w.IsDel == "0" && w.SONo == soNoticeDetail.SONo).First();
			if (soNotice == null)
			{
			throw new Exception("该批次没有对应的出库单");
			}
			soNotice.Status = "3";//正在执行
			soNotice.UpdateTime = DateTime.Now;
			//更新出库单
			Db.Updateable(soNotice).ExecuteCommand();

			//查找到该车间半成品区
			List<string> areaNoList3 = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "2" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
			//查找库存中是否有此批次的合格下料桶
			pallet = stockDetail.Where(w => w.WareHouseNo == houseNo && w.PalletStatus == "2" && w.Status == "0" && w.LotNo == model.LotNo && w.InspectStatus=="1"
			&& areaNoList3.Contains(w.AreaNo)).OrderByDescending(o => o.CompleteTime).First();
			if (pallet == null)
			{
			throw new Exception("暂无下料桶可分配");
			}
			pallet.Status = "2";//分配状态 0:待分配，1：部分分配， 2:已分配
			//更新桶库存明细
			Db.Updateable(pallet).ExecuteCommand();

			taskMsg = "设备叫料桶下料任务";
			break;
			case "3"://叫脏桶
			//查找到该车间脏桶区
			List<string> areaNoList4 = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "3" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
			List<DataStockDetail> palletList = stockDetail.Where(w => w.WareHouseNo == houseNo && w.PalletStatus == "3" && w.Status == "0"
			&& areaNoList4.Contains(w.AreaNo)).OrderByDescending(o => o.CompleteTime).ToList();
			if (palletList.Count <= 0)
			{
			throw new Exception("暂无脏桶可分配");
			}
			//遍历库存脏桶，返回MES验证
			foreach (var item in palletList)
			{
			#region 去掉MES
			//string jsonReq = JsonConvert.SerializeObject(item.PalletNo);
			//var response = HttpHelper.DoPost(urlMes, jsonReq, "回传MES脏桶编号", "RCS").ToString();
			//var obj = JsonConvert.DeserializeObject<ReMes>(response);//解析返回数据
			//if (obj.Success == "0")
			//{
			// if (obj.Result != "1")//不可清洗，将脏桶冻结
			// {
			// item.Status = "5";//异常冻结
			// //修改该桶库存状态
			// Db.Updateable(item).ExecuteCommand();

			// continue;
			// }
			// //下发小车任务
			// var task2 = new TaskDetial
			// {
			// Startport = item.LocatNo,
			// Endport = model.Location,
			// Pallno = item.PalletNo,
			// Type = model.Type,
			// Crtype = "1",
			// Noticedetailno = int.Parse(noticeno),
			// };
			// CreateLotTask(task2);
			// return;
			//}
			//else
			//{
			// throw new Exception("回传MES净桶编号失败！");
			//}
			#endregion

			item.Status = "2";//分配状态 0:待分配，1：部分分配， 2:已分配
			//更新桶库存明细
			Db.Updateable(item).ExecuteCommand();
			//起始储位地址信息
			var startLoction2 = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == item.LocatNo);
			if (startLoction2 == null)
			{
			throw new Exception($"起始目标储位信息不存在，桶号：{item.LocatNo}");
			}

			taskNo = new Common().GetMaxNo("TK");//任务号
			var logTaskEntry2 = new LogTask
			{
			TaskNo = taskNo,
			Sender = "WMS",
			Receiver = "RCS",
			//IsSuccess = 1, //是否下发成功 0失败 1成功
			SendDate = DateTime.Now, //发送时间
			//BackDate = DateTime.Now, //返回时间
			StartLocat = item.LocatNo,//起始位置
			EndLocat = model.Location,//目标位置
			PalletNo = item.PalletNo,//托盘码
			IsSend = 1,//是否可再次下发
			IsCancel = 1,//是否可取消
			IsFinish = 1,//是否可完成
			Type = "1",//任务类型 0 入库任务 1 出库任务 2 移库任务
			OrderType = "3",//单据类型 0 入库 1 出库 3 移库
			Status = "0",//任务状态0：等待执行1正在执行2执行完成
			NoticeDetailNo = int.Parse(noticeNo),
			Msg = taskMsg, //关键信息
			};
			//组织下发小车任务信息
			var task2 = new TaskDetial
			{
			Taskno = taskNo,//任务号
			Startport = item.LocatNo,
			Endport = model.Location,
			Pallno = item.PalletNo,
			Crtype = "1",//叫桶
			};
			//给下车下发任务
			logTaskEntry2.SendDate = DateTime.Now;//发送时间
			var agvResult2 = CreateTaskForAgv(task2, url);
			if (agvResult2)//成功
			{
			//请求成功修改任务表相应字段状态
			logTaskEntry2.IsSuccess = 1;
			logTaskEntry2.IsSend = 0;
			//logTaskEntry2.IsCancel = 0;
			logTaskEntry2.BackDate = DateTime.Now;
			logTaskEntry2.Status = "1";
			Db.Insertable(logTaskEntry2).ExecuteCommand();

			startLoction2.Status = "3";//出库中
			Db.Updateable(startLoction2).ExecuteCommand();

			endLoction.Status = "2";//入库中
			Db.Updateable(endLoction).ExecuteCommand();
			}
			else//失败
			{
			logTaskEntry2.IsSuccess = 0;
			Db.Insertable(logTaskEntry2).ExecuteCommand();

			}
			//提交事务
			Db.CommitTran();
			return;
			}

			taskMsg = "设备叫脏桶任务";
			break;
			default:
			throw new Exception("任务类型无效");
			@@ -289,11 +337,12 @@
			//组织下发小车任务信息
			var task = new TaskDetial
			{
			Taskno= taskNo,//任务号
			Taskno = taskNo,//任务号
			Startport = pallet.LocatNo,//起始位置
			Endport = model.Location,//目标位置
			Pallno = pallet.PalletNo,//桶号
			Crtype = "1",//叫桶
			WareHouseNo = houseNo//车间编码
			};
			//给下车下发任务
			logTaskEntry.SendDate = DateTime.Now;//发送时间
			@@ -349,13 +398,20 @@
			{
			throw new Exception($"该桶有正在执行的任务，PalletNo:{model.PalletNo}");
			}
			//通过设备号查找到所属设备（区域）
			var deviceInfo = Db.Queryable<SysStorageArea>().First(w => w.IsDel == "0" && w.DeviceCode == model.Location);
			if (deviceInfo == null)
			{
			throw new Exception("设备信息不存在");
			}
			var houseNo = deviceInfo.WareHouseNo;//申请储位设备所在车间编号
			//设备所在储位信息（起始储位）
			var deviceLocatInfo = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.Location);
			var deviceLocatInfo = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.AreaNo == deviceInfo.AreaNo);
			if (deviceLocatInfo == null)
			{
			throw new Exception($"未查询到该设备所在储位信息，Location:{model.Location}");
			}
			var houseNo = deviceLocatInfo.WareHouseNo;//申请储位设备所在车间编号

			var noticeno = "0";//出入库单据明细ID
			//桶库存信息
			var palletInfo = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == model.PalletNo);
			@@ -372,82 +428,114 @@
			switch (model.Type)
			{
			case "3"://清洗设备申请储位（净桶申请储位）
			//查找到该车间净桶区
			//List<string> areaNoList = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "0" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
			//loction = storageLocat.Where(w => w.WareHouseNo == houseNo && areaNoList.Contains(w.AreaNo) && w.Status == "0" && w.Flag == "0").OrderByDescending(o => o.CreateTime).First();
			loction = GetLocatModel(houseNo, "0");
			if (loction == null)
			{
			throw new Exception("该车间净桶区暂无空余储位");
			}
			//设备所在储位信息（起始储位）
			deviceLocatInfo = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.AreaNo == deviceInfo.AreaNo && w.Column == 2);// Column=1 清洗储位，Column=2 清洗完料储位
			if (deviceLocatInfo == null)
			{
			throw new Exception($"未查询到该设备所在储位信息，Location:{model.Location}");
			}
			//查找到该车间净桶区;
			loction = GetLocatModel(houseNo, "0");
			if (loction == null)
			{
			throw new Exception("该车间净桶区暂无空余储位");
			}

			taskMsg = "清洗设备（净桶）申请储位任务";
			taskMsg = "清洗设备（净桶）申请储位任务";
			}
			break;
			case "0"://接料设备申请储位（预混料桶申请储位）
			//判断是否有批次号
			if (string.IsNullOrWhiteSpace(model.LotNo))
			{
			throw new Exception("批次号为空！");
			}
			//查找到该车间预混区
			//List<string> areaNoList2 = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "1" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
			//loction = storageLocat.Where(w => w.WareHouseNo == houseNo && areaNoList2.Contains(w.AreaNo) && w.Status == "0" && w.Flag == "0").OrderByDescending(o => o.CreateTime).First();
			loction = GetLocatModel(houseNo, "1");
			if (loction == null)
			{
			throw new Exception("该车间预混区暂无空余储位");
			}
			palletInfo.LotNo = model.LotNo;//批次号
			//更新桶库存信息
			Db.Updateable(palletInfo).ExecuteCommand();
			//设备所在储位信息（起始储位）
			deviceLocatInfo = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.AreaNo == deviceInfo.AreaNo);
			if (deviceLocatInfo == null)
			{
			throw new Exception($"未查询到该设备所在储位信息，Location:{model.Location}");
			}
			//判断是否有批次号
			if (string.IsNullOrWhiteSpace(model.LotNo))
			{
			throw new Exception("批次号为空！");
			}
			//查找到该车间预混区
			loction = GetLocatModel(houseNo, "1");
			if (loction == null)
			{
			throw new Exception("该车间预混区暂无空余储位");
			}
			palletInfo.LotNo = model.LotNo;//批次号
			//更新桶库存信息
			Db.Updateable(palletInfo).ExecuteCommand();

			taskMsg = "接料设备（预混料桶）申请储位任务";
			taskMsg = "接料设备（预混料桶）申请储位任务";
			}
			break;
			case "1"://混料设备申请储位（半成品桶申请储位）
			//判断是否有批次号
			if (string.IsNullOrWhiteSpace(model.LotNo))
			{
			throw new Exception("批次号为空！");
			}
			//校验此批次是否有入库单
			var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().Where(w => w.IsDel == "0" && w.Status == "0" && w.LotNo == model.LotNo).OrderByDescending(o => o.CreateTime).First();
			if (noticeDetail == null)
			{
			throw new Exception("该批次没有对应的入库单明细");
			}
			noticeno = noticeDetail.Id.ToString();
			//入库总单
			var notice = Db.Queryable<BllArrivalNotice>().Where(w => w.IsDel == "0" && w.ASNNo == noticeDetail.ASNNo).First();
			if (notice == null)
			{
			throw new Exception("该批次没有对应的入库单");
			}
			notice.Status = "1";//正在执行
			//更新入库单状态
			Db.Updateable(notice).ExecuteCommand();
			//设备所在储位信息（起始储位）
			deviceLocatInfo = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.AreaNo == deviceInfo.AreaNo);
			if (deviceLocatInfo == null)
			{
			throw new Exception($"未查询到该设备所在储位信息，Location:{model.Location}");
			}
			//判断是否有批次号
			if (string.IsNullOrWhiteSpace(model.LotNo))
			{
			throw new Exception("批次号为空！");
			}
			//校验此批次是否有入库单
			var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().Where(w => w.IsDel == "0" && w.Status == "0" && w.LotNo == model.LotNo).OrderByDescending(o => o.CreateTime).First();
			if (noticeDetail == null)
			{
			throw new Exception("该批次没有对应的入库单明细");
			}
			noticeno = noticeDetail.Id.ToString();
			//入库总单
			var notice = Db.Queryable<BllArrivalNotice>().Where(w => w.IsDel == "0" && w.ASNNo == noticeDetail.ASNNo).First();
			if (notice == null)
			{
			throw new Exception("该批次没有对应的入库单");
			}
			notice.Status = "1";//正在执行
			//更新入库单状态
			Db.Updateable(notice).ExecuteCommand();

			//查找到该车间半成品区
			//List<string> areaNoList3 = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "2" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
			//loction = storageLocat.Where(w => w.WareHouseNo == houseNo && areaNoList3.Contains(w.AreaNo) && w.Status == "0" && w.Flag == "0").OrderByDescending(o => o.CreateTime).First();
			loction = GetLocatModel(houseNo, "2");
			if (loction == null)
			{
			throw new Exception("该车间半成品区暂无空余储位");
			}
			//查找到该车间半成品区
			loction = GetLocatModel(houseNo, "2");
			if (loction == null)
			{
			throw new Exception("该车间半成品区暂无空余储位");
			}

			taskMsg = "接料设备（混料桶）申请储位任务";
			taskMsg = "接料设备（混料桶）申请储位任务";
			}
			break;
			case "2"://下料设备申请储位（脏桶申请储位）
			//查找到该车间脏桶区
			//List<string> areaNoList4 = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "3" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
			//loction = storageLocat.Where(w => w.WareHouseNo == houseNo && areaNoList4.Contains(w.AreaNo) && w.Status == "0" && w.Flag == "0").OrderByDescending(o => o.CreateTime).First();
			loction = GetLocatModel(houseNo, "3");
			if (loction == null)
			{
			throw new Exception("该车间脏桶区暂无空余储位");
			}
			if (houseNo == "M04")//除了喷干车间下料口都是2个储位（投料储位、投完料储位）
			{
			//设备所在储位信息（起始储位）
			deviceLocatInfo = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.AreaNo == deviceInfo.AreaNo);
			}
			else
			{
			//设备所在储位信息（起始储位）
			deviceLocatInfo = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.AreaNo == deviceInfo.AreaNo && w.Column == 2);//Column=1 投料储位，Column=2 投完料储位
			}
			if (deviceLocatInfo == null)
			{
			throw new Exception($"未查询到该设备所在储位信息，Location:{model.Location}");
			}
			//查找到该车间脏桶区
			loction = GetLocatModel(houseNo, "3");
			if (loction == null)
			{
			throw new Exception("该车间脏桶区暂无空余储位");
			}

			taskMsg = "下料设备（脏桶）申请储位任务";
			taskMsg = "下料设备（脏桶）申请储位任务";
			}
			break;
			}

			@@ -480,6 +568,7 @@
			Endport = loction.LocatNo,
			Pallno = model.PalletNo,
			Crtype = "0",//入库
			WareHouseNo = houseNo
			};
			//给下车下发任务
			logTaskEntry.SendDate = DateTime.Now;//发送时间
			@@ -748,28 +837,59 @@
			//入库任务，处理入库单
			if (taskInfo.Type == "0" && taskInfo.NoticeDetailNo != 0)
			{
			var notice = Db.Queryable<BllArrivalNotice>().First(w => w.IsDel == "0" && w.Status == "1");
			if (notice != null)
			{
			notice.Status = "2";//执行完成
			notice.UpdateTime = DateTime.Now;
			notice.CompleteTime = DateTime.Now;
			//修改入库单状态
			Db.Updateable(notice).ExecuteCommand();
			//入库单明细
			var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(w => w.IsDel == "0" && w.Id == taskInfo.NoticeDetailNo);
			if (noticeDetail != null)
			{
			noticeDetail.CompleteQty += 1;//完成数量

			if (noticeDetail.CompleteQty >= noticeDetail.Qty)
			{
			noticeDetail.CompleteTime = DateTime.Now;//完成时间

			//入库单
			var notice = Db.Queryable<BllArrivalNotice>().First(w => w.IsDel == "0" && w.ASNNo == noticeDetail.ASNNo);

			var noticeDetailList = Db.Queryable<BllArrivalNoticeDetail>().Where(w => w.IsDel == "0" && w.CompleteQty < w.Qty && w.Id != noticeDetail.Id).ToList();
			if (noticeDetailList.Count <= 0)
			{
			notice.Status = "2";//执行完成
			notice.UpdateTime = DateTime.Now;
			notice.CompleteTime = DateTime.Now;
			//修改入库单状态
			Db.Updateable(notice).ExecuteCommand();
			}
			}
			//修改入库单明细
			Db.Updateable(noticeDetail).ExecuteCommand();
			}
			}
			//出库任务，处理出库单
			if (taskInfo.Type == "1" && taskInfo.NoticeDetailNo != 0)//入库
			{
			var notice = Db.Queryable<BllExportNotice>().First(w => w.IsDel == "0" && w.Status == "3");
			if (notice != null)
			var noticeDetail = Db.Queryable<BllExportNoticeDetail>().First(w => w.IsDel == "0" && w.Id==taskInfo.NoticeDetailNo);
			if (noticeDetail != null)
			{
			notice.Status = "4";//执行完成
			notice.UpdateTime = DateTime.Now;
			notice.CompleteTime = DateTime.Now;
			//修改入库单状态
			Db.Updateable(notice).ExecuteCommand();
			noticeDetail.CompleteQty += 1;//完成数量

			if (noticeDetail.CompleteQty >= noticeDetail.Qty)
			{
			var notice = Db.Queryable<BllExportNotice>().First(w => w.IsDel == "0" && w.SONo == noticeDetail.SONo);

			var noticeDetailList = Db.Queryable<BllExportNoticeDetail>().Where(w => w.IsDel == "0" && w.CompleteQty < w.Qty && w.Id != noticeDetail.Id).ToList();
			if (noticeDetailList.Count <= 0)
			{
			notice.Status = "4";//执行完成
			notice.UpdateTime = DateTime.Now;
			notice.CompleteTime = DateTime.Now;
			//修改入库单状态
			Db.Updateable(notice).ExecuteCommand();
			}
			}
			//修改入库单明细
			Db.Updateable(noticeDetail).ExecuteCommand();
			}

			}

			#region 去掉MES
			@@ -982,7 +1102,11 @@
			{
			path1.type = "05";
			}
			else//申请储位（桶入库）
			else if (taskDetial.Crtype == "0")//申请储位（桶入库）
			{
			path1.type = "00";
			}
			else//同车间平层搬运
			{
			path1.type = "05";
			}
			@@ -993,9 +1117,13 @@
			path2.positionCode = taskDetial.Endport;
			if (taskDetial.Crtype == "1")//叫桶（桶出库）
			{
			path2.type = "00";
			}
			else if (taskDetial.Crtype == "1")//申请储位（桶入库）
			{
			path2.type = "05";
			}
			else//申请储位（桶入库）
			else //同车间平层搬运
			{
			path2.type = "05";
			}
			@@ -1005,21 +1133,34 @@
			AgvSchedulingTask agvTask = new AgvSchedulingTask();
			agvTask.reqCode = taskDetial.Taskno;//请求编号
			agvTask.taskCode = taskDetial.Taskno;//任务号
			agvTask.ctnrCode = taskDetial.Pallno;//桶号
			agvTask.ctnrTyp = "1";// 1:桶 3：托盘
			agvTask.ctnrCode = taskDetial.Pallno;//桶号
			agvTask.reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");//请求时间
			agvTask.wbCode = "";
			agvTask.positionCodePath = pahtList;//小车路径
			agvTask.podCode = "";
			agvTask.userCallCode = "";//taskDetial.Endport;//目标位置
			//判断容器类型
			if (taskDetial.WareHouseNo == "M04")//喷干车间
			{
			agvTask.ctnrTyp = "2";// 1：桶 2：桶（小） 3：托盘
			}
			else
			{
			agvTask.ctnrTyp = "1";// 1：桶 2：桶（小） 3：托盘
			}
			//判断任务类型
			if (taskDetial.Crtype == "1")//叫桶（桶出库）
			{
			agvTask.taskTyp = "Z3";//任务类型线边到托盘收集器 Z1，托盘垛申请入库 Z2
			}
			else//申请储位（桶入库）
			else if (taskDetial.Crtype == "0")//申请储位（桶入库）
			{
			agvTask.taskTyp = "Z4";//任务类型线边到托盘收集器 Z1，托盘垛申请入库 Z2
			}
			else//同车间平层搬运
			{
			agvTask.taskTyp = "Z5";
			}

			// 正式运行程序放开
			var jsonData = JsonConvert.SerializeObject(agvTask);