From 1c5acc17ce9d2f079ea9bc0b226665f1441631d7 Mon Sep 17 00:00:00 2001 From: wenjy Date: Sat, 1 Oct 2022 23:32:06 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E9=93=9D=E5=86=85=E8=83=86?= =?UTF-8?q?=E6=88=90=E5=9E=8B=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AluminumLinerkController.java | 2 +- .../mapper/DeviceFaultMapper.java | 7 +++++++ .../impl/MesProductionDataServiceImpl.java | 2 +- .../controller/AluminumLinerkController.class | Bin 6536 -> 6536 bytes .../impl/MesProductionDataServiceImpl.class | Bin 8338 -> 8371 bytes .../classes/static/js/aluminumLiner/index.js | 2 +- 6 files changed, 10 insertions(+), 3 deletions(-) diff --git a/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java b/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java index 274862d..c8df716 100644 --- a/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java +++ b/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java @@ -146,7 +146,7 @@ public class AluminumLinerkController { @ResponseBody public String getInventoryStatistics() { List mesMaterialStoreStatisticsList = - iMesProductionDataService.getMesMaterialStoreStatisticsList("L001"); + iMesProductionDataService.getMesMaterialStoreStatisticsList("1001"); return JSONArray.toJSONString(mesMaterialStoreStatisticsList); } diff --git a/productionboard/src/main/java/com/productionboard/mapper/DeviceFaultMapper.java b/productionboard/src/main/java/com/productionboard/mapper/DeviceFaultMapper.java index 62e8bb4..a11ee71 100644 --- a/productionboard/src/main/java/com/productionboard/mapper/DeviceFaultMapper.java +++ b/productionboard/src/main/java/com/productionboard/mapper/DeviceFaultMapper.java @@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.productionboard.entity.MesProduction.DeviceFault; import com.productionboard.entity.MesProduction.MesMaterialStoreStatistics; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; +import java.util.List; + /** * MES物料库存统计 * @author WenJY @@ -14,4 +17,8 @@ import org.springframework.stereotype.Repository; @Mapper @Repository public interface DeviceFaultMapper extends BaseMapper{ + + //select * from table ( scada_adsorb_fault(#{in_id}) ),DeviceFault + @Select("select NAME as STATION,VALUE from table ( scada_adsorb_fault(#{in_id}) )") + List selectScadaAdsorbFault(int in_id); } diff --git a/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java b/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java index 9de704d..e6011ce 100644 --- a/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java +++ b/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java @@ -162,7 +162,7 @@ public class MesProductionDataServiceImpl implements IMesProductionDataService { public List selectDeviceFaultByType(String type) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("TYPE",type); - return deviceFaultMapper.selectList(wrapper); + return deviceFaultMapper.selectScadaAdsorbFault(this.in_id); } @Override diff --git a/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class b/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class index c95d6eb5cc547eb75a1a35bb1d35a7d8bb155fbb..92648610868954354c489e308e32ba05dee21bc7 100644 GIT binary patch delta 14 VcmeA$?l9g^z|Cm5xsY3&4*(>a1SkLi delta 14 VcmeA$?l9g^z|H8hxsY3&4*(@S1VaD- diff --git a/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class index 693b5f6038715ff0aa3ebd6e40449ac0a35fe6a4..7577f4bd2bd137ff319c3e177fb92b31dca1c4b5 100644 GIT binary patch delta 572 zcmXAmOH5Ny5Qe|g7EXKbfCg)c7%#9QRb$%3#Elw@QXfQPqLDNjlUi8WL?igv7?-Z` zx-`b6uCDYxH@FaHv+)-VE*VXKn9G_g zrHeBDDF0Yo<(h@dbyK~e8PMERM7z(d=^Gc%L*DbUxcp|G=su7zH5esAN&-4@mrB} z2kf{zF5w#C4`T|I5XLDAe;E^n|58c?6qWA5sg+StK@~D65mjmgnxcDnk~1aj@24W7 zEM!y2KqemjO zI|%v)PB+ssom8!yUE$2?pt@=1QEL2ayYrlQox?hsCjQ4^H|tS^iLsMi1lZ{3<$uQ8 H>)3&R`ZbT` delta 504 zcmXAl$xjqf5Qo2-X?Q)|C1YT2tz$e95<_MZ!$}FCxIkh&7=>uOc+`^|^kVoM;Cb}m z(TfMu2`K8gAS$>63U1@R@3^2iqW!Qc`D*!9QmKkt`&)yt`Joc9Qo_FAVDGUEs~89w z~`^z!(}%!>N94zQr*&> ztV%54D%S!m*PVL9aMN&0$i+*g&GW_$6Y;L98Dl0Fl#<=CXt;Jlxy>EHD;5exWr}HA ztXaP4u5yq2h6l<+%E}{$#|~|*F+5S8y5gC`TG|cIl|8O_;qa1I$~x8?UMp`X+ru@T z&2M?9yyru*YfJa$cI6|Vlnrb&d{#Q>G<;EJC>zF=uY5C1D&P5`%<|JVW}Bj4%n4FZ zep6BYFsIDB?5|*ZvrB44QYs>86)(}Gii$m&&DT{Y$B0q!C8H8h5msAC=j<}CA&wR| zd-2}fNG8)mI&p|>OFkznY*)UaK4L4|7JeIXfb9rAb?jq5DRw4({ojd? { console.log(res) Res.data=res.map(val => { - return [val.spe,val.aq,val.oq,val.cha,val.round,] + return [val.spe,val.oq,val.aq,val.cha,val.round,] }) Res.header = ['型号', '计划数', '完成数', '差异数', '执行进度'] console.log(Res)