~dengjunjie/TaiYuanTaiZhong.git

			@@ -1,13 +1,17 @@
			ï»¿using Confluent.Kafka;
			using Newtonsoft.Json;
			using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
			using OfficeOpenXml.FormulaParsing.Excel.Operators;
			using WIDESEA_Comm.LogInfo;
			using WIDESEA_Comm.MES_Info;
			using WIDESEA_Comm.MES_Info.Request;
			using WIDESEA_Common;
			using WIDESEA_Core.EFDbContext;
			using WIDESEA_Core.FreeDB;
			using WIDESEA_Entity.DomainModels;
			using WIDESEA_Entity.ToAGV;
			using WIDESEA_WMS.IRepositories;
			using WIDESEA_WMS.Repositories;
			using static WIDESEA_Comm.MES_Info.BasicSN;

			namespace WIDESEA_WMS.Common.AGVTask
			@@ -34,24 +38,45 @@
			{
			throw new Exception("æ ä»»å¡æ°æ®");
			}

			if (task.agv_tasktype == AGVTaskTypeEnum.TaskType_Outbound.ToString() \|\| task.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceOutbound.ToString())
			VOLContext context = new VOLContext();
			IVV_Mes_WorkinfoRepository workinfoRepository = new VV_Mes_WorkinfoRepository(context);
			if (task.agv_tasktype == AGVTaskTypeEnum.TaskType_Outbound.ToString() /\|\| task.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceOutbound.ToString()/\|\| task.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceCarry.ToString())
			{
			foreach (var item in task.bindSN.Split(","))
			if(task.agv_tasktype == AGVTaskTypeEnum.TaskType_Outbound.ToString())
			{
			detail detail = new detail();
			detail.sn = item;
			list.Add(detail);
			foreach (var item in task.bindSN.Split(","))
			{
			var work = workinfoRepository.Find(x => x.SN == item && x.processCode == task.agv_worktype.ToString()).FirstOrDefault();
			detail detail = new detail();
			detail.sn = item;
			detail.jobID = work.jobID;
			detail.processCode = work.processCode;
			list.Add(detail);
			}
			}
			else
			{
			foreach (var item in task.bindSN.Split(","))
			{
			//var work = workinfoRepository.Find(x => x.SN == item && x.processCode == "28").FirstOrDefault();
			detail detail = new detail();
			detail.sn = item;
			detail.jobID = task.jobID;
			detail.processCode = task.agv_worktype.ToString();
			list.Add(detail);
			}
			}

			agvInWarehousePara outWarehousePara = new agvInWarehousePara()
			{
			WorkOrder = task.jobID,
			zoneID = task.agv_fromaddress,
			//processCode = task.agv_worktype.ToString(),
			details = list,
			JobID = task.jobID,
			processCode = task.agv_worktype.ToString(),
			layerNo = 1,
			stackID = "1",
			warehouseName = "Agvåº",
			zoneID = task.agv_fromaddress,
			Operator="AGVèªå¨",
			};
			obj = outWarehousePara;
			ActionName = "agvOutWarehouse";//AGV->MESè½¦è½®åºåº
			@@ -61,19 +86,23 @@
			{
			foreach (var item in task.bindSN.Split(","))
			{
			var work = workinfoRepository.Find(x => x.SN == item && x.processCode == task.agv_worktype.ToString()).FirstOrDefault();
			detail detail = new detail();
			detail.sn = item;
			detail.jobID = work.jobID;
			detail.processCode = work.processCode;
			list.Add(detail);
			}
			agvInWarehousePara inWarehousePara = new agvInWarehousePara()
			{
			WorkOrder = task.jobID,
			zoneID = task.agv_toaddress,
			//processCode = task.agv_worktype.ToString(),
			details = list,
			JobID = task.jobID,
			processCode = task.agv_worktype.ToString(),
			layerNo = 1,
			stackID = "1",
			warehouseName = "Agvåº",
			zoneID = task.agv_toaddress,
			Operator = "AGVèªå¨",
			};
			obj = inWarehousePara;
			ActionName = "agvInWarehouse";//AGV->MESè½¦è½®å¥åº
			@@ -82,39 +111,53 @@
			//else if (task.agv_tasktype == "Transfer") //ç§»åºåºå åºåç§»åº
			else if (task.agv_tasktype == AGVTaskTypeEnum.TaskType_Carry.ToString()) //ç§»åºåºå åºåç§»åº
			{
			List<detail1> list1 = new List<detail1>(); //è½¦è½®ä¿¡æ¯
			foreach (var item in task.bindSN.Split(","))
			{
			detail1 detail = new detail1();
			detail.sn = item;
			list1.Add(detail);
			}
			agvMoveWarehousePara moveWarehousePara = new agvMoveWarehousePara()
			{
			details = list,
			fromZoneID = task.agv_fromaddress,
			toZoneID = task.agv_toaddress,
			details = list1,
			fromLayerNo = "1",
			fromStackID = "1",
			fromWarehouseName = "Agvåº",
			fromZoneID = task.agv_fromaddress,
			toLayerNo = "1",
			toStackID = "1",
			toWarehouseName = "Agvåº",
			toZoneID = task.agv_toaddress,
			Operator = "AGVèªå¨",
			};
			obj = moveWarehousePara;
			ActionName = "agvMoveWarehouse";//AGV->MESè½¦è½®ç§»åº
			name = "AGVåæ¥MESè½¦è½®ABåºç§»åº";
			}
			else if (task.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceCarry.ToString())// å¤åç§»åº
			//else if (task.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceCarry.ToString())// å¤åç§»åº
			//{
			// var mes_head = FreeDB.Select<dt_mes_head>().Where(x => x.jobID == task.jobID).First();
			// agvTransferListPara agvTransferListPara = new agvTransferListPara()
			// {
			// transferListID = task.agv_tasknum,
			// materialCode = mes_head.materialCode,
			// details = list,
			// drawingNoVer = mes_head.drawingNoVer,
			// fromWarehouse = "AGVåº",
			// toWarehouse = "æ¯è½®åº",
			// Operator = task.agv_userid,
			// updateTime = task.agv_createtime.ToString(),
			// };
			// obj = agvTransferListPara;
			// ActionName = "agvTransferList";
			// name = "AGVåæ¥MESè½¦è½®ç§»åºABåº->BCåº";
			//}
			else
			{
			var mes_head = FreeDB.Select<dt_mes_head>().Where(x => x.jobID == task.jobID).First();
			agvTransferListPara agvTransferListPara = new agvTransferListPara()
			{
			details = list,
			transferListID = task.agv_tasknum,
			materialCode = mes_head.materialCode,
			drawingNoVer = mes_head.drawingNoVer,
			fromWarehouse = "AGVåº",
			toWarehouse = "æ¯è½®åº",
			Operator = task.agv_userid,
			updateTime = task.agv_createtime.ToString(),
			};
			obj = agvTransferListPara;
			ActionName = "agvTransferList";
			name = "AGVåæ¥MESè½¦è½®ç§»åºABåº->BCåº";
			requestMes.code = "200";
			requestMes.Type = "success";
			return requestMes;
			}

			var postJson = JsonConvert.SerializeObject(obj);