From ddab693f389b648157c8b48c7fcbdefc92561dd2 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 05 七月 2024 19:55:22 +0800
Subject: [PATCH] 老PCS替换代码优化，工业大屏优化，PDA功能优化
---
代码管理/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs"
index 3fc2ea7..baee244 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs"
@@ -4,6 +4,7 @@
using System.Collections.Generic;
using System.Linq;
using WIDESEA_Comm;
+using WIDESEA_Comm.PLCDBItem;
using WIDESEA_Core.EFDbContext;
using WIDESEA_Core.Extensions;
using WIDESEA_Core.Utilities;
@@ -39,7 +40,8 @@
{
var DBIems = WheelDBItem.VK4WheelDBItem; //鑾峰彇杈婇亾锛岃緭閫佺嚎淇℃伅
var DBIems2 = VKDBItem.VK4DBItem; //VK4鐘舵�佷俊鎭璞￠泦鍚�
- // VK4妗佹灦鏈烘鎵嬪璞￠泦鍚�
+
+ var DBIems3 = Oiling_machine.Oiling_machineDBItem;
if (DBIems.Count == 0)
{
@@ -767,10 +769,10 @@
}
#endregion
+ #region pcs骞抽潰鍥惧簱浣嶄俊鎭�
[HttpPost("dt_stationinfolist")]
- public WebResponseContent dt_stationinfolist()
+ public IActionResult dt_stationinfolist()
{
- WebResponseContent content = new WebResponseContent();
VOLContext volContext = new VOLContext();
Idt_stationinfoRepository dsta = new dt_stationinfoRepository(volContext);
string[] stationCodes = { "W", "A", "B", "C", "D01" };
@@ -781,13 +783,11 @@
int inst = dsta.Find(_ => true).Where(a => a.stationCode.Contains(code)).GroupBy(a => a.line).Count();
responseData.Add(Tuple.Create(data, inst));
}
- content.Data = responseData;
- return content;
+ return Ok(responseData);
}
[HttpPost("pcs_dt_stationinfolist")]
- public WebResponseContent pcs_dt_stationinfolist()
+ public IActionResult pcs_dt_stationinfolist()
{
- WebResponseContent content = new WebResponseContent();
VOLContext volContext = new VOLContext();
Idt_stationinfoRepository dsta = new dt_stationinfoRepository(volContext);
string[] stationCodes = { "X01", "X02", "X03", "S", "DD001" };
@@ -797,8 +797,11 @@
var data = dsta.Find(_ => true).Where(a => a.stationCode.Contains(code)).OrderBy(a => a.stationCode).ToList();
responseData.Add(Tuple.Create(data));
}
- content.Data = responseData;
- return content;
+ return Ok(responseData);
}
+ #endregion
+
+
+
}
}
--
Gitblit v1.9.3