From 9e4dc525968e1739829a257bd713a8a51ac980d2 Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Fri, 30 Sep 2022 13:50:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=93=9D=E5=86=85?= =?UTF-8?q?=E8=83=86=E8=AE=BE=E5=A4=87=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AluminumTtankController.java | 13 ++++++++++--- .../MesHourProdutionStatisticsMapper.java | 2 ++ ...MesMaterialProductionStatisticsMapper.java | 2 ++ .../MesMaterialStoreStatisticsMapper.java | 2 ++ .../mapper/MesTeamStatisticsMapper.java | 2 ++ .../service/IMesProductionDataService.java | 2 ++ .../impl/MesProductionDataServiceImpl.java | 8 ++++++++ .../controller/AluminumTtankController.class | Bin 3948 -> 4203 bytes .../MesHourProdutionStatisticsMapper.class | Bin 469 -> 519 bytes ...esMaterialProductionStatisticsMapper.class | Bin 484 -> 534 bytes .../MesMaterialStoreStatisticsMapper.class | Bin 469 -> 519 bytes .../mapper/MesTeamStatisticsMapper.class | Bin 442 -> 492 bytes .../service/IMesProductionDataService.class | Bin 1216 -> 1457 bytes .../impl/MesProductionDataServiceImpl.class | Bin 5223 -> 5738 bytes .../impl/TankShellDeviceInfoServiceImpl.class | Bin 8937 -> 8937 bytes .../static/css/aluminumLiner/style.css | 9 ++++----- .../classes/static/js/aluminumLiner/index.js | 1 + .../static/js/common/echarts.common.js | 10 +++------- 18 files changed, 36 insertions(+), 15 deletions(-) diff --git a/productionboard/src/main/java/com/productionboard/controller/AluminumTtankController.java b/productionboard/src/main/java/com/productionboard/controller/AluminumTtankController.java index 4d9b9c4..fcbe050 100644 --- a/productionboard/src/main/java/com/productionboard/controller/AluminumTtankController.java +++ b/productionboard/src/main/java/com/productionboard/controller/AluminumTtankController.java @@ -95,12 +95,19 @@ public class AluminumTtankController { @GetMapping("/getMaterialStoreJson") @ResponseBody public String getMesMaterialStoreStatisticsJson(){ - List mesMaterialStoreStatisticsList = - - iMesProductionDataService.getMesMaterialStoreStatisticsList("L001"); + List list=new ArrayList(2); + list.add("L001"); + list.add("U001"); + List mesMaterialStoreStatisticsList + =new ArrayList<>(); + mesMaterialStoreStatisticsList.addAll( iMesProductionDataService.getMesMaterialStoreStatisticsList("L001")); + mesMaterialStoreStatisticsList.addAll( iMesProductionDataService.getMesMaterialStoreStatisticsList("U001")); +// = iMesProductionDataService.getMesMaterialStoreStatisticsListByList(list); return JSONArray.toJSONString(mesMaterialStoreStatisticsList); } + + /** * 根据型号统计产量 * diff --git a/productionboard/src/main/java/com/productionboard/mapper/MesHourProdutionStatisticsMapper.java b/productionboard/src/main/java/com/productionboard/mapper/MesHourProdutionStatisticsMapper.java index 416cbc7..0ff699b 100644 --- a/productionboard/src/main/java/com/productionboard/mapper/MesHourProdutionStatisticsMapper.java +++ b/productionboard/src/main/java/com/productionboard/mapper/MesHourProdutionStatisticsMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.productionboard.entity.MesProduction.MesHourProdutionStatistics; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; +import org.springframework.stereotype.Repository; import java.util.List; @@ -12,6 +13,7 @@ import java.util.List; * @date 2022年06月09日 16:45 */ @Mapper +@Repository public interface MesHourProdutionStatisticsMapper extends BaseMapper { } diff --git a/productionboard/src/main/java/com/productionboard/mapper/MesMaterialProductionStatisticsMapper.java b/productionboard/src/main/java/com/productionboard/mapper/MesMaterialProductionStatisticsMapper.java index 7699b9d..7f95d62 100644 --- a/productionboard/src/main/java/com/productionboard/mapper/MesMaterialProductionStatisticsMapper.java +++ b/productionboard/src/main/java/com/productionboard/mapper/MesMaterialProductionStatisticsMapper.java @@ -3,11 +3,13 @@ package com.productionboard.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.productionboard.entity.MesProduction.MesMaterialProductionStatistics; import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; /** * @author WenJY * @date 2022年06月09日 17:02 */ @Mapper +@Repository public interface MesMaterialProductionStatisticsMapper extends BaseMapper { } diff --git a/productionboard/src/main/java/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.java b/productionboard/src/main/java/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.java index 801d9fa..c821cfc 100644 --- a/productionboard/src/main/java/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.java +++ b/productionboard/src/main/java/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.java @@ -3,6 +3,7 @@ package com.productionboard.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.productionboard.entity.MesProduction.MesMaterialStoreStatistics; import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; /** * MES物料库存统计 @@ -10,5 +11,6 @@ import org.apache.ibatis.annotations.Mapper; * @date 2022年06月09日 17:14 */ @Mapper +@Repository public interface MesMaterialStoreStatisticsMapper extends BaseMapper{ } diff --git a/productionboard/src/main/java/com/productionboard/mapper/MesTeamStatisticsMapper.java b/productionboard/src/main/java/com/productionboard/mapper/MesTeamStatisticsMapper.java index f91f26c..57187da 100644 --- a/productionboard/src/main/java/com/productionboard/mapper/MesTeamStatisticsMapper.java +++ b/productionboard/src/main/java/com/productionboard/mapper/MesTeamStatisticsMapper.java @@ -3,6 +3,7 @@ package com.productionboard.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.productionboard.entity.MesProduction.MesTeamStatistics; import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; /** * Mes班组生产统计 @@ -10,5 +11,6 @@ import org.apache.ibatis.annotations.Mapper; * @date 2022年06月09日 16:26 */ @Mapper +@Repository public interface MesTeamStatisticsMapper extends BaseMapper { } diff --git a/productionboard/src/main/java/com/productionboard/service/IMesProductionDataService.java b/productionboard/src/main/java/com/productionboard/service/IMesProductionDataService.java index b856ed6..4dd5a41 100644 --- a/productionboard/src/main/java/com/productionboard/service/IMesProductionDataService.java +++ b/productionboard/src/main/java/com/productionboard/service/IMesProductionDataService.java @@ -51,4 +51,6 @@ public interface IMesProductionDataService { List selectDeviceFaultByType(String type); List getProductionPlan(); + + List getMesMaterialStoreStatisticsListByList(List list); } 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 b487858..dec28ed 100644 --- a/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java +++ b/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java @@ -93,6 +93,14 @@ public class MesProductionDataServiceImpl implements IMesProductionDataService { return mesMaterialStoreStatistics; } + @Override + public List getMesMaterialStoreStatisticsListByList(List list) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.in("POSIONID",list); + List mesMaterialStoreStatistics = materialStoreStatisticsMapper.selectList(wrapper); + return mesMaterialStoreStatistics; + } + @Override public List selectDeviceFaultByType(String type) { QueryWrapper wrapper = new QueryWrapper<>(); diff --git a/productionboard/target/classes/com/productionboard/controller/AluminumTtankController.class b/productionboard/target/classes/com/productionboard/controller/AluminumTtankController.class index 18b4c8fdddae0987517eae283b5775be15cfb085..e148cac37efeebfafce2acd84b2a0bcdbb32352f 100644 GIT binary patch delta 1387 zcmaJ=OHUI~7(I8|>9l1avB+DY2-QANK=D~Y5#JVhgQzIwArvYotq*ij6P1lCGHVm# z!nFnsqK1_#_x=PEjs5~+jOWgb1%;SN?)~29JKz20NBMVu=F_it%K#d1--}YTx^dov z612&q-HnbMbfPN<-RO}=uNQr|prPLjFIuJVqJ~Re0X2zb63PruAP{`zoE zLqf*{CN+%fNaDJVDNJj)q2nfI1P&SX&Kl#HlBeoOVbWM}RRq$Q)KQ6B0?t@nUA>Om zxI?+ellSy*7 zqfBxw)5#>m64O(RBxVVp0Z{mn1_ZWJbMY=Wt>nksO`VK+R#7|1Siw6dya*BYDR1C- zMO8sHPcLt8EHsX5GfGkvK1=xjjRGVGnm#!tb@2b>27&knv(C%f)8$7HeFltoo>=pR&Ri4s+g@NYhcZJfsJIG2eaF=FqL+pjKS zQ!L{1Eg@gYpfBRvEG6_w-y-r_Ys{I`U7%nIh4fe!hOJuO!Xw|;VQxq{G|EHpV3@6p zaP3C<+G8B(I8O1ukscPNS+-nVzM7j$K(h8v6}poUT^@ delta 1112 zcmaKq+fEZv6o&sjGi9dJDM(eIpk+V~+M&M}%4g6_1IaciIah7v9dL z@eR13sm4>{l~+E1Z(yR)CosnN@0n=@tY(t6XYIY#`u?@|`euKRO?~|J_C0_kZkeb< z+Q5+@)?!GSqXv$Jkiqc~PT-_8r%ViEM8|0pCere3RL2<;VVQVV`sWOsm+J)s7Y&T* zxTIse@F1&*iQ*^ahfrd-oq`s1?x=&#UCnUbX*I>UK%Y?8Bjzkt)hC;<&O$vJ1cG0k z=bz`Fe0e;tBWvL@aylj~OyY`#DNO6QYT+8L3#6Q$K$p|0uTp1_b5eS9%?;!Pv`lw* zkA<7a6(8vhnzNwA@|l_0Ikd31I`*vaBMAagdR1H--CauHYS5=B+Gcuvj1^o%@mCP> zi1HF@!40-)O&)?pG={hE&+c7(Yd zJlQe^F-v*fE~m%m+zQTIN)?rO`_0D4zY<<3r0{q^4EgwLO)V@JPK_>AU!MuD8 z)qM?5#UxcsQN{E>RHXh=k;3kZD*AmD17#HhjFTz?k=2=mHwJG1-Xz_lj)zOArCCs! zvxmc3snfkaV_yZvni9h%(nCBY;@L99kT diff --git a/productionboard/target/classes/com/productionboard/mapper/MesHourProdutionStatisticsMapper.class b/productionboard/target/classes/com/productionboard/mapper/MesHourProdutionStatisticsMapper.class index 7b483c7c5cc607dbb93c6f4faf2e2ca5c88f596e..a9b412424f5a13379768ce731e3247c4979dd8f0 100644 GIT binary patch delta 88 zcmcc0+|D9=>ff$?3=9k=41DYi-0TcI>)wSDr7()EiAiZb)k(~1&vQ_J&< rvh|BgQj1daODYRe^@CCi@{2P|@{1}bt1_ff$?3=9k=47}_NTIbD30M!@=<^TWy diff --git a/productionboard/target/classes/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.class b/productionboard/target/classes/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.class index 35b6a30db1c5cd9586243e389a19fdcc541bc8b2..a3f5db5bf4a3ba2aed2a6980318574bfdaced3d3 100644 GIT binary patch delta 88 zcmcc0+|D9=>ff$?3=9k=41DYi-0TcI>)wSDr7()EiAiZb)k(~1&vQ_J&< rvh|BgQj1daODYRe^@CCi@{2P|@{1}bt1_ff$?3=9k=47}_NTIbD30NCpX%K!iX diff --git a/productionboard/target/classes/com/productionboard/service/IMesProductionDataService.class b/productionboard/target/classes/com/productionboard/service/IMesProductionDataService.class index 3b792d256ca0aa3a823c30aede33c183a98d5c29..9f88eb822accce50e10a688cae892c02f73bebb8 100644 GIT binary patch delta 161 zcmX@WxshAo)W2Q(7#J8#7-ZQQq}dr{HVX7GGpbLPU{aKHs`SY$E@5O)((uVjEKAfc zEy>K$2MJAd5Yb`D0n62*%h^EG<|O8&>j#$}}kVnZfW delta 54 zcmdnUeSlNo)W2Q(7#J8#7$n&l#Mv1nHVX7GPcC9NHT>9vx3L_> z^BzR79K%h2<&1({GL3vCXK6+;Yba)3F4&{;tXf_OSe2A; z@^PhTX$5srD{EO@y;Ce2LbOpVOSq9T%vHHuGPUCBim4RTEyLW9v#L@o%PUIGGR&&1 z)E3BhDweUOnQES5Pp=sjb6$WEvixXown6(KY&qqhFDRC3YKm^_unqPrnQWtEwyg|d ziKi(;dsV-Zc9wWb0+&;Me_q|xa_T*$qFbIXuY>`gZk|sey(L{K&J{+AAz>h8f|fTba-o_PtSaf1vYex{`6%W!n+)=c zippqzB%Vvoa_Z|ZH1kSApC8t-?b}u@d0Y3=-m^EcfVPd6dm zv%tPt)mk(1^NPq7q$i`|P)1uVDptj0^kjG7#64p;=LAuU{NY5?DY~u21PMPKoKIR{ zu${BCC+CDo-q?3HglW5IpCL*~$*nO9*!*fZGs<#C)zzHfZr7%wR~RLbaMAIhmpSV> zqn>>oN1mZ0!)8hN`QW@62E=yh@}6AUR(xsS{n}QgOEzy_(-BuETZ;(?O12gl_JM3+ zlJ}o%VcITjCr*GrCaaED&bz@z<(icbW%ezgJ$` z#^3iL*@efqN$Sb)PQXH06P4&W7K(MFn`+4`B0ePy1zumuEKF2GLJi#ku$BfR6<1Mz4Jz6 z7&{V^4GedC+_Iaj9`@iB#hxQI_$;2uAw+q@(LZZV*{O| zf1+z?3Pv0ut^$hVn7|d|UVVTM?OloB zDn6o|Ym{@0J16E3i*u6I@_X+5$&NMwByutlV~T1_SP=Y zCIirpyJ(Y?7=U)d4uxJ~zQy0|XOPOc!?(#D?RO6?hzD8lkQSt9!7MFE@4|wq01KvF z3#M>4$bx%Bdw)l06GZz~5Zb3i`;2IpiT3#}&^`!2JL95#fX{=_J|x-{x5bI&U)cu4 za<7QxmT0p?n{X^(4|7C8I` z7C9u6%5%06wntn{DemFG=xZEl#3H`s0xu}lv~dVlbBT*1hPbVrUv1gzXcs+8ROFER QOU{47u?U{la_BSQeny>26wWFd=w@4kEQyXV}~xBEx(d-KYd-=B5>wBuC>F-+>1 z3PHo9fm?E)-iIh|o0!3@wB}6Qajm;1?zz@|6Z4ogupko_O+0Yj4^2G6td7SzmUJu& z#MYd?imHuw{?O)ovs()u!*PKw=WC!VBVc4R1^g4!*+B~pIIJUQ;RufESQF@R`a&^hCv0ry!oP$_s$*|NcUHAZ z=UXI|kFrsLDg@aefoSii0zvKvxN8!x#7FEBA9qTxKN zTp*%fk!ll7&bnQbm(>3cv$G6lmxtMj?jlSD*`wZDn7|kLT$+K%p_f*ls||CUw{~ql zM0w0|@{F*xQOYyMrqg?nr@su<%O2H!3=~my@KV<<3)}1q!sN#A$Hv z7iK3;@!Z*odb1-ZMh>dMKS7GJYJcZslz|RKD$Q^PS%x_HuQ5kMV<76W8YP*^mTlO( s$;clOu*9;7{-6Ew$(^k4rQ@Z><;Z>m{V#k8JUt#sk1n;un= zUWVu|e%q~OJ0UC#XmOBQ!nic>GOTxmC=pVOvcVVy#(7ugg9(0^Mq5X=6_OB&3g|gqfEJ3le2fVx%NVTGA{@hOA`C$Qmn>x3DTltQR*M|HPcr$=k-3 zbJ?7yoP*+*QzTGO)1aDT8aUB$r}#M2FV1!D1#vFPa>btVA=jGRaI1Rc&S-Lf+U~Xe XK#j7C7n*rBte%|ti7K9reNW;aN*6-F delta 319 zcmWNMTPwo>7{-6EHieYsa4~Eqc4IfUHIAh%K^`Dq`v~tqe zvM-wtDI}HsvWs|5^m$4tXH;>nzWh;z%Ha*8{3+^as2=FzBgd|J|) Zexi(Lo%TjO8Ka { dataType: 'JSON', success: function (res) { let Res = {} + console.log(res) Res.data=res.map(val => { return [val.spe,val.aq,val.oq,val.cha,val.round,] diff --git a/productionboard/target/classes/static/js/common/echarts.common.js b/productionboard/target/classes/static/js/common/echarts.common.js index 10fb100..8cf5959 100644 --- a/productionboard/target/classes/static/js/common/echarts.common.js +++ b/productionboard/target/classes/static/js/common/echarts.common.js @@ -16,7 +16,7 @@ const horizontalBarChart = (res, ids) => { const xValue = res.map(val => val.xValue) const yValue = res.map(val => val.yValue) - //参考：https://www.makeapie.com/editor.html?c=xqjNqqjc_U + let seriesName = "产量"; let attackSourcesColor = [ @@ -54,10 +54,7 @@ const horizontalBarChart = (res, ids) => { let stationData = []; let values = []; - // res.forEach(function (it, index) { - // stationData.push(it.station); - // values.push(it.value); - // }); + function dataFormat(data) { let arr = []; @@ -82,7 +79,7 @@ const horizontalBarChart = (res, ids) => { }, grid: { top: "9%", - left: "-9%", + left: "-30%", right: "4%", bottom: "3%", containLabel: true, @@ -344,7 +341,6 @@ const threeDimensionalCylindrical = (res, ids) => { let mycharts = echarts.init(ids); const xValue = res.map(val => val.materialName) const yValue = res.map(val => val.lineStoreAmount) - let barTopColor = ["#02c3f1"]; let barBottomColor = [ "rgba(2,195,241,0.1)",