From 5c1f7e76fa0edd73f4edb711a3466c1d9fe59c97 Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期四, 17 四月 2025 14:05:54 +0800
Subject: [PATCH] 修改问题，添加获取原料仓状态
---
Admin.NET/WCS.Application/OpenApi/OpenApi.cs | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/Admin.NET/WCS.Application/OpenApi/OpenApi.cs b/Admin.NET/WCS.Application/OpenApi/OpenApi.cs
index f57a346..0f77a19 100644
--- a/Admin.NET/WCS.Application/OpenApi/OpenApi.cs
+++ b/Admin.NET/WCS.Application/OpenApi/OpenApi.cs
@@ -568,6 +568,7 @@
};
_db.Insertable(modTaskMonitor).ExecuteCommand();
HubUtil.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+ //鍐欏叆鍏夊箷0
Task.Run(() =>
{
var modDevice = PLCTaskAction.plcDevices.FirstOrDefault(s => s.PlcId == modPlc.Id && s.Level == DeviceLevelEnum.DB);
@@ -586,6 +587,7 @@
HubUtil.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());
});
+ //鍚戠爜鍨涙満鍣ㄤ汉鍐欏彇鎵樺畬鎴愪俊鍙�
modDevice = PLCTaskAction.plcDevices.FirstOrDefault(s => s.PlcId == modPlc.Id && s.Level == DeviceLevelEnum.Station);
res = modConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.PlcPos, "0");
modTaskMonitor = new WcsTaskMonitor()
@@ -600,13 +602,15 @@
HubUtil.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());
modConn.Close();
}
- if (modTask.StartLocate == AGVStaionEnum.A1.ToString())
+ //璧峰宸ヤ綅鏄彁鍗囨満鍙栬揣宸ヤ綅
+ if (modTask.StartLocate == AGVStaionEnum.A2.ToString())
{
var modPlc = PLCTaskAction.plcs.FirstOrDefault(s => s.Type == PLCTypeEnum.ConveyorLine);
var modConn = new PLCUtil(modPlc);
var modDevice = PLCTaskAction.plcDevices.FirstOrDefault(s => s.PlcId == modPlc.Id && s.Text == "C鍙�");
var modPos = PLCTaskAction.plcPositions.FirstOrDefault(s => s.DeviceId == modDevice.Id && s.Text == "鍙栬蛋纭");
var res = modConn.SetPlcDBValue(modPos.PosType, modDevice.DbNumber, modPos.PlcPos, "1");
+ Log.Information($"鍚憄lc{modDevice.PlcId}鍐欏叆1-鍙栬蛋纭锛岀粨鏋滐細{res.ToJson()}");
var modTaskMonitor = new WcsTaskMonitor()
{
TaskNo = modTask.TaskNo,
@@ -734,7 +738,16 @@
}
-
+ /// <summary>
+ /// 鑾峰彇鍘熸潗鏂欎粨鐘舵��
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<bool> HuoQuMateralStatus()
+ {
+ var data = await _sysConfigService.GetConfigValue<bool>("cache_Materal");
+ return data;
+ }
/// <summary>
/// 淇敼鍘熸潗鏂欎粨鐘舵��
/// </summary>
--
Gitblit v1.8.0