From 683ce712054609de1c6f2144c48211786583aab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E4=B9=BE=E7=BF=94?= Date: Wed, 15 Apr 2026 13:42:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=A7=BD=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BD=9C=E4=B8=9A=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/controller/WorkTankController.java | 14 ++++++++++++-- .../desk/basic/excel/WorkTankExcel.java | 6 +++++- .../src/main/resources/Excel/QA/作业槽.xls | Bin 7168 -> 20992 bytes 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java index 4b081dc1..827c9374 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java @@ -5,6 +5,7 @@ package org.springblade.desk.basic.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -30,8 +31,10 @@ import org.springblade.desk.basic.excel.PlatingSmallExcel; import org.springblade.desk.basic.excel.WorkTankExcel; import org.springblade.desk.basic.pojo.entity.Plating; import org.springblade.desk.basic.pojo.entity.PlatingSmall; +import org.springblade.desk.basic.pojo.entity.WorkCenter; import org.springblade.desk.basic.pojo.entity.WorkTank; import org.springblade.desk.basic.pojo.vo.WorkTankVO; +import org.springblade.desk.basic.service.IWorkCenterService; import org.springblade.desk.basic.service.IWorkTankService; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.basic.wrapper.WorkTankWrapper; @@ -64,7 +67,8 @@ public class WorkTankController extends BladeController { private IWorkTankService service; @Resource private IUserClient iUserClient; - + @Resource + private IWorkCenterService workCenterservice; /** * [作业槽] 详情 */ @@ -289,7 +293,13 @@ public class WorkTankController extends BladeController { List noticeList = new ArrayList<>(); List list = ExcelUtil.read(file, WorkTankExcel.class); list.forEach(noticeExcel -> { - + //查询作业中心 设置作业中心ID + WorkCenter workCenter = workCenterservice.getOne(Wrappers.lambdaQuery(WorkCenter.class) + .eq(WorkCenter::getWcName, noticeExcel.getWorkstationName())); + if (cn.hutool.core.bean.BeanUtil.isEmpty(workCenter)){ + throw new ArithmeticException("作业槽编码：" + noticeExcel.getWorkTankCode() + "数据," + "未找到作业中心"); + } + noticeExcel.setWorkstationId(workCenter.getId()); WorkTank notice = BeanUtil.copy(noticeExcel, WorkTank.class); List userLeaders = iUserClient.listByNameNolike(noticeExcel.getOpUserName()); if(null != userLeaders && userLeaders.size() > 0){ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/WorkTankExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/WorkTankExcel.java index fe79eb8b..6b11b67e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/WorkTankExcel.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/WorkTankExcel.java @@ -71,7 +71,11 @@ public class WorkTankExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("[作业中心]id") - private BigDecimal workstationId; + private Long workstationId; + + @ColumnWidth(20) + @ExcelProperty("作业中心") + private String workstationName; /** * 描述 */ diff --git a/blade-service/blade-desk/src/main/resources/Excel/QA/作业槽.xls b/blade-service/blade-desk/src/main/resources/Excel/QA/作业槽.xls index 117b350b56b42691a095a0bd9dceddbdeb59de1b..b229a525fd839ebf77870f591810d986a850b3f6 100644 GIT binary patch literal 20992 zcmeHP30xG%((hdsSX7i-4uJ(%E&(}2P@^2)f`Eb=4@6K96(vD~kVwFT7zG6+QB*vl zLGivdipC2?6ytrxTSW0jp9WEMzp5FAot@p;pfA7oeR*FRdV0FL>R;8>Jw4OiGkfN= z{_UT(n%^Ou(3NPA4>BF1#i9$~93vI<2(g6|%zu!{WHgZwIQ=L5jXdxkY_)^N(|{;~ zs0k68eHyPTZ2blw?yp#SR8xFlbLC<4H7S$9S6f5k~_e6fpWRZHy>d z=;%vx_8{R<^JJ)bcM=81sKx-Wc#J^50P=YKG*&-~52f7%-U}mNkqPh@MftuDv_dT9 z6QoQgW8r)v3h)Gn`ugLw+gSa0J#RsyA?S$VD%R2@#k!}o52Xu;7F_&yh>&a%9fBhv zcOecZUqJl?lE}1Z+wqeBObDQCh!UU;2f@}Z0xco{ng)z0NP~8Vqak(NOmXd_j$NqH zh>%SqC%X6m2i~DR7y40rbE%^(b!-kt0ohH-{7zBaVf?BFepy-$<(u!ovzf!fLXdv_ zFQhjkh%X>qd?OyZn4%LU{w6Buae&-`>_gXZ_=PYcE7!}JhhM})M?a{>C#0(ieB}34 zX%8V@Jaio%x)%?=n1^4VhhL9}ZpcH|;h}Te#Y)r`u4Y3buqBl;Thf|1Lu^glNM}M* zh7%VS)k@?AH(FCw?8C?a5<^Cl2p&Oi7(C6C1zkZGpEkP8O5_hWbt`^R^_m%wvBZgZ z5J4o7)EnpoXY%?Yy)#iPRjj)z4qNb!EhRj>+S)XCF;c0Ss(|xO+Aki@>+(^ zsZ2O1LAn646#Z4>=s2LN;^(6ysw)2fX1aiy4`2;3(0(S+$tgd)p{a7ZGY?&dhwjKj zcT!2mSq$TUKZ&1&(Tg)1Rdjq9rRW9v`X)_Hni7#Y)lYB+q>3MBMXKodWTlFZvnPsv zfq*rBFfpS2gEJ~sbev_e=rEz8`5WlaZ`t+285za@gTDU4rVGLTc9i`%OJnE2lzN6kw zkrRc3vqMF?3q{8nqawX6MaNmBBHfLmgCY*yf`@L+gX7FY_u|2!`-8Gx+Rw^%^3iF3 zD&x@pSEifr*vUut{7C!x{LE*62OfOd&&u}m`QMbMULASx>HedP&*ul44&4OCdg#5O zcm_daBAF^SB2)3gZV3J)Lwj4(RIv+5RiI;U6~c-K%<(8*`RuYeJn0FQ1+W{-1=2}+ z!*sM>AeEy5`;8W?vCtZ}ZQIr$&_o4ITLn$5f+nh`$z_wgit>E(k6){o5e8R>gqGd>d&A zw-e!Fms*GAa_Vml0@@9Ig6%M-Pq1lBpJ3CNKEb9n^ojCC4GqBbY+v7`23mb9a*dKG z80G8h+aSOg#ilVvv1yD^Y#L+K%a<=3@Z?6xb?_KvqhJ)fwv1718esWa+r zs?r6*^^~oGQS90>MzLv(QEVDx6r08vRajW49?lt5XLf0sp{kj zVJJ=~viV|jGN0u|*o~42iO-0V*~p4qdg&T6O!d=6RBDi}Nu`GAT2yM3u1%%J>0&B1 zN!Ni?2Nn%si=-<4M6QwwVG~e+CA11%SS%C~L2PE<@L4g=W9Eyk6fF`qm5B&bN{i@F z+c*O4xcq!2bd45(jwLi}3s?@+B!Y_BCvxpa()bb%zL!js$jcd{EYK*#k-$Q$l2ICZ zU=&lzh_sT6c&HH3ZxF!|6TPbo8`=$8JXMGoG>G8%NQ+p>McS(nF>DaQ(GW#+V7naJ zA}>3pzmm6vM&KsuA9#uV$@238wn{V8+dH_E6cz=|a_Y71hEZE!HIa?HT6 zZv8)tn=j_JK}%=@c{wB28pS^RP&kTD%oN1rLh4rW7v;T z@+mri>r)#gpEB2@4Y*OQPZ5smQ(Lt@l|#F#_o*uA)@pq!hi<3dr>dZ(YJJK;8$&xO z`4k5#u20)2`IH&3Y+(3Q>r;f|`qWOXPvy`a>V2vT+Fq?s<)%z6TxIT4N>r**&C-pv61>H`qPvy{^)%#Qxw3}L=GSJ54 zGi9H4P~lT|C7^8hVu2 zgp6X{k4-2y;bDRJRI>%F5~PI&YKU-0kdRrycl|JB0?v*n$Hh#DX~)lldxJEOoYM$s zVhU}1$^w&A$jyO>i`{Ha>bzgn#HcYbiLS{L;&sdWH8~>D^ShJ!)0CX6-lK{gdPHwK zxvBUM(yhSUzjVd9<<~A(R?P7J?UvESC4ss_oC~yd=fs?H{eE}#ROdAoMZfoMb<{cj zPO0(zhsma8JLVeR>T`Tj|J2qOb22vWydk-?v+YHj=gv1q?2(S^lG$r;)%hC7yFDJa zwQC~uc`v{U%FPb4TyW+Ztd~e&9|4`GWVSmR{B%ga1PgDy{Vl7~K7X=5cl6`d9=6)M zy56-*GU(oSPOG&M;}+^q*&}i6yw|vFtKYPhW6uUoyZN=l?^?anN1ThS=+I+{u(qjX z;^4LeR*ow@ZsQUiDSfu&PDOdO?w-AgucHF?k1E%U8e6(KV%=M-U=5S`?H|3F(rZSx z>$_z+4!Zg=j?dmqa;{rnZ2j#Qnop0L+F#Ll7ye|$JnO(kPs5#T)1#!WTbr$^jz63{ zT{^Y0f17(%qB^@B+Ximz&{oHG?ejth!S3C5h6W?krrg;Ta%hTEhPl|m+G$O)rA6@g zCN}q12JV@X6<0dTEFj6_aErp{{iV{+s@@EI|6p*^=I}GYQQa%Gh8>x>Le`}Cu%uw( z!;UHKUF|nsws?Ji#KTC9qT!{lhrN$IFy!rdVkFvft|0T__N}*WKKE*}L2$yi)6|-w z`=2h(@UBbP{N>H@MQKep`|pvxHUHMFD!|BPpH}6YW9Gk(NSN@|W0Mgx5~ohmy|wPy z>qjoY<=*DuWZj4f?ROVvUR;o)vr0QSxwyaej$KV21R8~R8xk>Yj!t0Z>Y;&WG>&PL zP`^3SK3zJVt`=#A9*F2(mT&kxr~B6M^D8W~vL4iiN-lkOA#0h~r)+fTfn_#V^aD3< zj;wq0_NeFc*O_b9WG`FZ^=;*=7ZvAw`9Ap7`H033Jy+jZ|NOw4ch^GpA6S-J^Qdg_ z#C>ir4#-|zO*ruFL#@MIhkATn`}(}^GT+qNQxDQURF?>DRm8;~?j=2RxOjHRzRu3m zc0N3KrTj(yfkj6hdX{YSbAOZc%d?YLgf|OXKRWz$ROjRxpWfd$O`h<_!MmNZYJ&_) z%f0WG2(8?E)|gGvy8YealiydzE$I2IthT)5hJV!+uPH4H2aS8Tz1fbuUxp`*ia)!r zUw^0mGsB#_yw2+9p0wdvSDQh@vwI(0G}7?l4f~s2ZGX$jI)26J=fbmsK9Y8mTKf0i zX}o0BH#fVk+BC4Hdh6Voy3>kg)QQ8|W?eoLw6df!ai+mItvbE3D?Ji@9!#74xT(&f zd2TTyd`kj;iJ$o8=bLk1SxBs(?XW(Z65V=_G;HDNZYBA%pKKlL-LudA!_E7cFS(L^ z)Tpmf%I-yz4`t`??{;CzagDy-tKV528npMc$@JnC1$Koo(~9gppB=CCD&O$d^0$Yg zsEra`g+?>_u0JyJ+q;(@JRe>0;+p^m%M%@s&I(w5P_zAtFUX7&!I7Q5OtCx} z{iZ0%BWUCu+j%?YmM*HBc|6&4RkPsdUXdMVcfZrgV8k)eb@SI-&hI{aen?`;;krvh z)~~gQb+rcz6D zOBUTU3R*8*S3O`=QF_ekYjYkSt6Y1rvM_00&@gFM;`TmO$E&RDqK)pZ>~ygzC2rr? zP1jETF!WWp!<^4e+YenRn|rj!B;BO-zx#!SImSI&I=SwCl15)Uzagc|4?eZ*YG-y~ zUa0-B?yZw+je9Rkc$4W6cr4?Ijs63{<&}Bs{R5=;t=jY{9elFgdB3oYHj9T%Xezq1 zw9RF$At{%S`=5I%ttb;|p9?B>UunBEO*7;4&cn6gOCnosaK75?T$ijPh6zDq>Y7hC z7{6njQ@V|Q^_(>edU;B#2W>Oj7V~~%`_%zSr!G(5``ybgyKgr&wmfR|uU4B1_x-%; zz>n^3zZ#GKF5TS5(fp3j0NqQ?)?Ms(a#QZ4D_6cc-C;nkXZJ~0JzWO&k2t?E`ckvZ z4qFUPW_qQ}xM*8)#`RS5<$*Qp?(J$hba!H~L$OG-FKhX#$IDjPm|j?rH{^m*#aCv7 z7Dr_LzJJu#gPui8*Yq)6cWd}B5wnL~ZC!Bw(Cv&)zE?I5a%tAj7ve?uqhSM&YG35B5S?2Uv{5_h@JySLDpd zK0WS;TeDfuGxpCoo7(@}5z{tF?Fw_cwOf@+?l`2y*;-t)czi9SRI5p`c;?T~Yu0x8 zuqm_l&JPbHCX3f;9l6`h_hj6iq%H^2rk7>>yrzwKSn?O&t@`HL&d7bCXIFi8%H5){ z_b#^|4O)DEHDup_O#!3Nmg$}A+v8gMXldG-+%F?9Tjwt`yWJt^{A-f|m%T@B$}TFC zZ9n2xzAWTW+Ggj<9-@ifKLm}v7yVOFyNa;=IYlw+E?Aw}`Ah93`mU(@(ZGOnS5)N^ z-LpB%Hv^vqxCFPX*mqHypZf?<@2-AL4!ar6teHMVoRDySuU@X*jqlHFyr41jo|kS1 zUupj*Pjxpri(O|${kmvu@xrBLhNC=gy2q_E7k7I2Jih@Z!LzS+9=&Dc z^mz&1PmRaq20HY!lMZljbxKnhq50&%J@Vwt^i@Lr8~pOPDx0X5!??@RToNCPm<5!^Yf`!AIQmdero;n^Eb~w_ux} zxXr`qrSnQxPCa;hk<_H@%C2TmO7rTe@~f z*LerG&0VT9(sxC-NfAcg$G(o1{+4{=%vZJPF7eufvcKurb#eDr^9R+GW*V+Pr+4_a z^OpR@mR`3Ut_B=0ob+qn*DcTe7#BBbf!n}uwVYEodn~Rp4^Pmm)$DoJ%{jYd^J6Dj zm&aKf5{8Z0`XZ_G3CYWjFYmpzzweoo<@upSicV*p{Mv-aA)$c+p%Lt!GS7xwS3v=+ zeo5fy3rou?97hAF?vL_~9DHfa2=*|T9;v95dzk`ry;7eB8LAgHUKv8rU0aUd@lvA$N?O3vJ6lq9HMy4_%G16LR4K3WLZpq7HyHP+SPrTQS2)`!>YRE; z=3;Os1ab^qu~fofO%Fl?HK|6{ftOBv;p&Q`IzkqF7?Q=A(99K&CUaRd+~3xM72ak< z8|;K2(}H=IHoZp->#EucIk7@cMKVEkZ>=EU#kN^h8ZaQ$wkj_MI8NNe>Wteiy@Y=>QOu1#~axBA?TZXNQ zWteiyu)bJ^S2WifLh9>Wvrq6VR|{&uh}yViOpVcb+%m>;c(hO|V=Tuz3Re#Axu_4H z>A7Y4^<{W(=a%6+vnYq}!gI?^>&x(ccy1ZKh>CLfPCT~^-#NuHv}vROYnuVjQ#bIX z38EzkBXQ7wu|K<0bbWmLK!NT-(U;;21qyUevKac@Vpg9+Ef}z7SR-+^MJVac5I_RAd4g(+1k85Z=kqMRg!4gb&YJQ0Mw^M3;z3-P#xD z`bCHOMpASqir$twPNyj8z{7+#_+A2W7EFVZL)6NjG2~}Z+%u`8T?2QOuRZG=H&p3R z?d!-o{|Ppqb-*gvz=c1w2|i!d90vcleVJ513Sjr8fB~Rkc#Z=BLrhXBFA);d9BV70 z@`z7b%JcZSX}O*}F9N;9VC7 zKD>+KpnzpKkH#e#ys_Y5j~hF9m&Us>?DN3;TlDXLAn!ln|CR^v5dnT$p~Yh1MQn1a z&EK_XF6_1B+iCvzixSX54%WW~|DR6L9_minm=t(e_AOh3GWCH)rznuu!@jN}Wy&de zDCbKVc~iVr5P!vgWhx@Kpf7jW`IR-Rr;q(uMZ@Bw_+gc^Yq z8F5^?ow597ZAhHn`dl$-Yrp-f8_?3BfSDbvpheP)AjL6k3q%~p_Cdt11XMkevsl=*BeqC>p~&L@h%xsZlLS{ zl9ptp_RU*#g3iX*;wP1LGHN%5F<; z8DAdl!N8=SffB4M1|Nv16a4@oeFGfO-W?DT?>0oNw;M2F9?P&EfzYZU(6))N<}w<7 zX=oJ8Vgn!@3u`r_VeY9(xNkk!HJXq6Jt7~_#J;0}%0CU*UioO?Ulcx8|6ioG z0p{_g7>VyFd%@8K zMkNp83P=294p%rwDjw-^OA2XEcsIB`tQGozwgBoqVK2z_0Gb!j0$>HvpDODBG=Eqh c=>hWYQ04_??MX*iF+?5ocmT;i;UhfoKaUixUjP6A delta 1337 zcmb`HO=whC6vzMfy*qDal1U~u<7jk@*2Y$2VrPtLCpIx}G?6qJXCi5fXcqA!rG-{S zMC?Gx+f+mmlbjYRxGcp4Oe#Sa?IuE@8$T8z-B|ju(OuJaAxe|i|9y!?MHhk>e(!(I zdH0@s?tS-N?;GW1hg+3(sqH5fDF-m;`@Y1iR5Z5W%w5_!sYV7?jp|P;E>3pNetSpR zd^NpDO1dOzt*vu0d8kWH6Qh=rQmEu)O$Q|pJL{#+8W>tl_cc;S){xi98)Pk6N9xIX z(m)!?2J$9JlMLBNOkJC(&Ezfe_Cl`ngf#9N@E-8Af048nH$-8 zceG14!3p7qitFL4F5oEOcUbsNU*!|{gY@GtVo-Su;vf#;7?F&#SH5;!o!H&6M(#Lm z?}krs>8JPf6*EX+237EfhM5a59G}`6ErjGkR`bWO2dZI6UyNLvw|gvP!;!c&i|KRh!Y1`P{|>6oKo@L%x58}{^GL2?8i6v&zxm~ z>j(Oa-xqw8arC_~xPhPzL?czKqw4<+2d62QzuT*=iKv9#UX_(yZl87kPr2x(0nvSt1olN3UT6twjy!W&GO=y&$+b*&Y>>Y?Y8qco znwsaPkr7=#+La7n!7n$?e3g_HU1Kd8zXe6#kDKoh#Vyu-ia(k0)l5w_h)pEJJ*d3!~mb{c|vei*5sA;OXKU%4k)GlhA+DkRxX&04;7z5O5>PaPqo)6`4 zPmDy;E<>1(jg2)Im9f1C=flpCYk`dq#)E6e#2@t$cSlNezCql)J6bsEwDZ-BV!ho{ zKNecml$TGbbzd@QPKs&fuHn@DorC5bpqO*;2~l!;$9j7ZN2I5x=2cVeM&3Qmd^RG> Q+bBcQq={AwS~yGJfAKf|iU0rr