From cea7eb24501484f9a9e54ecbd882e9a3a6250d1f Mon Sep 17 00:00:00 2001 From: dengjunjie <dengjunjie@hnkhzn.com> Date: 星期五, 28 六月 2024 07:21:33 +0800 Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/SuZhouGuanHong/TaiYuanTaiZhong --- 代码管理/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs | 12 ++++-------- 1 files changed, 4 insertions(+), 8 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..8d2e5af 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" @@ -768,9 +768,8 @@ #endregion [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 +780,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 +794,7 @@ 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); } } } -- Gitblit v1.9.3