From 75a1cfdc9b88519fa7a2af57e8b7d615c063b656 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 04 九月 2024 11:28:50 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs b/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
index ae15fb6..6eff76c 100644
--- a/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
@@ -138,5 +138,25 @@
var modService = new { PLCTaskAction.boRunningState, PLCTaskAction.boOffline, PLCTaskAction.boRefresh };
return new { listPlc, modService };
}
+ /// <summary>
+ /// 鑾峰彇浣嶇疆涓婃湁娌℃湁涓滆タ
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ [ApiDescriptionSettings(Name = "ListPosition")]
+ [DisplayName("鑾峰彇浣嶇疆涓婃湁娌℃湁涓滆タ")]
+ public List<PlcPositionInfo> ListPosition()
+ {
+ //娴嬭瘯鐢�
+ //return new List<PlcPositionInfo>()
+ //{
+ // new PlcPositionInfo(){ Type=PLCTypeEnum.ConveyorLine, StationNum="147", BoHaveItem=true },
+ // new PlcPositionInfo(){ Type=PLCTypeEnum.ConveyorLine, StationNum="143", BoHaveItem=true },
+ // new PlcPositionInfo(){ Type=PLCTypeEnum.StackingMachine, StationNum="002", BoxHeight=30 },
+ //};
+
+ var list = PLCTaskAction.listPositionInfo.ToList();
+ return list;
+ }
}
--
Gitblit v1.8.0