From aca7521ccd4062632a3f42d7fa39d1a621e388ca Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Fri, 14 Oct 2022 15:53:01 +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/AluminumLinerkController.java | 2 +- .../controller/PreassembleController.java | 2 +- .../controller/TankShellController.java | 16 ++++++++--- .../entity/MesProduction/DeviceFault.java | 3 ++- .../MesMaterialStoreStatisticsMapper.java | 4 +++ .../impl/MesProductionDataServiceImpl.java | 9 ++++--- .../static/js/common/echarts.common.js | 2 +- .../main/resources/static/js/foamBox/index.js | 2 +- .../resources/static/js/tankShell/index.js | 2 +- .../controller/AluminumLinerkController.class | Bin 6536 -> 6513 bytes .../controller/AluminumTtankController.class | Bin 4166 -> 3923 bytes .../controller/PreassembleController.class | Bin 4649 -> 4695 bytes .../controller/TankShellController.class | Bin 3549 -> 3367 bytes .../MesProduction/MesTeamStatistics.class | Bin 3788 -> 3876 bytes .../MesMaterialStoreStatisticsMapper.class | Bin 2137 -> 2370 bytes .../impl/MesProductionDataServiceImpl.class | Bin 10214 -> 9857 bytes .../static/js/common/echarts.common.js | 25 +++++++++++++----- .../target/classes/static/js/foamBox/index.js | 2 +- .../classes/static/js/tankShell/index.js | 2 +- 19 files changed, 49 insertions(+), 22 deletions(-) diff --git a/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java b/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java index cbcf824..fa5661c 100644 --- a/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java +++ b/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java @@ -131,7 +131,7 @@ public class AluminumLinerkController { @GetMapping("/getStatisticalOutputByModel") @ResponseBody public String getStatisticalOutputByModel() { - List list=iMesProductionDataService.selectDeviceFaultByType("1#内胆吸附机"); + List list=iMesProductionDataService.selectDeviceFaultByType("1005"); return JSONArray.toJSONString(list); } diff --git a/productionboard/src/main/java/com/productionboard/controller/PreassembleController.java b/productionboard/src/main/java/com/productionboard/controller/PreassembleController.java index 7f9506b..878cb92 100644 --- a/productionboard/src/main/java/com/productionboard/controller/PreassembleController.java +++ b/productionboard/src/main/java/com/productionboard/controller/PreassembleController.java @@ -50,7 +50,7 @@ public class PreassembleController { mesTeamStatistics.setClassName("白班"); int planAmount = Integer.parseInt(mesTeamStatistics.getPlanAmount() == null ? "0" : mesTeamStatistics.getPlanAmount()); int actualAmount= Integer.parseInt(mesTeamStatistics.getActualAmount() == null ? "0" : mesTeamStatistics.getActualAmount()); - mesTeamStatistics.setDifferenceAmount((planAmount - actualAmount)+""); + mesTeamStatistics.setDifferenceAmount(Math.abs(planAmount - actualAmount)+""); return JSONArray.toJSONString(mesTeamStatistics); } return JSONArray.toJSONString(new MesTeamStatistics()); diff --git a/productionboard/src/main/java/com/productionboard/controller/TankShellController.java b/productionboard/src/main/java/com/productionboard/controller/TankShellController.java index d653b32..3d9ea0c 100644 --- a/productionboard/src/main/java/com/productionboard/controller/TankShellController.java +++ b/productionboard/src/main/java/com/productionboard/controller/TankShellController.java @@ -32,7 +32,15 @@ public class TankShellController { public String index() { return prefix; } - +/** + * 工位号9.30前记录为 + * 1001 吸附内胆生产 + * 1003 铝内胆生产 + * 1004 吸附内胆预装北 + * 1005 铝内胆预装 + * Proce_Code =1029 发泡前出库南线 + * Proce_Code =1012 发泡前出库北线 + */ /** * 班组统计 * @author WenJY @@ -90,9 +98,9 @@ public class TankShellController { @GetMapping("/getMaterialStoreJson") @ResponseBody public String getMesMaterialStoreStatisticsJson(){ - List list=new ArrayList(2); - list.add("L001"); - list.add("U001"); +// List list=new ArrayList(2); +// list.add("L001"); +// list.add("U001"); // List mesMaterialStoreStatisticsList= iMesProductionDataService.getMesMaterialStoreStatisticsListByList(list); List mesMaterialStoreStatisticsList= iMesProductionDataService.getMesMaterialStoreStatisticsList("1009"); return JSONArray.toJSONString(mesMaterialStoreStatisticsList); diff --git a/productionboard/src/main/java/com/productionboard/entity/MesProduction/DeviceFault.java b/productionboard/src/main/java/com/productionboard/entity/MesProduction/DeviceFault.java index fdbcaa2..809b9b3 100644 --- a/productionboard/src/main/java/com/productionboard/entity/MesProduction/DeviceFault.java +++ b/productionboard/src/main/java/com/productionboard/entity/MesProduction/DeviceFault.java @@ -28,8 +28,9 @@ public class DeviceFault implements Serializable { private String value; /** 类型 */ - @TableField("TYPE") + @TableField("NAME") private String hullStoreAmount; + private String name; } diff --git a/productionboard/src/main/java/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.java b/productionboard/src/main/java/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.java index 1ef86d8..461c242 100644 --- a/productionboard/src/main/java/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.java +++ b/productionboard/src/main/java/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.java @@ -1,6 +1,7 @@ package com.productionboard.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.productionboard.entity.MesProduction.DeviceFault; import com.productionboard.entity.MesProduction.MesMaterialStoreStatistics; import com.productionboard.entity.MesProduction.MesTeamStatistics; import org.apache.ibatis.annotations.Mapper; @@ -67,5 +68,8 @@ public interface MesMaterialStoreStatisticsMapper extends BaseMapper getAdsorptionTankStoreStatistics4(@Param("in_id") Integer in_id); + @Select("select * from table ( scada_adsorb_fault(#{in_id}) )") + List selectDeviceFaultByType1005(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 9286e42..81e6b97 100644 --- a/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java +++ b/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java @@ -180,7 +180,10 @@ public class MesProductionDataServiceImpl implements IMesProductionDataService { mesMaterialStoreStatistics = materialStoreStatisticsMapper.getAdsorptionTankStoreStatistics6(this.in_id); break; case "1009": - mesMaterialStoreStatistics = materialStoreStatisticsMapper.getAdsorptionTankStoreStatistics9(this.in_id); +// mesMaterialStoreStatistics = materialStoreStatisticsMapper.getAdsorptionTankStoreStatistics9(this.in_id); + +//wh 跟铝内胆生产数据监控 看板查一样的两个仓库 + mesMaterialStoreStatistics = materialStoreStatisticsMapper.getAdsorptionTankStoreStatistics6(this.in_id); break; case "1010": mesMaterialStoreStatistics = materialStoreStatisticsMapper.getAdsorptionTankStoreStatistics10(this.in_id); @@ -202,9 +205,7 @@ public class MesProductionDataServiceImpl implements IMesProductionDataService { @Override public List selectDeviceFaultByType(String type) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("TYPE",type); - return deviceFaultMapper.selectScadaAdsorbFault(this.in_id); + return materialStoreStatisticsMapper.selectDeviceFaultByType1005(this.in_id); } @Override diff --git a/productionboard/src/main/resources/static/js/common/echarts.common.js b/productionboard/src/main/resources/static/js/common/echarts.common.js index 34fd12f..7c75747 100644 --- a/productionboard/src/main/resources/static/js/common/echarts.common.js +++ b/productionboard/src/main/resources/static/js/common/echarts.common.js @@ -2151,7 +2151,7 @@ const equipmentFailure = (res, ids) => { res.forEach(function (it, index) { - stationData.push(it.station); + stationData.push(it.name); values.push(it.value); }); let option = { diff --git a/productionboard/src/main/resources/static/js/foamBox/index.js b/productionboard/src/main/resources/static/js/foamBox/index.js index 534791c..a920f1b 100644 --- a/productionboard/src/main/resources/static/js/foamBox/index.js +++ b/productionboard/src/main/resources/static/js/foamBox/index.js @@ -2,7 +2,7 @@ $(() => { //班组计划统计 $.getJSON(`/foamBox/getTeamStatisticsJson?ids=${ids}`, function (result) { - onDutyPlan(result.planAmount, result.actualAmount, result.differenceAmount,) + onDutyPlan(result.planAmount, result.actualAmount, result.planAmount- result.actualAmount) }); //设备运行状态 diff --git a/productionboard/src/main/resources/static/js/tankShell/index.js b/productionboard/src/main/resources/static/js/tankShell/index.js index 7ba7fed..f8b2819 100644 --- a/productionboard/src/main/resources/static/js/tankShell/index.js +++ b/productionboard/src/main/resources/static/js/tankShell/index.js @@ -2,7 +2,7 @@ $(()=>{ //班组统计 // onDutyPlan(1234,1202,33); $.getJSON('/tankShell/getTeamStatisticsJson', function (result) { - storageStatistics(result.className, result.planAmount, result.actualAmount, result.differenceAmount,) + storageStatistics('白班', result.planAmount, result.actualAmount, result.differenceAmount,) }); //按型号统计产量 diff --git a/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class b/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class index 93b5e6ac71730df47921e6ff7f175a8b5be4b94d..b45c2b635fb8873cb4852297b3679266c5405153 100644 GIT binary patch delta 1883 zcmZ`(X;@Tc6n^gvaL3ChTxNiWGzAm`hfxqD4JyG*5+R~YB2q-5#4HR3$`(gkT-vOz z+NQRzT0#(rlx1a$S+?4~FV@qq{`tdtde5E90FU(N-0z(4ob$f#`OeJ7{J--;hyLBS zAHa0{VPFc{J-Buh0=Q1cY7eeA5QQ7WzfsIhu~>spEY@P3n487iqT^NrqowdR`K}kU zLCi+E-ell*+#z*$in+^6C`&H3h`UwCf^7!Ipxp}%4+_RZ9y}b2?bsn^rBR-I?O)o+Xq^`KW_ub4hD z`_QlB6@^!^U!fAk3a_CA0u*G(LV*YSplW`#HLmcl{2 zt?-WI`&QJq*XOhan^xwOw6xT(E^lfLvgBP8?@8_C&f5<-o-M`hoLRB=K3b*6fqVDH*G4rro%uM&ZMW9 z0i@t8oXxL>Stuq}p|#VOoG&$k1#%h8jdpSen3ULcvz@wQzNK1`RhF0&k_tbureGY- z!5nr4s+?K_r8pOJ*}IbQQYv)eJl+eN@ZCI~${6uLJApDC^KIo`=9TcKycSw3DsVnC zq=(I!=jrr>ui@{ujwgd0CaILH@AwDht!QLW=i1)S*AJcS7EAbUBe7WOuvivhQNui85iczIkj|YG4j~~C<`AC3c20N4 z5d8Sa%S5AL7{0-|G@x-r{L2O3G~}OvsD;F6BZ~Z5Gy5^2rWX?{0^W@59;8m{!D-b2 zZzj)Ka`XrK;B%q6lesPwS({SE+Ix}~uC{lASI9&YRuJ36-MtbknR^wZqgZL0Xfk2C zN#*hK>s@ qkv(XoA7oPa_uPhG=o|EZ!f*H)r{He-vca24=pNjQ`<&DLc;G)cr54Bl delta 1997 zcmZ`(X;@Tc6n^gv!yPW4G7Otp1Oy5qIIO8@3zV4(nJuDW;v|@u3JrroWmBnWyLHvF zuzj~kMcFLdH(Sg$+o-HGspn~V`fEMCXYMdU(vN%YIp_P%dEc|#`)9%W!oa?NdiDY+ z!Y>BKVWksIQOHHJj%%H`&OijN7kib68=?`wjnTLXH;Y&;VvUZq28Kysi@eu~STEuh zIlk4vZMa?H?htXOn@}6&V3U}ebu7Hsz(}lgL&N=o@qiPp(b$Ryop?yz4~uw2$D;<) z1>`XUkK+k3o^+yIjHe7djc0`Ev!ZR&@tlt5HAL3?Y8KTtX>gl=xZ-#GHOa2EwR<9d zb=W833^UmnVfP@RPs9rf<1s;@7^myluCN0;b+jq8W0%5ibSQM9L&H=vKdQj& zGENS3p6<)?G3KyY7;Z^L^;3}=F^Edc?-um(y|KhsphL}ja=ECbS zI^J-hUg1r=rSLZ1QFvGG$1U-$@Om2kwM#uEKA*R_thT|=kbN$^CwJdh$VY*O*!-OI z!!2u%u5LNJp{sApnj@_}IzCYN5c@Sm+IosfXzB7&C z+w@#~uVG4-dB9%S{`>G|o9mFm4>+PwCuJ>0t=SY?tQ|GmV*4WcG>kIS+)3t6cfpKY zE*Us08`ynnHYth2FQgvHcTv#CIh^3*fOr;7Kj%j|$@IjH2~4JMIP8=u%$f!RSvZrH z;tgN~&cfMzYd8lb#F|9iLrcya*}GuhPQ?aEBH&0(Y;wp&GS0&k9s;vMDGW@-`Fu3Yr2hg|Zo@R53rp*4I<*<}IH4WGbRA{E zj<|WRlqcnt&>C>jrcoHpEH6!4Aog`@3Ly=F=lPG`QncA&>>(x~rI7 z^2c&9lijJ^NVB1AY!~8Xqyc+yORZJk$Zg$37MuTvh4%y&UR*gOi-jQ;)nOLWEnyKO zEV^-;W^o7z35$c(g;sWV>j3q)`?=s|%K~!1kMxw~)oVf?- zb32hyp5q=hwgZ9D9muT6ac5BCxh$`Q05E( zx0*5^E>sO@O8;tbs06%*fCA&t1cE#6qhTZ4{_XJ7ZsaBFb6ERSL-t-$uHq#|Z=yUI^tPN)tu=V>-q)B$tZ;WEE?_T^TzUZFOk$$aOmj|S0T-~jvr zjzm1(tz*`}9i(;47`Tf$1NV^8F>l~L9+*FzgKZCy7N~uc*~rA6u4k8HL#wNqXQ}Mk zx`73x4J;y^d#nc>=37teCJwQ(I##Ukp$Y`*xpVRzu&k8l+r>SBxHfawOJBjaC;R~- z>{E82Zd=YRT-`hbgB&=>2QX|`geV1mx1x<6GEEF3X&q|e_fWTJQ6Mu&anNfoTFXZl z(As$}&|zmXcZ|MG8Rw%W5T{~-rF1f;%gW)mh$8tM25pCNgz-n|E$M8_F@A+x4B_-aJNsQZ5{y&XD XOGCjqk}I5)LcfQ(m%oEOX(N9CYSwLe delta 1410 zcma)4Nlz1D7=FHK%XAq~i>xA60R>uZtBA@Xs|#9`y>5tw7MwB^ffgkmdhudBnfV8v zJZdmOH1X)ct5^SnHxI@bpKn@fBOJ^m-@N_Rne z$mgaLBOZ)m%!6@E$Y;`xDMVG=a>I>?^xal*$BojQa#u?CoS2re_nnxL5f7vib7Izs zITdjg34t1YII%Xex*X5EO^z#Ke)E&^Q@HGgzLplKUor!p!>t01kz{N=7R;n|BN(Bp zE2kT=)IxAPy{e}cIxlt#M9pcXd$Y2iqG83St zv=$1zV5S5$E48r2!Ao>mUqc8L2$SO(t6ZfO=FgYY*n=MdmO9C3$unm;MJY%NyZZ&7 z${G^b%iI=v!gnFoaGDh*iM9fX=Q$GQXDwiHsDy(NJ#43!b^FMppOYLc;?Y##QG>Jp z@Q{}FVji`7^Ej91alXJ~28#Kkw9L$wmRUT?U?Y!F@)#qJi6Z<11$+lC{DUto9mL<= zd1oH6tAO~L2oj^?BT8>Owy;0q_a4}WSIHvk_m)cuQR&-4*>Hf%wtF4hIH+J774!t& z!zH(Gv$kJLqQER%nB&OfJiP?%3miw%qVCH<<*B>4+-{3{1FCS5l431WF4~2xboQ`| zoU@n4-Tn0C`{^(A)6EQdP7ZHn#Q*m$bBDb_{AWc&+__B~QwDfY#Usn^T+3h{664i>V(dU%wjdN-A#nv)twzh`%?{CUjkI!id;Jg6#;Q{Q diff --git a/productionboard/target/classes/com/productionboard/controller/PreassembleController.class b/productionboard/target/classes/com/productionboard/controller/PreassembleController.class index bbb34d68dee97d00039140ff9a0761cb009c661d..848fb81b5512c6499d9820db5aeafc58346c79e8 100644 GIT binary patch delta 1408 zcmaKr+jA6E5Qo3B7tUmJ49ThqxfDepU|^%0K)4776cC6c2t)-EAx_K^7M2Bf!^I0( zi8oNZj-p)j(JEgoBpN}gsPfe+dF9Q&!B?x$vd_-!W<|87>YP43bGpA@ch5I%x7!N8 z{PojKpqtAv<}>IpR7ES#+hwoAzG{Yfp&FMFyS%6wbx6giV!vI+91g@tbI=|RX)-Zt z8H{n5thJ6f9JTvPcFEaq@-fCaX01UR`M7T7M2u$tbke$Bc6i0%Rn2RfQ;Np4XR4dN z`{8OxPe^i2VJaK`I^46EC5pPExs;pFrw)%~Qpt37Gl+uID%xnKWEta;nx@8)>PT3ES_E zA5etdk-TuW_b%?8>NA^EvQ=6DA$ddriiL8TCHtbHSER}A$XV3On(%(Uucgo-zL?yA zMk37RVX=(7g=!ulDZ8SRF8LxMc2Z9EU3AI!gs+GZ!UnKOkfbx0qrv48!cuv!SXK(8 z=1a1u`06JlQY0R|&a4o9iR);^SGZoTW^?;B;?vw8e_)yir>UQ&VOPgB=3Kc!)t(<| zw59}z(Bb`7v!IY=1$kB#5xOPxJO*ScmkZz;@vdMcVYUn6DzPGRZz2FR%EJgM6#1JaadNzntv9Y97X2doG z7M6rIRS0zwzM^JP)Ka17*V)akEoQxcwanVclXtON&!&J?dV7Z^VXY(!z%~b9TgqU= z-mTh(La~V9Vi#+qMDUz+bGH;>uvkhTpsoxMrS~oX>v>85DvA-L+#00pE2kU^YEf6J z#oUZ7Mj+g$@P~1~5RCl?LI1x9`q_3*f~Nz5?LL9`ZC!oEz>kaGLPd_!%!Y+>hx{z} z(zG*(I8fHqBj4HnM&tAP5;MPqFXNn~`0^hqdi|g3|8hK2%n{;Qi5ilAlq$PR&buX> IKWTgZ2H4HaByw3`ui#(iH#+#MBhYoujRM21F32lcw|d#lML z>Z6GdCK?QG(LcZ^-{#dfU;GD*OFY&0cH2SBO{z|vs#Cx3oI3aa$_JIso3Afk19jXE zF^UG8&G}T&Xof8|TMO96_5yYgH$#)fPMhWs`6SG+%cdp7U$mOVZi_u32GC%JHk-X> zZa2d|v)vKmZ#s?DU@lEsbcHA{byxe1>wwKaHU}*ZS^WF>&Rd_=EqWG*dy@Y9{<-6s zpeXL>OvIDP#NMX1M6|WNIdM=kmT{WVj8Oz?W3f7mBbuW)7Tua-9M_!Sq+)vNU7#kl z%wO1~$b0|atM^wQYEE%lbB35g#VpQh&T(FI!8nHOjvt6e+v4pl(RE#&t?e!I_qVn+ zCptA3xun3%mo-<2X|8hG;+p0-0%B9B!b_A}+enoH(^E%v~cWWlz3V8t1*VFt{D@RM$fLa7>Tkk{QLb=jP*uFF)M zWeT#i50mjM6Q-Q{coctl6w9*|jeRMGdlZg&U4Oc_+~(XR1T8-ysQ-bWo)!HPtn>(0 zWeH}X55~Cm9~fhN@60e1t(oNBIp>~p-sjwVzP7wfl)n64`v{;1vnIA< z*uY2_Hb&(#W?(#m37m;w5@+Rd&O{#PbzCrEVpyJC)N#qg7SFgWJy#4&>A0%n+R8#n z5rx&y%1@!RJ#g|`+$pQ0&P>Q~UWFQ+HPv(;YClF2Xc1_9Tv=L}x;MAD*fqa2JNLvw z3~>uPuu~w^oyp{MOk22)qK<-v8z@=0iCa2uTPS13dEPLnR#0@lHN=cNC|bCS;%c-0 zLUF!_lU19Y0SZ6XgFq9l2JX$SmqOfi+9ct+i&l=Yf_o(O4kBeMZ=tTZ!L3|P9)f%! zw4#lFmKTcMXs0Ex2YVSI%XHBa7y`7^8>p}8QJCY2gK-<#nxDOn*1;%&eO@K!li6RD zc{VkHUMlvnku3FcZjC0FDDBs7GtG|X(;K5x@l=<|@T^94eSTEt doa8{)>$2a~P%yx%3Qh(0Fi3ld8Quh({sY=$V#5Fc delta 1180 zcmZvb%TE(g6vn@qc9=c}l*${#A|Q_zTLe+$C4%y>yhK1iD5b4XsI5XVZcJCMOx!ea z@4~ngg9(C(iCb6x1O5?ijWK?AW~dF2Cik9u?m6fC&AF%VD}Gj{zyCe_3ZNZN9Vo@H z4I_4xU{ox3Z3s9qhH)n*Fe#QP2kv27#eD}H7#4RkDrOzXHx6^cdSJu6h+VK@QA9kn zVM)cZilBt@*jRLXaw{3x38!Mo#9%1(F*zhlD|`F$Z%MJnW810B2WxG8U0@^hEacls z#p1pIo!!Pc9!jkFrc+z7#9CKx*WM3nKpLpV1qo+Tp~U9&dNdyQ#S)R|a}8BEub~X( z60EI$f2WF&hE;@BtZ0ZJs^JmVRIF==VIvdF>$7YkoOzp9=8hw*p&E~w81VaBH6)Ov zJ)_%C5Z?Qi_f9UbHjXsSO0a|?5edbaU$!D?A@j=W?hv%7Ve?AaRGB|AKtcsidE6^? zFX6bWJd>WQJ9B8S^3>4hUng2nK7X|>Q}gY*Y( zl{JK#i@6QF@hw8yhMyG$@fAav_DkOL>oSVdo5Rq4-l)j{1xVH4EOy-NpeU`{tJS${V1q{dwjk&U}v`qC%q`%LxVFvXajp?~Rqhjjn| diff --git a/productionboard/target/classes/com/productionboard/entity/MesProduction/MesTeamStatistics.class b/productionboard/target/classes/com/productionboard/entity/MesProduction/MesTeamStatistics.class index e18d73f20fd41d132df65beba434b1ca53686045..ef8ad203e5bd37aea1d2711767b35d7c76035a28 100644 GIT binary patch delta 185 zcmX>jyF||H)W2Q(7#J8#7;3l}q!kj3@&UL#8HIliCp?Y&VYYe9p6GIHpVN49M401r4 On}Lxb4u}IVPH^NV78(vNIHc_{AV2NeL;1$qN6aimK=$NhmKBqOSRit~$-;?qDTYA9D{=EY~G)M_ehW@TN?$jH8VBU>AzGz%kx6oWJa wGXopYfvk)S>_CbGh?y8kbW=d=)W2Q(7#J8#7?ju<5TPF)#oCyweYU diff --git a/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class index 7cfc6c1f918ece1d0c49bea975367fe9b0c98fa3..d1c8388d5590c4f3381c6a9ae7ba4a413e279bd3 100644 GIT binary patch delta 2618 zcmah~33O9c5WSNo`DyY=+q9+BE);xRe@zRAq|_wKth?`7wJiju&phT0_n zx=Dc>eK6C&^KRHM(~TGKq6@Qhe948`F3fSE(uKM4D8kDMuek9lUi08}yrJ->!dnXS z6y|G6l?My3P$8tSNTFJxMx(VJ)FJS;;$np*3hyW^b>Usjc+Z3P@qxmJ3dB1@<7R~~+{MH#x|6L2 zzI3Cf?z|_qxiC@3uN1ax=GQLlFz}7DPdUZn$Bl3Cor<$lqu(3YW#EUZi{%WveYb%< zRkIz#jjB6aREm40fgi2#hM+%TZrl)D9Ne1F%D2bFUhEUt{e^{o6Z`Q~(3zMWI16W+ zxDaIq4w(2EzZm${#BVrg;*i4c3iS$q;7=39C^7JtiNEzngF+)?0tFG9iT)U1NSujV z)MHn0C^!`iv4xlKZsI(gZ-~p3w0MoU6+8;2LJJ%WzLR)v7q29kk|;^0_;jfYP-;lB zDJeK;V7Do$(vn-{9MZ~^bU8-g4<7LPvrNg5Oo0@dk|o)uw3bX$a@1-gZG$tCGJUzy z&Xim^)|B=dJ5I8LYm%~)J5T}XXiA=RG9_QK1-&?7%B&=xgD>uDnG?J)?ODkP?l;p6 zs@Pr7QR7upS|!*5MeJt5nK0PR6qWWlESr<#xg2dOT{9omYUZOd&3pqfsF{yyH1&xE#X~ zhfAs|GTMm@4bI6tIiP7dbV8CNX=;tY6-;-rm?Lo|cYRf4van|qJy+9{4zmIM42(8# zjd=O-#bAE^k-vayvZ^`ga9~W$h)C{@Gm*Gr_JX6Iu}_ z*pBOtWMX;7N0_9+eFPIvc48uVBsb?V!K$a1Y_8{1J_IrW6KUPx#Eq&=(Ajzv35{!= zVG+tBVXy*W1=R`@QtKv)WP^)`K&izY7RmCAr$om7KYE`{f&_3k?%|I0uukWwos?CF_T`IkTuHvK zL#Gfrmgy$)YmjF{{{rP62R+0-D|rQ*Yb6iUDr8`_#Xa1PSyArD!o6h7lZsSK#(iX( z!AEyN=>wd|I@(s+{jszMVrh3VEpk%tWpcO?A7tV~QPFW4lWmN7qiWZnlMTw$W-$$4 zH)}0+EyI~nb^&;;evs%IhnxLjuJH(_Fkf$jWr*i}3)Du$Ddt-FvC0;(vQ+4Jp+Yt2 zEO-i2X%q^U!he!Io!=0;EQib2wGuAtM+n`@((M7YyEhGV51|JGOs~cXJsehCEoZvD z4n0|y6H^_j&JiJ;B`Y|IZn~KhnO) A!vFvP delta 2840 zcmaJ@3wTt;89o2L?#=FG2?#M;{0Xd8O|yPHjDu$%9mnS17+xo6J& zGm~wNhZiTG80dWrz*LzT#60Y<@bw@(*b&4xu+zpjwfvTiZ`=5ejqlp{UJe%G`wBk@ z;z2wV!Vl4<@UX%o3MqwM8qys?4|)~)6n>=esKR5~`r{COg5*yXf2QzrgVj_0fcuLEsm3+p=v-r*kNGwNsy)Cl@-0>_uJm zxyxnLJ`4YJ!w(7;R8%@Kf1PtnIOMz?UQzuCd{R)bHnAxY>+D$57Mr_qV`6i|n)VJ3 zY49%oCGf>-YT^d{c+c4~Dw1qKqrt~=VVNbT7%5j(%h7DfI3wc)7Tz&3K~AMdMoyE{ zjZBmZLEMRZ$2eO9g>=d;Gg2v40;w@FNuoxorOL=;t;M9qc|UJ#eq7El5|=4PrfS}JMdy(W!Igf5BMBU(KuhNV7zm%u-v)1=)Mxqs>=m4 zDjM7+X-lkM9b4S8cGb#`nND3v#MxVv!;$0OC}&sHzN(E4OIIdZ6LVYJH*9Q~pXhAs z5L7at)VawU?rJZ7Pm&9{?*!*^rXFzdSYO0+3b0(v(xXc>g5#=;;J5-KIJ!E5qq)Pm zR`(-Jm<$k)})7m9i!*E+dSc`R>bz5ezG;=AL^<+w51~AXU1`C%- zn7`130{;4uhs)XQ7mfpLXtxT^Ycq)f;Dj*%}HuD^ltT zs-j?U2c#X;T3V3Sw$LOGY^H=t^A4HhGMmV#Nu%K#05^B?h>8Anr&3@nY0U3^$hg~ zST^;+xwd>cmAqD7Jj|1(tdgdzCrw#T8eL7pJyB-s2YC`cu_xD1(Py)syai8J$GDhG zIL(8`ohYt)80CCSH*$M$y32W^4^pxZEza)o@#HS4Mz_?USLUKm=J75Y%J%t#@@4*@ zkunF@9&e<}T$eGj6yX6h49oU#s6x~I#Cf(IlEmlmdCr&#k2_gvCYAMJV)HIkG)D6) zC#6ueOeYcT!6XkBRjYO{bQ9;h!H+Y!c5^fBK`Ad&)t*krvO(=A!}V0mor*$y0XI-- zDIc8$txvLpyS3f08?#|IWy7vxSZ1eQ&){?--ps&T22F>iF;53XhJ;5cyjq1%R`+`l z^YDHiR33JtpQNI_NlM>0WH};P*%3ESRCZBDcJ_dAnJ-ddM%T~=xs|#c+{Pw7L3SgD zXEe~8(bYgLHLAzWhB&h!n(Vxu(wH_FRtz=Y9?NF9lQZ*8l(j diff --git a/productionboard/target/classes/static/js/common/echarts.common.js b/productionboard/target/classes/static/js/common/echarts.common.js index 80ab7ca..2a6bcd1 100644 --- a/productionboard/target/classes/static/js/common/echarts.common.js +++ b/productionboard/target/classes/static/js/common/echarts.common.js @@ -365,7 +365,7 @@ const threeDimensionalCylindrical = (res, ids) => { axisLabel: { show: true, margin: 25, - align: "center", + // align: "center", textStyle: { fontSize: 14, color: "#A8A6AB", @@ -382,7 +382,7 @@ const threeDimensionalCylindrical = (res, ids) => { }, }, }, - interval: 0, + interval: 3, }, yAxis: { splitLine: { @@ -1169,9 +1169,22 @@ const bluePolygonHistogram = (res, ids) => { //多个立体柱状图 const multipleThreeDimensionalCylindrical = (res, ids) => { let mycharts = echarts.init(ids); - const xValue = res.map(val => val.materialName?.split(',')[0] || ' ') - const lineStoreAmount = res.map(val => val.lineStoreAmount) || [] - const hullStoreAmount = res.map(val => val.hullStoreAmount || '0') + const value = [] + res.forEach(e=>{ + if(!(value.includes(e.materialName))){ + value.push(e.materialName) + } + }) + const data = value.map(e => { + return { + materialName:e, + lineStoreAmount:res.filter( val => val.materialName === e).filter(val => val.hullStoreAmount === 'L001')?.[0]?.lineStoreAmount || 0, + hullStoreAmount:res.filter( val => val.materialName === e).filter(val => val.hullStoreAmount === 'U001')?.[0]?.lineStoreAmount || 0 + } + }) + const xValue = data.map(val => val.materialName) + const lineStoreAmount = data.map(val => val.lineStoreAmount) + const hullStoreAmount = data.map(val => val.hullStoreAmount) let lineColor = "#406A92"; let labelColor = "#fff"; let fontSize = "12"; @@ -2138,7 +2151,7 @@ const equipmentFailure = (res, ids) => { res.forEach(function (it, index) { - stationData.push(it.station); + stationData.push(it.name); values.push(it.value); }); let option = { diff --git a/productionboard/target/classes/static/js/foamBox/index.js b/productionboard/target/classes/static/js/foamBox/index.js index 534791c..a920f1b 100644 --- a/productionboard/target/classes/static/js/foamBox/index.js +++ b/productionboard/target/classes/static/js/foamBox/index.js @@ -2,7 +2,7 @@ $(() => { //班组计划统计 $.getJSON(`/foamBox/getTeamStatisticsJson?ids=${ids}`, function (result) { - onDutyPlan(result.planAmount, result.actualAmount, result.differenceAmount,) + onDutyPlan(result.planAmount, result.actualAmount, result.planAmount- result.actualAmount) }); //设备运行状态 diff --git a/productionboard/target/classes/static/js/tankShell/index.js b/productionboard/target/classes/static/js/tankShell/index.js index 7ba7fed..f8b2819 100644 --- a/productionboard/target/classes/static/js/tankShell/index.js +++ b/productionboard/target/classes/static/js/tankShell/index.js @@ -2,7 +2,7 @@ $(()=>{ //班组统计 // onDutyPlan(1234,1202,33); $.getJSON('/tankShell/getTeamStatisticsJson', function (result) { - storageStatistics(result.className, result.planAmount, result.actualAmount, result.differenceAmount,) + storageStatistics('白班', result.planAmount, result.actualAmount, result.differenceAmount,) }); //按型号统计产量