From 314f4b8eaf4f35235a8bbad25644f9c44fafc75e Mon Sep 17 00:00:00 2001 From: wenjy Date: Sat, 1 Oct 2022 17:49:19 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=90=B8=E9=99=84=E5=86=85?= =?UTF-8?q?=E8=83=86=E6=95=B0=E6=8D=AE=E7=9B=91=E6=8E=A7=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E4=BA=A7=E9=87=8F=E3=80=81=E5=BA=93=E5=AD=98=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AdsorptionTankController.java | 2 +- .../MesMaterialProductionStatistics.java | 4 +- .../MesMaterialStoreStatistics.java | 6 +-- ...MesMaterialProductionStatisticsMapper.java | 8 ++++ .../MesMaterialStoreStatisticsMapper.java | 15 +++++++ .../mapper/MesTeamStatisticsMapper.java | 7 +++ .../impl/MesProductionDataServiceImpl.java | 41 +++++++++++++++--- .../target/classes/application.yml | 2 + .../controller/AdsorptionTankController.class | Bin 4598 -> 4588 bytes ...esMaterialProductionStatisticsMapper.class | Bin 534 -> 1002 bytes .../MesMaterialStoreStatisticsMapper.class | Bin 519 -> 1040 bytes .../impl/MesProductionDataServiceImpl.class | Bin 5845 -> 6301 bytes 12 files changed, 72 insertions(+), 13 deletions(-) diff --git a/productionboard/src/main/java/com/productionboard/controller/AdsorptionTankController.java b/productionboard/src/main/java/com/productionboard/controller/AdsorptionTankController.java index 6aeb525..5911402 100644 --- a/productionboard/src/main/java/com/productionboard/controller/AdsorptionTankController.java +++ b/productionboard/src/main/java/com/productionboard/controller/AdsorptionTankController.java @@ -98,7 +98,7 @@ public class AdsorptionTankController { @GetMapping("/getMaterialStoreJson") @ResponseBody public String getMesMaterialStoreStatisticsJson(){ - List mesMaterialStoreStatisticsList = iMesProductionDataService.getMesMaterialStoreStatisticsList("L001"); + List mesMaterialStoreStatisticsList = iMesProductionDataService.getMesMaterialStoreStatisticsList("1001"); return JSONArray.toJSONString(mesMaterialStoreStatisticsList); } diff --git a/productionboard/src/main/java/com/productionboard/entity/MesProduction/MesMaterialProductionStatistics.java b/productionboard/src/main/java/com/productionboard/entity/MesProduction/MesMaterialProductionStatistics.java index d423f46..d26c3bb 100644 --- a/productionboard/src/main/java/com/productionboard/entity/MesProduction/MesMaterialProductionStatistics.java +++ b/productionboard/src/main/java/com/productionboard/entity/MesProduction/MesMaterialProductionStatistics.java @@ -20,11 +20,11 @@ import java.io.Serializable; public class MesMaterialProductionStatistics implements Serializable { /** 物料名称 */ - @TableField("materialname") + @TableField("name") private String xValue; /** 产量数 */ - @TableField("productionamount") + @TableField("value") private String yValue; /** 工位编号 */ diff --git a/productionboard/src/main/java/com/productionboard/entity/MesProduction/MesMaterialStoreStatistics.java b/productionboard/src/main/java/com/productionboard/entity/MesProduction/MesMaterialStoreStatistics.java index b75fa8d..c395692 100644 --- a/productionboard/src/main/java/com/productionboard/entity/MesProduction/MesMaterialStoreStatistics.java +++ b/productionboard/src/main/java/com/productionboard/entity/MesProduction/MesMaterialStoreStatistics.java @@ -20,15 +20,15 @@ import java.io.Serializable; public class MesMaterialStoreStatistics implements Serializable { /** 物料名称 */ - @TableField("MATERIALNAME") + @TableField("materialName") private String materialName; /** 内胆库库存 */ - @TableField("LINERSTOREAMOUNT") + @TableField("lineStoreAmount") private String lineStoreAmount; /** 箱壳库库存 */ - @TableField("HULLSTOREAMOUNT") + @TableField("hullStoreAmount") private String hullStoreAmount; /** 工位编号 */ diff --git a/productionboard/src/main/java/com/productionboard/mapper/MesMaterialProductionStatisticsMapper.java b/productionboard/src/main/java/com/productionboard/mapper/MesMaterialProductionStatisticsMapper.java index 7f95d62..db0f598 100644 --- a/productionboard/src/main/java/com/productionboard/mapper/MesMaterialProductionStatisticsMapper.java +++ b/productionboard/src/main/java/com/productionboard/mapper/MesMaterialProductionStatisticsMapper.java @@ -2,9 +2,14 @@ package com.productionboard.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.productionboard.entity.MesProduction.MesMaterialProductionStatistics; +import com.productionboard.entity.MesProduction.MesTeamStatistics; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; +import java.util.List; + /** * @author WenJY * @date 2022年06月09日 17:02 @@ -12,4 +17,7 @@ import org.springframework.stereotype.Repository; @Mapper @Repository public interface MesMaterialProductionStatisticsMapper extends BaseMapper { + + @Select("select * from table ( absorb_xfnd_xhcl(#{in_id}) )") + List getMesMaterialProductionStatisticsList(@Param("in_id") Integer in_id); } diff --git a/productionboard/src/main/java/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.java b/productionboard/src/main/java/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.java index c821cfc..3e748a2 100644 --- a/productionboard/src/main/java/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.java +++ b/productionboard/src/main/java/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.java @@ -2,9 +2,14 @@ package com.productionboard.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.productionboard.entity.MesProduction.MesMaterialStoreStatistics; +import com.productionboard.entity.MesProduction.MesTeamStatistics; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; +import java.util.List; + /** * MES物料库存统计 * @author WenJY @@ -13,4 +18,14 @@ import org.springframework.stereotype.Repository; @Mapper @Repository public interface MesMaterialStoreStatisticsMapper extends BaseMapper{ + + /** + * 吸附内胆库存统计 + * @author WenJY + * @date 2022-10-01 17:27 + * @param in_id + * @return java.util.List + */ + @Select("select materialName,LINERSTOREAMOUNT as lineStoreAmount,hullStoreAmount from table ( scada_absorb_kctj(#{in_id}) )") + List getAdsorptionTankStoreStatistics(@Param("in_id") Integer in_id); } diff --git a/productionboard/src/main/java/com/productionboard/mapper/MesTeamStatisticsMapper.java b/productionboard/src/main/java/com/productionboard/mapper/MesTeamStatisticsMapper.java index e3b1177..56a63cb 100644 --- a/productionboard/src/main/java/com/productionboard/mapper/MesTeamStatisticsMapper.java +++ b/productionboard/src/main/java/com/productionboard/mapper/MesTeamStatisticsMapper.java @@ -19,6 +19,13 @@ import java.util.List; @Repository public interface MesTeamStatisticsMapper extends BaseMapper { + /** + * 吸附内胆班组统计 + * @author WenJY + * @date 2022-10-01 17:27 + * @param in_id + * @return java.util.List + */ @Select("select * from table ( scada_xfnd_bztj(#{in_id}) )") List getAdsorptionTankTeamStatistics(@Param("in_id") Integer 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 fad93b6..8e2df12 100644 --- a/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java +++ b/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java @@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -46,7 +47,16 @@ public class MesProductionDataServiceImpl implements IMesProductionDataService { */ @Override public List getMesTeamStatisticsList(String locationNumber) { - List adsorptionTankTeamStatistics = teamStatisticsMapper.getAdsorptionTankTeamStatistics(this.in_id); + List adsorptionTankTeamStatistics = new ArrayList<>(); + switch (locationNumber) { + case "1001": + adsorptionTankTeamStatistics = teamStatisticsMapper.getAdsorptionTankTeamStatistics(this.in_id); + break; + case "1003": + break; + default: + break; + } return adsorptionTankTeamStatistics; } @@ -75,9 +85,16 @@ public class MesProductionDataServiceImpl implements IMesProductionDataService { */ @Override public List getMesMaterialProductionStatisticsList(String locationNumber) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("POSIONID",locationNumber); - List mesMaterialProductionStatistics = materialProductionStatisticsMapper.selectList(wrapper); + List mesMaterialProductionStatistics = new ArrayList<>(); + switch (locationNumber) { + case "1001": + mesMaterialProductionStatistics = materialProductionStatisticsMapper.getMesMaterialProductionStatisticsList(this.in_id); + break; + case "1003": + break; + default: + break; + } return mesMaterialProductionStatistics; } @@ -90,9 +107,19 @@ public class MesProductionDataServiceImpl implements IMesProductionDataService { */ @Override public List getMesMaterialStoreStatisticsList(String locationNumber) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("POSIONID",locationNumber); - List mesMaterialStoreStatistics = materialStoreStatisticsMapper.selectList(wrapper); + + List mesMaterialStoreStatistics = new ArrayList<>(); + + switch (locationNumber) { + case "1001": + mesMaterialStoreStatistics = materialStoreStatisticsMapper.getAdsorptionTankStoreStatistics(this.in_id); + break; + case "1003": + break; + default: + break; + } + return mesMaterialStoreStatistics; } diff --git a/productionboard/target/classes/application.yml b/productionboard/target/classes/application.yml index 3b70347..bea2bcb 100644 --- a/productionboard/target/classes/application.yml +++ b/productionboard/target/classes/application.yml @@ -13,3 +13,5 @@ mybatis-plus: server: port: 6069 + +in_id: 1 \ No newline at end of file diff --git a/productionboard/target/classes/com/productionboard/controller/AdsorptionTankController.class b/productionboard/target/classes/com/productionboard/controller/AdsorptionTankController.class index 86d3f2886d135f00cd24300ec0ec54b144006b21..6c73e621e5879de1aea2bd0fa5b3cf8f9ab96195 100644 GIT binary patch delta 1195 zcmaKr`%{cz6vsdBZrl5|``XepNUKuOWwUL{t>hM^6uGq$LW;;WmylKw5t8>OGyVij zCNnOBKfo`3_80VvpUs%TIM3daHnTJ5InR0Cb3WhaoM*r1e#;Gh{{8+FP>$s!i-5tt zBr<7HX1_tJivt{Vafmi$4(l8-IO-&cc4dwkbU5kcxZ0f1>2i`nK$(*Ur_|c5%xQIe z#>rXEDKDUko>%6AD@|;V!9{~hI+t~>Xry$926W#XbcKcHDtqeUq zKaV9Q*(}ybDE0eGb*`CQr%$KX(@30r`f+mfg~YdQ0Jk^BSuXg(`PcK%oF-13}eVqk|`Yn zoBTu%8ac8{lr=XL6``^kvKQ%M3#<=wJi$VVIVA%;BuG|~c&40!3opg8YAnMiUlfR6 zB0F{FD0+>3TpSy!fPx@pr;;6!#N%vRLSKM%%+J_ zmP_eMR!}A}yF{|ZFP9{wxnW(V%x@*Dr0i;mD$U`@8u2P5vJl5F%5*Aq)>i9O{Ulja z>kslmokw*G*&s<88^ao{vE-b#spiy5@w(9c=1CgNjfrru=^qg)QZ1F# z-KRq~M;KcojMS8zcExbZ6`@)B7!Xd&ES#DdoEmE5a<)b|b+Nmo1v6|kc;7N#P0b#f zT6pXoLhPJ{SU-bU&$hV4h6u4SI$^5hJDac^sh$S!xcm!bH`UJ`(a`@FHTquc^3`^E ysPVeDBf@Bk!&syk(-9+rcosu6ijv68{>RuEV%XRfDz-Z|!#%R!E2_eerTGsZYk*h) delta 1230 zcmaKqSx-|z6vuzl#d|FilxiSRBMK_osx1O8;Esw&abG}OKmn~wE7W~y-Eddb>Vt_N zK@*J{mqb5+FFyDoeDT@DM2Tm5FQ9_vCTC{OJ@fzl&&+%+{Z^X!*!S)OP|3pplW4MO z9!W9VO=z*%k;hJU<*}Pq6WT2H*z653l6Dh1Y&rw%W4~F%Ee-@2O_K=+Z4R07un7tC zI~m{zU1ru~M7vE$*<(0rCdX`!+nlgCX>sa#?`My7T2K~eUc|jmytQRaSB!0IPbIsL z9E~Rvo7)lxBk@Fg$4SjprfDWqqVSbRqvaN7HRniMoYrJGuercQMRm5-Q(dMQ@#WF` zFTGDSm$`PiK1+yE~?Vp;HCmI-qPGAqPfFmi(buL?rH9m)?`Tw zI3{4t1JW=0tR8=+SWXf=@`*1LrLr0!zqP3R zSCl(S+2#4SR4Dr?Kb$c;D)CE0>zPA^=+#gqnJT=JnZ#U~`K0EItEWjakNKjtK(fZE zlc|F&>>fOl zIuWnWHB~6vpkTm+pW44nn9K@M8VXtIGFG_^dvr<0F!H5E*eZv&O*qZ};M5J_)UkS4 zPQA-n<8VZ~MO^26%We6BS6ov2Arm?kZ>%R+WP%5pPfVh!%<5Gwq7TmZflVqBXB$Jw%l%hzVAryQV z7lK{|ChoxGC_T1J+s9thCi2W;;u!w7(C34H7(|Bb5S>-v08#PVj*Z3y5(teQHdjz!_%IyWSdfKVaba)I-0smBLuu>zb1bZ^ z{2RuaASn8229Ny z;|JU^%m{77SQ9uZx2J5*>XNBRy`>DF@Ssuo=0YQ6y^WI%0>utD*S>qk0_JhU1C*wP z8VZ*{&JmNEVkQhY0r?-l$UTkTP8JTAd>osn=S+qu4s^m$kKqQvWEXc;+pTW1?+kkV zrrqhCcL$VdDuu!;@D$tgLuIPhp_G4mdKLH{HEbj~EmJ*aE*r8D<}e!0#%5YRyp6wJ zbMGp&Lg1i}7Q*8fLJL&ff$?3=9k=41DYi-0TcI>3NAIrA4WenVF7E{AM%xInz;P d1_ovZ7NA-t237_(FwM@u0i?NrBAj5F0RSo_4uJpw diff --git a/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class index 401565c81942b519f9329fac5dc58bf815e0b885..f7e970bd5e4d19c2e80d6c99de816f9f56cde492 100644 GIT binary patch literal 6301 zcmc&(YjYFV8Gcrly~5fUurVYUhf4|ZmE{(i)&^{FE^6fq$TcC*Br9ocuPtfi-Ia+8 zw7IoS(xyqTG`-(u_|PxyOoxOpbBaS!mmJoScJl%}p9WngfIKJnLem{tUhVFvvpRDD0t#hso+_8 zbIx+Dbj}OYh>Jkzm^oZLei9Ny&oCYwxdszX>3?3ALt zW_Xj$ED1KLyPW!WX3bSAV?J+`a$XS2qs@R%Y?P;xj$+OzBntC(pkc6?hM9H3T;6IG zUbV6cl!VBmEd_nf$dyc?VpTjSh#kHmmEBU%Hfj|t@2rBBzWzA{(F=B#0^5^T!JI1P z)21_PFyj<-Chd%on==?relHJ3y+w;Dc&@G;uIUJ$=~lj&6S-YYf(gSjQvPg$lLYqo zg6W0QKgrrraJVnIWULxG-LasjJdx%j{r(WsHm3_I;oKbYi8S_63&5de3icUU*LI3R zZq_I)uP-+RJHmQ*ueW=x7}!3wL3XsR6HL~vx3=E=aG{T!r3H^MZ8OWv4e4AJKUDDn zAx)azqMe;FL}{~{=Sh#x1%$XTcUQlqv&w_v|tL0p!TR#={Gl0#c z6kK~C_chZkqf>n7KHPN6a)|_T8_p5mFCwuU2q<{4jB21(dgI||RI}ZlUY{j(9C3cl zcgLY}l&UOVht{Jx{}2czOo-eCg+4-dXy$`k8!a34;nyBvXG4eB*4U}p{(D?mwlzJ- z`L$V|Ts+=Ac`H347Og=bQ}NovEzFJTcQW^?v?LlRwgG*0vdVcx_6I$jH2#GUk}X7h zou>8_8*g@_mT1flvTv#yy`i-_D#}DbU)^@mWjkToA|uH2vR50?a1y5!bjj+Hg*omx zhAdciBN~2$51B;Aj~zR%;UoOme?F<<01j$63SGrdH2f4lQ}J^Rzrbw;BjSbUbDr01 zRA;7BiRr1tgoa<@V-1J#l!{+z_%(i`;Rv2q@mmcSaa%(l`c?c+!|%nHKj4pqHhX2} zISm6CRPiSbLl{=^X9Z{Ky@B0#ugZq3$~@EQC7zB7o@u5s(I`IbS*vdLDX~Vk-|5l= zi-x=CH|6Zm+4{GcDKW1e%~ZjDR@`{gminn$l)-LwN-|=u@Ljf6xNK4lbp}R;hst?YZ1`f`pa}}z z#M*tv^rJA*cmMPdw5@e48f)&*fWWJ@TkWF)Sh9E;8x^S7aL5L$4}^lVK~O=&B1Mii z^txn#3wBO4fqZ2Ojx3ou?+GlU{U*d?QN z;1ei+m)K78Dv$!Z@MT^#UjWbIEBvP5s~ACxT>L*;(#o-0pCWSQ6SPbYPDM^fhwmc# zSB?TgQv`eP8t*;4r+FV3?rgn_wvW->ayohk+lM<<`L!*2I@(=ccS5e?g?~N#2rT-* zKM><*+dt8M5Ag^l@1X4tT893{$*A0FFJVJkcoJCxEOGR8!oGn~X~+S>CfKqe;%O9T zs60l=vp7enW1JV}`Xl2UInR+Uw0(vl6&F-YC>`;AUH|38bDU^p4)XRqKM}mZbuZF2 zQR$iwxL1_py`Ms(YaW{%>g*W2i|vI! z_)02}dn=H;k)UjZk`c6&kRVXoO#aZPt)*VuH; z3SHyUH6C5FO4r=j)HQP<*UaJamR$1^U2_F5Gsy&>+~&Pb-tQK9zl(Xlr(WK_LFjKX z@84oJzuh43uM(&z%-Xyc;QhS!OS_kOajhct&2j|@gDMqpl^FeceT9OrRzm7hM6g3o zwO$_&>h%fY-Wx%+T05lZyF~LIQNLf~KN7gg zrHLuS7)GQog#i)Hb(JwC>BFAEd)QZtMf}eI_>fpWk~jnd2+H!=I)=F1UBMVf{oTcg U$&LIi=PAFyxd;|3XOso}A8)nvWdHyG delta 1683 zcma)+NmCP15Xb*BNth%vvIS6tDDE19i2K5#D2huE1w~X4R2G*2O2FN5S6mJ{2R&ew zA3-XXidt5A_3qU#VEGj+|8L$fpb4didHtrl-|JuZbkEC*Z)N7!UmrdLSdGU)%tU7Z z1voC26G5CrmyT}qXy^?h1D$@H67sY#pV4s^ak1;u(JyxcI?f?3T+aJ3C~OHGL((>^ z;{xIuE^4@>;j)6fL|13LDKR!0^(Mc2zp2WI_0(5s4d|s-e?Yg+`U{guEu>gKeP^uU zV6m0RsJ3NE;79UV@RJ&jqRc=cW*b<7r5dgnxQc5Ut{X6M!y28jyXGct83<#JhT8`2 z;I4tWDA91wz&y;?aNocKj41Fnw>H)pSb&8Z9vWDL#Tp(dsItB&dDaWhGAo`LOJ-*U zRI4)Qm07?lDVPNfs)){g5zCiBSxl*lcquxDP0l2YwA6`9thG4Je|Yy;=U4j#<@>KS%bB_H-~=fu%7D%dWon~vyqxj)c6!S z0+oDJRMA{b5U&mLgjag04}U~P>pPfQESl>teTzT~se;jQ=qeh@CXsS&?;6%(GqSOT zU#Heai^yACw6KHbM?PxktI|`Y|9Zv~kOh2`wp!P=6&^E{cbnY-nWV1c6FCB95Zk%i z;TH3+9R5hbU)^AFQw$WiM!{&aLr8e zW~Jk8BX2u-kCC^-<^4BqEDdghgBxQ7{=}92-$>ql*iV~i^yidQT4bWU*`h3!DyN|GT`h+rwx=v+I_Yyor#qw-3R{0sIEB?y&~|