From 2d5a73f505946e0101f0fdd06fc3f3a94794236d Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期三, 26 六月 2024 15:49:47 +0800
Subject: [PATCH] 更改
---
代码管理/PCS/WCS_Client/src/views/Home.vue | 5 ++---
代码管理/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+), 3 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Home.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Home.vue"
index c435074..b70ffed 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Home.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Home.vue"
@@ -83,7 +83,6 @@
dataxlist: [],
item1: [],
ddataList: [],
- url: "http://192.168.12.101:8098/api/",
plcList_one:[],
plcList_two:[],
plcList_three:[],
@@ -132,7 +131,7 @@
//鑾峰彇搴撳尯鐨勬暟鎹�
selList() {
this.loading = true;
- axios.post(this.url + "dt_stationinfo/dt_stationinfolist").then(x => {
+ this.http.post('api/Readplc/dt_stationinfolist').then(x => {
this.datalist = x.data.data;
for (var i = 0; i < x.data.data[1].item1.length; i++) {
this.ddataList[i] = x.data.data[1].item1[i];
@@ -145,7 +144,7 @@
//鑾峰彇涓嬫枡鍙ｇ殑鏁版嵁
selListxl() {
this.loading = true;
- axios.post(this.url + "dt_stationinfo/pcs_dt_stationinfolist").then(x => {
+ this.http.post('api/Readplc/pcs_dt_stationinfolist').then(x => {
this.dataxlist = x.data.data;
this.item1 = x.data.data[4].item1[0];
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 34252f0..3fc2ea7 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"
@@ -6,6 +6,8 @@
using WIDESEA_Comm;
using WIDESEA_Core.EFDbContext;
using WIDESEA_Core.Extensions;
+using WIDESEA_Core.Utilities;
+using WIDESEA_Entity.DomainModels;
using WIDESEA_WCS.IRepositories;
using WIDESEA_WCS.Repositories;
using WIDESEA_WMS.IRepositories;
@@ -764,5 +766,39 @@
return Ok(dataList);
}
#endregion
+
+ [HttpPost("dt_stationinfolist")]
+ public WebResponseContent dt_stationinfolist()
+ {
+ WebResponseContent content = new WebResponseContent();
+ VOLContext volContext = new VOLContext();
+ Idt_stationinfoRepository dsta = new dt_stationinfoRepository(volContext);
+ string[] stationCodes = { "W", "A", "B", "C", "D01" };
+ List<Tuple<List<dt_stationinfo>, int>> responseData = new List<Tuple<List<dt_stationinfo>, int>>();
+ foreach (string code in stationCodes)
+ {
+ var data = dsta.Find(_ => true).Where(a => a.stationCode.Contains(code)).OrderBy(a => a.stationCode).ToList();
+ 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;
+ }
+ [HttpPost("pcs_dt_stationinfolist")]
+ public WebResponseContent 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" };
+ List<Tuple<List<dt_stationinfo>>> responseData = new List<Tuple<List<dt_stationinfo>>>();
+ foreach (string code in stationCodes)
+ {
+ 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;
+ }
}
}
--
Gitblit v1.9.3