WCSNet6.git - Gitblit

			@@ -1,6 +1,8 @@

			using Admin.NET.Core.Service;
			using Elastic.Clients.Elasticsearch;
			using WCS.Application.Entity;
			using WCS.Application.Service.WcsDevice.Dto;

			namespace WCS.Application;

			@@ -219,7 +221,9 @@
			//读取plc的值
			var modConn = PLCTaskAction.listPlcConn.FirstOrDefault(s => s != null && s.PlcId == modDevice.PlcId);
			if (modConn == null)
			break;
			{
			continue;
			}
			try
			{
			var listPosition = await _wcsDeviceRep.Context.Queryable<WcsPosition>().Where(s => s.DeviceId == modDevice.Id).ToListAsync();
			@@ -229,7 +233,7 @@
			modDevice.Wcs = Convert.ToString(wcs);
			//任务号
			var modPositionTask = listPosition.FirstOrDefault(s => s.Text == "任务号");
			(result, var taskNo) = modConn.GetPlcDBValue(modPositionTask.PosType, modDevice.DbNumber, modPositionTask.PlcPos);
			(result, var taskNo) = modConn.GetPlcDBValue(modPositionTask.PosType, modDevice.DbNumber, modPositionTask.PlcPos, modPositionTask.StringLength);
			modDevice.TaskNo = Convert.ToString(taskNo);
			//任务类型
			var modPositionTaskType = listPosition.FirstOrDefault(s => s.Text == "任务类型");
			@@ -245,8 +249,36 @@
			modDevice.EndLocatNo = Convert.ToString(endLocatNo);
			//托盘码
			var modPositionPalletNo = listPosition.FirstOrDefault(s => s.Text == "托盘码");
			(result, var palletNo) = modConn.GetPlcDBValue(modPositionPalletNo.PosType, modDevice.DbNumber, modPositionPalletNo.PlcPos);
			(result, var palletNo) = modConn.GetPlcDBValue(modPositionPalletNo.PosType, modDevice.DbNumber, modPositionPalletNo.PlcPos, modPositionPalletNo.StringLength);
			modDevice.PalletNo = Convert.ToString(palletNo);
			if (cachePlc.Type == PLCTypeEnum.ConveyorLine)
			{
			//放货排
			var modPositionReleaseRow = listPosition.FirstOrDefault(s => s.Text == "放货排");
			(result, var releaseRow) = modConn.GetPlcDBValue(modPositionReleaseRow.PosType, modDevice.DbNumber, modPositionReleaseRow.PlcPos);
			modDevice.ReleaseRow = Convert.ToInt32(releaseRow);
			//放货列
			var modPositionReleaseCol = listPosition.FirstOrDefault(s => s.Text == "放货列");
			(result, var releaseCol) = modConn.GetPlcDBValue(modPositionReleaseCol.PosType, modDevice.DbNumber, modPositionReleaseCol.PlcPos);
			modDevice.ReleaseCol = Convert.ToInt32(releaseCol);
			//放货层
			var modPositionReleaseStorey = listPosition.FirstOrDefault(s => s.Text == "放货层");
			(result, var releaseStorey) = modConn.GetPlcDBValue(modPositionReleaseStorey.PosType, modDevice.DbNumber, modPositionReleaseStorey.PlcPos);
			modDevice.ReleaseStorey = Convert.ToInt32(releaseStorey);
			//取货排
			var modPositionPickRow = listPosition.FirstOrDefault(s => s.Text == "取货排");
			(result, var pickRow) = modConn.GetPlcDBValue(modPositionPickRow.PosType, modDevice.DbNumber, modPositionPickRow.PlcPos);
			modDevice.PickRow = Convert.ToInt32(pickRow);
			//取货列
			var modPositionPickCol = listPosition.FirstOrDefault(s => s.Text == "取货列");
			(result, var pickCol) = modConn.GetPlcDBValue(modPositionPickCol.PosType, modDevice.DbNumber, modPositionPickCol.PlcPos);
			modDevice.PickCol = Convert.ToInt32(pickCol);
			//取货层
			var modPositionPickStorey = listPosition.FirstOrDefault(s => s.Text == "取货层");
			(result, var pickStorey) = modConn.GetPlcDBValue(modPositionPickStorey.PosType, modDevice.DbNumber, modPositionPickStorey.PlcPos);
			modDevice.PickStorey = Convert.ToInt32(pickStorey);

			}
			}
			catch (Exception)
			{
			@@ -271,4 +303,119 @@

			return list;
			}

			[HttpPost]
			[ApiDescriptionSettings(Name = "WriteValue")]
			[DisplayName("写入值")]
			public async Task WriteValue(WriteWcsDeviceInput modDevice)
			{
			var modPlc = await _wcsDeviceRep.Context.Queryable<WcsPlc>().FirstAsync(s => s.Id == modDevice.PlcId);
			if (modPlc == null)
			throw Oops.Bah("找不到PLC信息");
			PLCUtil modUtil = new PLCUtil(modPlc);
			var listPosition = await _wcsDeviceRep.Context.Queryable<WcsPosition>().Where(s => s.DeviceId == modDevice.Id).ToListAsync();
			//(var result, var plc) = modConn.GetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.PlcPos);
			//modDevice.Plc = Convert.ToString(plc);
			//任务号
			var modPositionTask = listPosition.FirstOrDefault(s => s.Text == "任务号");
			if (modPositionTask != null)
			modUtil.SetPlcDBValue(modPositionTask.PosType, modPositionTask.PlcPos, modDevice.TaskNo);
			//任务类型
			var modPositionTaskType = listPosition.FirstOrDefault(s => s.Text == "任务类型");
			if (modPositionTaskType != null)
			modUtil.SetPlcDBValue(modPositionTaskType.PosType, modPositionTaskType.PlcPos, modDevice.TaskType.ToString());
			//起始工位
			var modPositionStartLocatNo = listPosition.FirstOrDefault(s => s.Text == "起始工位");
			if (modPositionStartLocatNo != null)
			modUtil.SetPlcDBValue(modPositionStartLocatNo.PosType, modPositionStartLocatNo.PlcPos, modDevice.StartLocatNo.ToString());
			//目的工位
			var modPositionEndLocatNo = listPosition.FirstOrDefault(s => s.Text == "目的工位");
			if (modPositionEndLocatNo != null)
			modUtil.SetPlcDBValue(modPositionEndLocatNo.PosType, modPositionEndLocatNo.PlcPos, modDevice.EndLocatNo.ToString());
			//托盘码
			var modPositionPalletNo = listPosition.FirstOrDefault(s => s.Text == "托盘码");
			if (modPositionPalletNo != null)
			modUtil.SetPlcDBValue(modPositionPalletNo.PosType, modPositionPalletNo.PlcPos, modDevice.PalletNo.ToString());
			if (modPlc.Type == PLCTypeEnum.ConveyorLine)
			{
			//放货排
			var modPositionReleaseRow = listPosition.FirstOrDefault(s => s.Text == "放货排");
			if (modPositionReleaseRow != null)
			modUtil.SetPlcDBValue(modPositionReleaseRow.PosType, modPositionReleaseRow.PlcPos, modDevice.ReleaseRow.ToString());
			//放货列
			var modPositionReleaseCol = listPosition.FirstOrDefault(s => s.Text == "放货列");
			if (modPositionReleaseRow != null)
			modUtil.SetPlcDBValue(modPositionReleaseCol.PosType, modPositionReleaseCol.PlcPos, modDevice.ReleaseCol.ToString());
			//放货层
			var modPositionReleaseStorey = listPosition.FirstOrDefault(s => s.Text == "放货层");
			if (modPositionReleaseStorey != null)
			modUtil.SetPlcDBValue(modPositionReleaseStorey.PosType, modPositionReleaseStorey.PlcPos, modDevice.ReleaseStorey.ToString());
			//取货排
			var modPositionPickRow = listPosition.FirstOrDefault(s => s.Text == "取货排");
			if (modPositionPickRow != null)
			modUtil.SetPlcDBValue(modPositionPickRow.PosType, modPositionPickRow.PlcPos, modDevice.PickRow.ToString());
			//取货列
			var modPositionPickCol = listPosition.FirstOrDefault(s => s.Text == "取货列");
			if (modPositionPickCol != null)
			modUtil.SetPlcDBValue(modPositionPickCol.PosType, modPositionPickCol.PlcPos, modDevice.PickCol.ToString());
			//取货层
			var modPositionPickStorey = listPosition.FirstOrDefault(s => s.Text == "取货层");
			if (modPositionPickStorey != null)
			modUtil.SetPlcDBValue(modPositionPickStorey.PosType, modPositionPickStorey.PlcPos, modDevice.PickStorey.ToString());

			}
			modUtil.Close();
			}

			#region 分拣码垛
			/// <summary>
			/// 获取码垛机器人和拆垛机器人列表
			/// </summary>
			/// <returns></returns>
			[HttpGet]
			[ApiDescriptionSettings(Name = "WcsPackPlcList")]
			[DisplayName("获取码垛机器人和拆垛机器人列表")]
			public async Task<dynamic> WcsPackPlcList()
			{
			return await _wcsDeviceRep.Context.Queryable<WcsPlc>()
			.Where(w => w.Type == PLCTypeEnum.RobotPalletizer \|\| w.Type == PLCTypeEnum.StackingRobot)
			.OrderByDescending(o => o.Type)
			.Select(u => new
			{
			id = u.Id,
			name = u.Text
			}
			).ToListAsync();
			}
			/// <summary>
			/// 获取设备对应工位列表
			/// </summary>
			/// <param name="entry"></param>
			/// <returns></returns>
			[HttpGet]
			[ApiDescriptionSettings(Name = "WcsPackStationPlcList")]
			[DisplayName("获取设备对应工位列表")]
			public async Task<List<WcsDeviceTaskOrderDto>> WcsPackStationPlcList([FromQuery] WcsDeviceBaseInput entry)
			{
			return await _wcsDeviceRep.Context.Queryable<WcsDevice>()
			.LeftJoin<WcsCheckTask>((device, task) => device.StationNum == task.Port)
			.Where((device, task) => device.PlcId == entry.PlcId)
			.OrderBy((device, task) => device.CreateTime)
			.Select((device, task) => new WcsDeviceTaskOrderDto()
			{
			Id=device.Id,
			Text=device.Text,
			TaskNo=task.TaskNo,
			OrderNo=task.OrderNo,
			LotNo=task.LotNo,
			SkuNo=task.SkuNo,
			SkuName=task.SkuName,
			LineNo=task.LineNo,
			Status =task.Status,
			PZNo=task.PZNo,
			Qty=task.Qty
			})
			.ToListAsync();
			}
			#endregion
			}