From 677349559cf683717d0ddf5fc9b5185cad522ac1 Mon Sep 17 00:00:00 2001 From: zc Date: Thu, 9 Apr 2026 16:02:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=B0=E9=87=8D=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/model/resp/MaterialInfoResp.java | 2 +- .../service/impl/MaterialInfoServiceImpl.java | 13 +------------ .../templates/import/materialInfo.xlsx | Bin 9463 -> 9445 bytes 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java b/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java index 059145a..a9ec2aa 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java @@ -97,7 +97,7 @@ public class MaterialInfoResp extends BaseDetailResp { * 颜色灯光值 */ @Schema(description = "灯光等级") - @ExcelProperty(value = "灯光等级", converter = LightLevelEnumConverter.class, order = 4) + @ExcelProperty(value = "灯光等级", order = 4) private Integer lightLevel; /** diff --git a/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java index ece9466..0c95b69 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java @@ -215,17 +215,6 @@ public class MaterialInfoServiceImpl extends BaseServiceImpl v1)); } - //处理灯光等级 - Map lightLevelMap = new HashMap<>(); - importMaterialList.forEach(row -> { - if (row.getLightLevelName() != null) { - Integer valueByDescription = LightLevelEnum.getValueByDescription(row.getLightLevelName()); - if (null != valueByDescription) { - lightLevelMap.put(row.getLightLevelName(), valueByDescription); - } - } - }); - // 批量操作数据库集合 List insertList = new ArrayList<>(); List updateByNameList = new ArrayList<>(); @@ -243,7 +232,7 @@ public class MaterialInfoServiceImpl extends BaseServiceImpl6m{>{bI(2Beg1mSdCv3Kdw%cx92&0~H;;iBF_pT!4~f$tS)6}A#s;HS z_Es#|y6s-~jatDlJk%4up!%Tp*P*MPQQ>-J;KliQXy$b1;e5647N*p&irpSYUX|%f z9W`5XQR2EAhuvgXf#r=Au}C`NH701!mgkhKquWFRyIv&BzH?>iD2qdMVdY%h9NE(=1_IZSzUn9|(L3110H$3FkG3+EtRB z!Q{?G?GwdK;F-i8_`NClrwY@q-k0M7WQ6^Iki1ZQmTl`mnp>X{ZqHwp{#`&9m)^JQ zsqdD;S@-uMrx;%bHl+L6o|RYDJ?t~G^i+-raV(*Qs@TZ4Ym{vT*kI{q_PjX%n7{mW z`);Mx)OsuA2Z*pp9+*lkCpPc)FnAWRj<;6iW#qQf1{xZtV;jlBP!_?=d(V2+=GfFB zN35;7rqA-HCV1NzakXtmdsj<7@@JvWfQ3qt39ws$en{#X$WpnY)do`yYMBJ^QZ9~&NYc4eDVOwZ$bX?&E>pm z(_`Aa8S&=pRc8{^x}vdp*Zh`mHfr|PK zdD5ZT<5zIk@-)EXrdji|gfXaMT9Fnho(d&=3I=_;#{s$;UZQ!bd-SgW4gTFbWB&al z_otCM@8MStQ&4|Z37hj*{yJKc;AYb@H@89KX!>$@ZyJ%CXIPXyW)QCoGV)EJkA*gs z3~;Akc0p8ajXfiw6T*fg&J$5*rxmLTPP>_d3!xI?4uVx~FXS7H;g)0U`AU3g&AKIL9hcSDp8Zh0!R;wT?C z+O&OYwDC)XyrWH$Rsbq#6&KY?GUg^d_GECIij=;P&=(lNle5+KqC@4u(yMij{$G!ql^mMgYR-fwHZQGg%^^b1UE5y&VH<4T%S9L|+&&5+j+M5oN0 zE8GIk>gYN3Lr8S zwzS_zvu-3YaYrDv^f!`xfu;fue5Jf4lMV}gRg97SiTV+3Uu|&G*907>ePe)zji4ba zNF9{=J)7djYnj@x@g)#_qpUbT$lV_(FA&pwzl}Y}DPc5Uvwq^9y)Z3J%AY>PdW_|1 zCbCWarb$OHPta)Emy&7&n-%0S;kX3SKWfCnxbw1E1B=bsj2<<~&=qbs>kqfZ3DF>i zr9Sb{RqG+Ivoen9b+?Wqrr!v^Z6>w6{BvX?hLa&w_&ZaQKb0@vc*t0;;W=JE1#|n6H!FtsL;B0q#~b?2XK?ds z>^J57&6JH0#=3N+B<&LEJ4+fC-z2D!YWbY)WG^QzSYuae*IPjiOd z_Xi;eTtX0V%Il#KrVJdGZq;cl$`8DZ79B*VcjQ;+8`gOJIT78GrH4xC_{?3j3=!>* zq9m1@i9r{5=!t7jv+hWXj#$UZTKL5FN&ERNs;l0*LEg0s7C&{$_>rk5!Nx9mq^A_{ zro4F8U8(+8hrit?wf8-Q^`R2xun4{odl0ta0P}q-v@wz=FA=vPlB)FM+Lo5-n0OHO zBa@@SD;I+lf94xA!~!ez0Y3}RRN;1xVc*CkF8%a zDVUUDv94TzeTwDIx|NIa@S~+)T3w$<_LMEmZ82%r1~X1jCcC{rt22czr})mbpW!Qy z3wLPW&l(W*;8pezdvm9@Hv5H+Q06GD1{oN&RKvqBPUKkeQuOb8%P7)3M|6EAETl?@ zJDW*vA3(7&qyXj9qD3_q(t@3G{GJa}pnJ%>!sI!X;OEpbn)lRU@zU{>=yD{{cZyY} z7y{GnG0XzyK*e(Fm_JCu4|z1HDzXlCMyV8tYQfO3p{TN~GLM3d6&@z*H=I*Z)kUCC z^K(4vkNG32kXu=HE)Y52q3ds19^nY67G7FH)|Dx;3Yl#{jiQJUqlz-_X01IN<4>Sn zf{p0#XT(nrquhXUb2xQXlW9`5k2AIScKAsU*|`N98cF4=tNm81!#%KmxIb|Ev)%D6 z+B;sJLxzK~+Jz3DoHo7P9vBAEuowNByT$EeR@mA71I8HMlYv6H6*oOMKIA;lQ)nJt z!suL8zZiV5n|nfj3&mGe;Eb*Z^7CV!!X2y0RUnVn4jn_&MEl6|Hc9UTmt-4&8);p zR(@iYxE!4|aYkI5Z3O}V!~`j0Bku%x6K_iJ3j9Bq|I8i`(Gt>vzZd!+a6RY&fQ$dM W0Y`$wED0nXfjA{04zdvY+xs_zPNPZy delta 2575 zcmV+q3h?#iN%u*x$_52%S{&Aulg|bze@Q|UR8nP0qgC3bYW;eNR5`{8UchFyX%bca z@4JSOHqA@dBCxS99G`RVvCqyoMUEc1HbTh+lal}=E}2S&TqgMTX6p4ZGM37e=1TGe zZ@Ize!>?b?)=IDDO05t8NR!~q+A{Wi!!lk_bD~NvA+k`qpcaOD>6=n>nwpGre_P~! z7zB}DP$6-H5bO6~sKr7sK2fYHxU>z3<~g-M-(;dREn30e16NSJs!ETkq6CP!$c5e3 zpcoY_zFbPB={yJ78`47?4R-_&37`qvl^}GqR3VsFMlI|KK>H2pBmE@s2{}l?<~RrM zL+bjPKMGgFJu4l3kX5wDieA7-fADEE0@kX%5<~Jnh}PS43-R!5A##4#SQpW<{6z~_ zsT`x68heon%hLp(!ceXG!Gx~LZqli2dQ-&Q}_xd_k++-hh!?c-R?HGzfd{ zOEAVLw_HnV`B+H{KHTa0tmkU%ai+lG=r{jc3C&?+fxkd2w3NkkZmy`!e^90K1drp{ ztpWM7Kd@Q1vk5mVtIF9cU((}E@E^{k%*pjZZ^Nm1f2$p+>9}>@mDLE|FDE~s0@w5r z>H$?xciZ(65>7e~lIfT{JY8IL2BXe+;B`kN^18kLsn?&5h&PSGPBfi_qfyX%1~EE{ znWB}=cBOXE3GPB&k3v7`f2NI)Ag)CELgOjeU7qXTG;QqJ33i9to#1QpVhT4zn|mQs zwN9`{0$6-|I9%7kdy(1kzh>?`7t0J7ldu~QM>=%O5`4gD(lDCB<+6lZ=s$-5UBbC3O+o-x$pqSlo5)!=Mhf1V{PsACvJM6|;*8 zGXe?FY_)J`0{{SBlgA4of7@>2Fc5uTY5yV0dvgT}2&h^p(1(>)dwn*>0jo)zwGFgd z?Z5BXPD0`!TD78aa(w2@cs#yL?q0IgIT9`?%cpMW1+GJK%(gV&P2HbAmN!G!5fbHF zl(L*m-B%*qyV>VYlN005Vo!*4Kp_`XcQ0iz_I-i(Btybu1<9c&e_=dB5G1 ztBtbMkAh&}XNcymQ5f_0Xs{%qm@F7RWF(hHgp(9Wh+ph!Au6>Dzeg@Z{P|GaV3rji zv7srIuUgb~GCY3T<&2|E3gdnWdk8x(9DWh}$CVq6cRXbjb0%0KJy7;d%-!LS{E?4v zt<)X=yJW(i&&iRhe+fKGMIQ?(?AKb+SuFmb*q|0u>Eh!9-A>)VLHTzBZKxi>`BC-# zb7zw+g&9_(ayUt*?tM634_tpX(e?9-l9On>I}&Zalayddz(?phsysK0JuBi9KmjNU zO;CymOL`=8lBQF49Rgka(N5GmxbSNq&G*XRQkV2s?rcede-5eq#!hQOcY6trd&(TM z6u9toGO898)Dn7`x{%Qm-O4>6@QM#Yvg~&WlxD^NvZW26Ee#^jxMI*N4WKOz;>Zhz zqhT+;?O(NoUhN9nDz@tegVF%n%HY+_4!+^r92OV0uonN3>$z2!<)LgAHf3#B96&bV{%P!;A%G{e8Yr}x& zc{JzbwlW7f>13|w_0Kh@2x?DI`-LjP2OF5%z`_7}6VxV;He+c6s|L^t4<_V#c#6;p z&j#i;urNR)Je#q!fmH)&g$Ik|YTc>+R&+Knw}FKL8qwK|r46hM5bG16xhkLz8_`vp zh(cR2X4$~p1{OB(Xah?dSTz8XF>_X#?XK9v9ZgaUXH&v*sm?vMHeU<4z~pSs^75jm zMpU33`GWY4=E6xy0tFp-ur+gYkm+~H3XMV@HcY~4RekN@8b_dJ0}tdA#$@%O&d&N` zIQtKikpmQyq$3cM!Xp#2gb#fS2?L(*Yw7_20BVy88y$a7YuhjszYq2ugihOGk=<-% z4BI^v3cK~NeE{JovB8!+ODV}t4K%bS3)?778QsdZOIu3+jTSho(gDKse3eRN=vmFuF{?iOHJHPm(nU|#hck+C2*}+=ue+Rr zMeMs?b%^Fuz;w%kOphW&5lXUHH4xs3&eUYGL)-^D0}Y zcl=}~`?b^DDPiQ!s;sx=d`Ag0PNy4bl%+K#|4H)OlKXUb(A`Vc>dDFbUrXgrME{p{ zqH8%#zeaukAEBRjop|j~o-W+{f}iswUq23_Z+G7)u6yNF1rHhr{np}NH4UWR3hM`x z@f;Nek`m4BsNY1umn}#I1?J@KPd=H;T@HI@^t#&AQ zne%<;cfNB-JXx28_X67Fl}u0=5afa6mB{5HL3i2IKS7?cObS+15)!llgC^BHAJa?~v+Q7Y#sg3b6~iH@mrvaj#sTuwcesyKB#L z5NDh8^W)X~dV5EY@o&iioBS;mgy#~`Hvdk!ADmxgQ-lcXaW0Z)^^BR~P( zk|ZD;1D@||>Hz=%Y6buR6aWAK0000000000008eAlMfpflhq>-9Fh{{1zZ6D0Ad0F l01*HH00000000000000B9g}_}JprDRyd)zAVIlwk006mSw(S4_