分支自 SuZhouGuanHong/TaiYuanTaiZhong

huanghongfeng
2024-06-26 2d5a73f505946e0101f0fdd06fc3f3a94794236d
更改
已修改2个文件
41 ■■■■■ 文件已修改
代码管理/PCS/WCS_Client/src/views/Home.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
´úÂë¹ÜÀí/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];
´úÂë¹ÜÀí/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;
        }
    }
}