From d1e772cda51a921330d69d9ff788d5022e7beb50 Mon Sep 17 00:00:00 2001 From: 18188916393 <2562295436@qq.com> Date: Tue, 27 Sep 2022 11:47:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Cribbing/service/dto/CribbinginfoDto.java | 8 ++-- .../service/impl/CribbinginfoServiceImpl.java | 45 ++++++++++-------- .../src/main/java/org/nl/wms/wms.xls | Bin 401920 -> 437248 bytes wms/qd/src/views/wms/Cribbing/index.vue | 18 +++---- 4 files changed, 38 insertions(+), 33 deletions(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/dto/CribbinginfoDto.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/dto/CribbinginfoDto.java index edd109a..1629e3b 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/dto/CribbinginfoDto.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/dto/CribbinginfoDto.java @@ -34,16 +34,16 @@ public class CribbinginfoDto implements Serializable { private String product_code; /** A长边 */ - private String AlongSide; + private String alongside; /** B短边 */ - private String BshortSide; + private String bshortside; /** H梯形高 */ - private String Htrapezoidal; + private String htrapezoidal; /** W厚度 */ - private String Wthickness; + private String wthickness; /** 当前垛盘数 */ private String tray_qty; diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/impl/CribbinginfoServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/impl/CribbinginfoServiceImpl.java index 22665b0..6501735 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/impl/CribbinginfoServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/impl/CribbinginfoServiceImpl.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.data.domain.Pageable; + import java.util.List; import java.util.Map; @@ -25,47 +26,47 @@ import lombok.extern.slf4j.Slf4j; import cn.hutool.core.util.ObjectUtil; /** -* @description 服务实现 -* @author qinx -* @date 2022-09-26 -**/ + * @author qinx + * @description 服务实现 + * @date 2022-09-26 + **/ @Service @RequiredArgsConstructor @Slf4j public class CribbinginfoServiceImpl implements CribbinginfoService { @Override - public Map queryAll(Map whereJson, Pageable page){ - WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo"); - ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc"); - final JSONObject json = rb.pageResult(); - return json; + public Map queryAll(Map whereJson, Pageable page) { + WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo"); + ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc"); + final JSONObject json = rb.pageResult(); + return json; } @Override - public List queryAll(Map whereJson){ - WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(CribbinginfoDto.class); - return null; + public List queryAll(Map whereJson) { + WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo"); + JSONArray arr = wo.query().getResultJSONArray(0); + if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(CribbinginfoDto.class); + return null; } @Override public CribbinginfoDto findById(Long info_id) { WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo"); JSONObject json = wo.query("info_id = '" + info_id + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( CribbinginfoDto.class); + if (ObjectUtil.isNotEmpty(json)) { + return json.toJavaObject(CribbinginfoDto.class); } return null; } @Override - public CribbinginfoDto findByCode(String code) { + public CribbinginfoDto findByCode(String code) { WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo"); JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( CribbinginfoDto.class); + if (ObjectUtil.isNotEmpty(json)) { + return json.toJavaObject(CribbinginfoDto.class); } return null; } @@ -87,6 +88,10 @@ public class CribbinginfoServiceImpl implements CribbinginfoService { WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo"); JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(dto)); + /*json.put("alongSide", dto.getAlongSide()); + json.put("BshortSide", dto.getBshortSide()); + json.put("Htrapezoidal", dto.getHtrapezoidal()); + json.put("Wthickness", dto.getWthickness());*/ wo.insert(json); } @@ -117,5 +122,5 @@ public class CribbinginfoServiceImpl implements CribbinginfoService { wo.delete("info_id = '" + info_id + "'"); } } - + } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls b/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls index 36e7085b26aa9d15ef39db2d7b2281efddad988b..e301bf60e3ab1792372d390c625140b45d9bd6da 100644 GIT binary patch delta 40197 zcmcJ231AdO_IFiJ_b@q`K!6agNk9m960V?#!)ZW{aEgkO0D+)E!l4@k?cjkZDj-Nl z{|Z5O6?Yd!QGzGI1G0z;tVdQ?0S}1iVnEagO1|H#>YC}9Bpm8jNp-z`_3G7oukPyV zo}#xBiYgLU`nhY>fHv+08e`05&2_m4K36n}KdK? zo_My{gNT6J?0TSbPRy3O=cG-1e&>Ch7p%U2*ZkE}A4puCy2r=wSsl0MvMuT5-P-VH zR_7dPzWUe~jrg;x`IlX{+;Zf%CgyFQaB$K%pFGvNi+S1GU(&tK@6Mf;cXD~`48k4$ zPT~r3Z=AMh@$xGPcPS^s>HN!4yfEo{!o{+Gw-?6bdCQV-Z8C*0^U@{el2MeF(zRP9 z)BStY>g!Hj={E}r`TSQwrRcy9kcqn zyI3Q(?mLN{&2rg%_P1$Yj-&Li*U0p3ZhC4IG7|Y*@7D!S!bzUZysT)FM7r*K@;a6I z;Vt)_S?+0Yxa7QE{eI6Y|MD;YxcTcZ9eH%o8Qfo-Jg;e1A{+M)?W4nuR(<hnw87Dw0QpRsN>Dz{`1|kev@8kw&*(FieoR|&gQY_wra0z{r+?JzvFLhKXd7# z%Kg!=wS9ZpxFwr5e(-RHQN1D~E$8;Jla?L&;>O3K_g^*f;j3?(_S92%=j3gVJ+rLs zP5W;7moIj3^UXbD+ui)HZj}$eJ7dSfbx&#swtQ6h$#X5gx%+Rce;D!9zsLf?f1WZ^Yf?I zT(_swgMV52=s&(pZ~xMdEgw2G`R*=HoqXr9BZdC%eQVy?-#(^so6p}Ze{l7jw3qVV z`QWX;t$#E5;kMnEKCn;w>cgzO$dnZl)zen@ej(+Tg=w+_7lK4z^2kSBSScE^fv7S3&$^d39*A1ta`AWouk%0s(XWe3UhMnsfL7CfKK+l~d*1Gs zGcWJiZg<@NYN@aCp<7;wop$H;L^F5u^X`wDJsJD%j!Er)8vcCl2_m}X=2w624Vq1N z{POUM&Wk2IeDUs_qkCH>cK&A93zA~-l+4eq_JYmfwtxTa!?kaIu%U0^0|`C8dA8Hf zzsxIc`AO&P*S7oq(}a`5U%R%!{0{u5;p?(nP4E|AeDZYmkuM)k?)m!e*Y-|WYVP^@ z+3%a5zQ^_GuE_PflE3c%{*k%f%-ipo`q;--n|}XV{LOE3eyiN~z;Ek*s`+ijt*U`}ciM9Y6BL&MvQH+_w4qw{sRZE;pY&^2rAWZkoTY z_pN<@*!jV;Hx<11*^zfYeDIY)8FM~Q`{akDs$nJ32U~q$bZJnz=!;$dzIoQ7kDgg{ z^6Q0%FB!4!r+%ZG_&aPqHTm%y4pl$>k1bF1X!Xmnu}4q-bN_ap-RjYYk1iiPcK5W- zAAa#^$_x`I#uiA2=;nwcoW?%c=!)sW14ZnTXsnY$i z{E2OA%X!}FJgudErlzK5^)hX60s+0yQhUSqfzO~;OOan`{UlX8SHEb&T#cA(;H~_B z@t!j3udd7(inmw)l)t=*~UCayOai$|D;p6^q@Kf-_JMh{{=zMFS$TEuE< z82fqc%N^c2eTBcYdH)_MvtQb|I!lkY-tuZ*Z^r!}A84NzHRRRUtG#VrZc%78c!yu< z3&)11w{Clfcj6h=++BL}RYl#N+`~2Nrd@pb*7x}M2y=_J2J>odCA}|;<;w&$cF?VCmu8(5uON5t$;Xj~f z!x+Y%ZNgdOSjI** zO>jffW936R^Frb_nJ^uS;M!rF-37_3hjZqGR7EC~^pxe=TR`8c2BfI?iGtVN?!hJs{z|yoHc;Oa+h(I1wjtn%h_%SGT}bXXteM80A~phWa$dd=E73mRh*rMKzBWe zGKZzAR&(|#1Zwt>$(aU;-du~y2U9I5Mh1|q{UfME5X}215~56xK8Dr-OI^R7vk9=& zmJ-g^K|t^0h=+jpJRt>a@Hfs*z+#U)i6VrhnruWl`cTAALt}um{=r!v6lvln&MG13 z8|E{dt%RgwHlr3p!q=XI>0z=vU*K#k%J6?La`p-Ye6^Ibdr^irzr@*Kl;MXjbM^#T z?p36N<#xP=N(cc5Z|AHL1RT2qbq9i7{w8NlV7X`C=ImBjuHi1!ehBtbr(dC!9kp=t&r@>f>vHP>O8ryIYVb_(`oWSIAb*dg!8ugR5F}k!{E3JRC$p3ZF*ql_2 zO-T!;?cGcJFtW)uWBs+J&jc#&{)ZrrI0?;C~fgqEp=3rsSRB0twa|q@8V(;FLSZU z<6P{~((Dsj6TbDN7NuGJXmvBfzrYv5FND7Zei8g)c&n<$)s_lV>iYdk{UcZDO)mY5m`1G)o$YR>vsXLn z?D0!=cKv0g_pi`1jM5EF^{JP*Umv2g1y@RxHEW0#S334eeOIH%ifeUNFjr@liz%+B zQF`SZJ;fJ0@D7~~e@JJep43_4-zloH>)O}#5!@|SUL`O5AXZ)nkKcfmnlui}-mM#`M=aWr2#dD(=E*?LK$|4z zOxQytOER>cq3G&SiRMr0$&zL)K98M*>iySK+jNR#usw z-BOB1SghJ$-RQV3+9XQET-jF10lj5EbOplQAOlPar1L;*9e>KLv6mjvap@XSV7wC? z+O;F2kh2rkcn!qiPo<@lR{josM0_5os`Q$gN`$BqboG-I@z%i|x~Cg4AY>Ih390V2 zJ7|g{<0wRj4`;RBp(iG_Vm@{e?rtwh5n@Toni}c~HE=j%CGF6g8G_6<;1><>1j4|{XuTdn@}WTf)~FHs!+vb z*Z_uxfD6JdmgTUQhMYWMJ36R*bXT`JjVd1+;IhfKCPj(WR@$T@kaDi)Jzsq`xQ>J zXSH{l2D8}lfI=D@5~xHPd)NWbQf&YV_O-hSQkL>3*G>j(rbdM}Q^Rb89YD*tTIa07 zaCvzVVTq_ZkQ*vrqDV-kAZsEKNEeU3t1%bXA(=Lg>L)qssmW2(aysInXzJu=CQEX( z-xwGuUfyA%Qo!OI3MK^&g_62kB<5x4y6MCokkY8~i5RxgrL3nBD=Wpqc^R?Uc!PZ+IcdF4B@jqJ&x9h{LLGSBn(Zg{6y{*gI z_w>QMv9;lV-h#FWJUGI#0&tj%S5GzOb@cj|*; zNCv8G6sB59aav=m8qro(E4OZ??$Re?)#gXM=>FINDxiMWhr9GoTl1zab~csD^)L9J zkkvc-r{^}`9zB__D!SOZc(=avPsnqh%F~S+z^20TU%>=k6xB+=>)=mVpYPYZH!XnO zunoIu+lafXw~v0xoY3g##G#J_*V%W!b>@=Khu%EwugA83e#7d?Tdd39);svZvEk{h z_x`JIu?FnaTWP(M#aJKX9P7(O$+cD`7e0a(Le$_0nqZHh{X$02&7cU5pfRm5deA^i zEd6yCQYi|{-6|G^)#any0rFiv!<%Xg(3 z1e{qlcRSX#78{HhIMLN+Og;aaQ)}?R>=PrvKxz0J1kPO%mn!D3T@j`tc7O8u+tZG|6Xefq1>CtRAIv{NLf$EiY^8SDVI7vT1xmeEX_+*Fm zu-}G10i0>WhXJdZ=YIiDvhkk+&X%yrKEzF)9YLj7V8j0go~HWbJ^)-~!yf@&X2Tx? zUTMP>fQxPTGr%P_{5jx_Hhci^X221WEw0wZaawv8nyjza*_|FWmBJ2;gcFF;hEoM> zUGy`Sq#kSD&-x`i)_Ue=z1i#pc97zhcsz|T_oa#tIJyxG?xCCkM`McUldw0D^^;~? z;_-U$z)YA3u!fyjVIt6LsMf+n;7N-HVWFZ3>b=)i>+Sfw(u=Bfia!?v@iEFd^P+p@TcHU!~Y8Z8~hpg8VX@?niGgIvs*{m%0EEFbDbGm-US=I|CMu5 zlD+VQP1rl4l_rV+ek-#s`LEt+cp0YwbyLoK?`4(wgE#g5;hJI3zPX}&XXb5N9_Z*_ z`}Meuw?8=Np_Z4wdE!5V`M|sOzH(q>-Xk4}OTlXylVkneFMsIR%G6~?cV^0=HXIwy zS#D_;*pvS}USci!Oz&(m)<3xLUPE;WIk3bL7YvD(9+uXlxM=+f5l^vNKZ&EIJZ`N` zpXuwnqK3hVag~>2cvj0{6$aR_2f2sV2G(aKnx|{7NQT{Ju_W{e35IIf+6?V_Je@Ak z`fGlT3SX-)SvDd)*!?_HQvs-qvVn^LBOmVTO|~(R%!6&hZ8B9o$$AEbq$)0RqZFI% zWG*|m=(tQR19gZxL%FAsmy8wR@EiD1?p!^PBxRJN+I zE25J{t%QSmzvc(++-NF9wApuNX}-3MRamnR>djj24U3MB8?UW|Flu|GWxpzDN=^x5 zC#c!%;@CDYm|w&)M%yF=M#oLmvLUF(Y<2qX#n$RZG@To4O2uKDOGBqS6rHwo;2<>f z-#JRCQ)!Jnq&KTWgR4b!g>@@Mhij01=XD~w+}ea_9XmO4pQmT|K2I4QO41I|@?iG1 z0*f^-#wNYql;ti;r?VBcQWj}>NNLoYa<9t}DOcA@d8bx}lx{m^%YG}dFGBAv*Vjt9QY%Nwh9tC^4*^9L}q-%S@ zA=>89u2#+P=+V$Ag1u5Jc#=_aI#`p6F{307DWJIpfBi+@g9eOjDgRk_ObYZSYrj>U$!4$)G)3x+h}3`Q zKQ&@kZawym-i&Xye)}3NvY5ET1*!IGKFr#StgeR>Tq{um=7f~UkGL`T zTjfktP(_L2YbC12z7!?OMBF(1ec?=$b%GK#sgd+B;>5|yHrqh?oz^=}Ex1MYWQB%fMsY#2eCROg?+%0S|qs2j|Su- zSe0D(?t{eESZ#LbO`FvuASBuXtlB8_aniG?wk?suWU~VCdl5&|mSqT??aYVtgf9WUh!Vq5`&0Nrq;)nt zg+B=TEJ+@quLf=#yc#fxFPvGEK|z}!<2*1W22MgBaH&KGr{+^OgPIhH4#8)E-fQEX z0&fJq+R?auIQ<~3LK)Jw0y$#5l7t8$lz8GkfRx;5BxLX2Wo?54{RB`HL>u@x0me>2s_5q^d?R9h+;fEnrlys}3%5x_a^v=V6#N_3z= z6n%L;_|2hsQ)Ey^0@)GN$b62BOTzG;WV8@;!4>E^^AJ*W7H~FM%|YNY;H%-Y?0AYR z0$gn0`#`_4HR$NcJVkD7P1YD_76M849%0m`qe4*WsTZ?o}EOL#%QneZmOGa>~M#dR>M1b$^5jQqeC z)%ea#f;#Yffv@}(TERIjw-S8z*2bGP z3=!pagwqnKz?ap5&jfyBZAK!)k~-+KLBFgH`a<9felJ&N@2vx01$;GTeB`1{G(Kf&LL5{P0sI@$H;#Ajj^54L|9g*9*;I9lbZc#nqW1h4K@Sk_kJJQq>l(#f1;->Y~EX?431 zJ_A0}l_`Y6$S!zAi@g_8E>rU$zS2%e!cza92^^(Yt^hF6DM!i|;ok0vO)-7(A+{Ju z5=IRYL|BRYGRmNhoaPW+1#rYb(NT1N&94nqqYP+h@}{h;dT>?I>B%Xjmm{Dl3B5p; z5GOd*)u#YQ0?2(yNtX#+F%h*1(q#Zg=@nhJeUCM}a3n|pa4RVtoZ`O>xJ(ll48H-w zjksS%RBeKU#lR5*MOS9uqiO}x?FFug(!r?=DuE+@_z%!gd?8)hNV>j0L{)==7$`!D zr+c*?RHn?P2smL%dkkOWtHhQ=Q~VhW)y;M^c_d1jU|Lx}>GA0_H7vHLn-oK?1STp_ zW{xtN#E$g$qI8nupL=B(#l7RyskqPb)1%HWN$8~iOuDn*ck1_cqlRr8{9K$ zBYR?xJ3wj5^hDZ&LAXD8znpA<&04I8TFb3xdqbDnvDnZxA-LE}ws&;PWQ5q!-D|_N zqg!Rew4+;XC#D@;Q6lz^E_Dbhvjho?-Q!dVi{0Z)8>ZdkY``WGh|CIPgxEf&#RB0e zvtl~|WmY0#v3NQugeg^`YAfD`dp$RlA_OZK3(^Ao*$T2ryS zaxw=gk7py;UP+3oH$oiMB)pf6u-bpBclVB9Sy+7$ilXxjD=EfkW-b0yk1)HiVi|?f z=qVOy#61(#6%M=)b%BKH#JaFl8z%Z}f*pq!n<91Kt~itp`r&&4%q{snk87 zcqv)7177KX%Lp!tAbX19Bl=iWhbo%}uyqXVP)EEGvh)x9M^CUWJFO?`c)n)i7M<2( zaSHF=(|UIVFU#O40@RQMTCbrr5?DU-0ai66{a4fwuQgEyxBM!S{{2_|FF+>$rcY_< zX4|5KbR?X!ac%A$?vFHD7%^^E-3Q4<4N0|5 zH8fV3@yy#-qUdx}f(_rvPVy8RZioHl%{H9C`m+iNL*sZ>Wy6Vps~z}+iv>?Xa_{;#_&58&vil9EuQMf*~%%&%8iZ8R0KEZjf z6^)EY{V>~h*+a*T_!Q(NX(F#;{cBqp?AK$-Rw@?g(C{ zyN|5T8yn4_v45cTnPwzgE#i%)F>6@iK*1VEh$dS7=dT8kAl65Nk=K5$}y=6~Nk!gB=7`M?LVCKH0<=N45D> z3*%!K)#^6JI~1;KYkW!J?H!CLL#t?Jt>|Jj#h#lCGh`S`8%^Y{Wk2f038i0lF&(H0s2`H-c{r9}nLI9?vRS zGkDr^Y7UPB+N=e9OZZmst>N3i`&<|;lK{|4wKu|c@E5_ihwlK7Q{Aj1d?)zM@I==Y z;Sl)l@U)+m2A>Y!1HLDGFZdLA8sTX4>kEG|{3Y=H;E4ylY(kr$5Xg!?z2|WPrAp{SzpZFq|;f) z#30-p+awA<%NK+F|wM?|k6{7vs5 z+?;wa;dFMd7zSW{JDe#tOicGo4PzFDyyvvNPoxNr$o^+cV@r)PKyDG4ipW(O#jN60G}^Lt8eLbo@^EdbY3y#;kg>P43XusJ%@Xht z4cp;3ZLv!`ig2dZ57(cKiyYjLfs>o*V3)<`x@c9iRjU+iNt3w&O{h=asYwB8gqCMY z*9$TKDuf>{C@LYE(mUOuH>7sxt<*M`8pX&AZ(<;_e!Yvq`uy}hC^(&6ZwEIj|MSsX z3Rqij65fw2cWO?(dpPv2u2b)&2Cc?UXvqI;dY7NK-XDo<&aQVTH=(u(Db7~jbRNTb zhFFz1N#7fBp?bG-=q>G`>bWZKrA8rA$~Y=+v+jCcecpQS5!LPNdWUigDQ**Ow61zC zC9GZEBt7-GPMfR}ZN0$VAI&ZS{lQF)4j`W~vO(L3y=k{5$qNyz$en;Ic{#i@A1e_Z z$zUKn0v){g0wAnS4wa3Xr^YI9<^nq0yuex%>cZrLeqaQQ@&Q~e&5^h~V~6f%B^h`+&=2mE?ri}f09i?7$V ziEA0I2k;pCYCQt8%9SD=;ZE`*69*aA39^$s8*9!7MZ$bn5u(4tD?3C+OqLrNxMm75 z9t4BqoSsjt*HVEkv9mm9W{$kdnG5-*)|fRl`wTCbM6&f-3c?+(liY_R2J6J#NnV0i zaK1A<0YNB3qB{!VC>@ER`pHV%KP?0;frvA;5dlHZh%PXS4RceP^_sjwIa6eqA~KXF zp$uPl5geLDIJ4;5%zg(iQ%V-|r!bSeV(a0xvMwdfb7H_muVVcfRv}Dg< z(Mn5u4L38Tsb^|EK~^nlLVe_$wFY*h;T?e`2L>PqoTPTUK|00(uX4iO z9DIVX$&LqaSRBolY`28gF1F(x6oibEgYb^PG6tH_NN>9xw6S8lIKP6hQ;+deIbnXO zzs`09)<$@p$^r8piX7_%2fV}~P?AH4F%Ec@1D+dLS7F)XfS)rRH~SoLoI`^g2fV}q zCtVs8Zj1w->wq^n;N!GmWVg(HGavfJK%R#G^U7^K!_5J*3_kqsiC)9=c2bZ#`I zbY*vRD+*nmNA5#h>4{62ST-SN8ysBe9KG!wQpGSo(mP*>JcN7c@B*bHJ)ON*o-=wy zl1^MMY@(=@RGHA#D^BL~#ww1nBvL~-yk_aZ(vN9Wa~vgbsIf&a#x~*X z6skHMH(n^8dVrPUvQo%acoy0A#jBhdqn9X@m$K0r;JyLr6<4YqG2#`A`pS_9YLt8( zgI>uXFS*kB;EsV>8On9pS!7LfaHSVJl$TuTJZs+$N}EuwE6>6;$HA3e5m8=prBlIu z)wA1xU8&A_#0w;=9H}=rN@s@yPcNI;-mWvLB7F&@sxSQ^M|yfe#r7(_D1nV<(TdZ% z$hM=GT9lVs(TU}b^w>zaP+M(23s*b>3pjc`MtRAVPBSk|QUn36v<0b~P1%j&-4hwD zv*u#UjqY?dE3iDqMrEL}VxyAgqr!nc&^d!XK5Pwp?kSrorj}=)vlSyN+W$KDobAG= zY~~-CB460lv%D@f%(G0S|L_$0JZ8}5g-@ZY>(b+b)iC5r0QqC4PK%yDzG69dai9s= z8#8J*+5Dr`NPv~YaOOqK)U{z9=}%&Gf*CNHjfLgR_+T_ z1GC(9VhaR2Zs+c;>glYU#c_eHgSKF)^OmdCx$ZaFb7I}9uzS%mB$l9=8cj%cYPX4v zR)CI;O*~}hv{g9*SjQ5Nh*)r?7F>yDfuF|A3=z=&9F3B+2`gQo>lX)IxmfMH#JgoK zagf@@Qjo?acKYz;C0IsdbbeVA$0Ue{n&Qv0hu`dA-XaUi!J8n!dNyL~{no~|x>)@# zPIN%u>4Z>c<79qf$1b)*wJn^Fd-;H1y;cp=1ozbF?j$cX8em7qt(V|#t$1)0x}cz7gRMJO$Fd?xOUx!EzAc=5$=bzg;dJNbboOTr;{wbSr+Ulf93PdT zcSD>`@gp3;PIvat)9el7L=8{1&K5=Q>}InmoLPIpdD=F9e?Yni=FQH?JZY<@Nx zp#f5zKHzGBCn_y5-e!xPb=d&-;?*VDnB+66YJ;{3@fAePBiabe=qp;h78_I48r57e~oEGdee(@BR*DPbMbQ zl1WKF(u?$=EQmF+Jc^?3?*nk+NsQ|E)sdB)}QtytMC~(d_F)B%G!!EQ=`foGKVLG@f2v z35rVv@PT;uqFU5E24v*wf6nI>UYiN3tqz^I(>Pv0HgSfRE1q993YvPp)ym#n> ztq9(#(VGNEjYv`cBpPK;X(*eST0t#k>d4C!#w9r^A?yGa>%~>dsWKBpMe4uG$yJM zjUzKPNlNuVF_fg4h@Po!6O2e4$tc;@&Do@=F33ekF(B2VsPfj|qQq>Snuh8!sJ*K$ zgV^jhNN3q)kgej7u`B=*CcI%CMMEQcWiOoY!RColFD``h=|}`ZBCpFrRK}DUWu&Svr3u6$TLO-uC43}EDOaHvk)=r%Z2Vrkf^3p z4EWC+^+$8+8RgjD9%7&uHPMri(Y`bAN(34dH9x8t&f(TM#F8GV@Kj6;UUs$49)z0Z zTESEHep~H<>B%}OVgqK9exfG+e=@x+^$w!nt6ht9Q*@eCjdp2nbjhk?4fb>?c29RU zJv?HM;`gXwUibu3KC5>YmKuhn8mFR34cVPj9}wD|w-&LxMNa}HO}n{tw6%1071W>C z)~pEF`up<>?FmiQpUcM431U$7lE$uGUU(RQ?5X8bMWjl&Q#&R!l2tIE*ZHbt1{&L+ ztJnFeWm2V~5k6cm+2`-n@cbt*en}nW^&?e+=t?_drPN8B`y?*TBFw|RJfTrfAGh3av!%Iy_MQ#*ipUn)td|*hj}yYxrJ9#CDcTyqGpjqw_cN~G#8US zg3lOY{@W!m!6vrO`F?22j>hs{wd@K(xe-^6zHKt*bbdTORNWV?b>%qNHPC&@^{=cw zPYNpoL*-ACNI48qb*VjrqfGutiziKGZ6WojWl)i0`i^|faN{{OR@yjqRWlyKsd>>> zp$(~_`Z`HP>uKu5*}7}fl-Du-=)2Wg50TP zVv24m9fqqCvCFMnV2MEHt6l${Mhvyt&@fKjF{>&93uzO%07%OaG`S70Nj zX39QwZNXINiTHXwP1ELzHSJn4+RL>L79Pk}HDk(0sX?&pGfWko>WC(|Tr3>rj3q}* z8Rce7_)bs>taFmnPS9&EIaAaF6B#veq3md^Aih*^j)@D_AA#=GCk$7+8ma9hj58>; z>qH7%96R+1EL*1yEb4~B_R{b$R=L3AeenuBzB3MknE2{3B+|r--kQC0OPz(2R0Rls_K~3x=Y2y0=n)qq}9wrDS4vK50 zEgqTx9A3~}nU!+4oq>0?)!Fzu(V^z9-~#zn_!( zT9D#)PEL61Q8*!i_{}$Qt20y>;o8giSf0uKyywomK_5s8lN z7~#(H<#LlX#+TfAT%cv>EGc+^hTa7xXZl2d+p~NE-Gwi19t!L+>nx7iq;TPa*pH}) zE46XOR+$1nWx@B+7L0H@I~1sV;f#Ee#1>1jReTJb&IulqgJl90CdkJ;n?`ONDT}kY zkvWqB$5HePvP=Wa{|+^kvJ#&-YCghYjpLJ0m=2*>rI81pZr#^hCLl(K5`%DPiqN}o z%S7On{2eVRt*}2#(~54$1x<4{%S7UEY@AOd5NVQkcIc69>=Hh6|!} z@JV9ZUdl4j_`vPHi-LR(+3n_B3Ym(nVnp?BM@o>9YKQGqwyr$U4i!CVyP?y$>BE~X zb%Q&)Nc#f}Hu(B7qON2^w+qjRD*cYs`qG)G$YB~`tYjO~YbUTvDVAwD!UB>a&<{}$ zwxj1clPSAVxT-fk(=A<4|FCTA4keHcHNhPjb}EP2!jcV^6!Z=2#vvaj?>vUCtOha;CX)?pY5Uaz6(l!yemmV4zGJLN}qB;>4PWwG5m=1sTYvm&yJ^2-sE&f zU&h3<6`8(EsQrk7Z02Wij=q3Ci>c#tM#AFtra07#Qj^p12?R=!d5#ppcMWt#AH>vI zmP~(*r@A^KO`*mz%p_#~H*H;Zqa%q`;v3S<`N~_seWF zjtTQ~=M9}RZ}uoXo5fOAvvY2oKJcam3+CL|)BK7oGaXoGW&TZ-=a;E0y zr`_L$^b&CT1AxOa>b;~kgFd&{#%0`58`t+v%1G$N*`U0f8)xP|u`8QJ3XF+g%)D{d zf>}BFvu?@#_bBLV6HXbNJ0s_&`~}y)0a7+);FOzl=1mznYx@5RvYA)V)YRD61vyjm zb4TUO&iz|c2koG|d6O^6#uqYdsu6>7=I3_Ul+7ACQ@5TsWqQtnoCOODa-Tu!0QCf- z&Uw!|eav{Dej3hW9i+>9UM=#1Aaq#Vnta^2$XfEXVQxKPbkY&HOKZ2=d}ht=oE2uJU6*$sO6gPp?}W_L{J;Aq8ebX12p=w~N*-Z0LQy0S%-* z{lVXd@H6ScLrtP@t2^9UZG40ee=w`~xX}}X6!sy|Ox^bS$NKMaqn+jF?#Q@WzdL4K z!`&_7xcC7+nx%>NOTKhlCU@t+2#2_PID#&kdw56smIQtCYaG6On~T2%_+5y2mda}V zOpCQ%b0>GN7UYfC1pH1mjD(J34z9ED6B3lD*0;K>D$Sju_5H7v=yDI^gG#5n+;3~1 z2l@TX&EN7{X>NDp=;$GZ({l5RI%hK%esjp}9y%;~;=ln}^X6QiJ8i-1+fkK0^A}8? zlb^dfo8ZwiX3UzF+vKKf*1$7z9JSN=gBs#ynGfyQU}JM<44FP_!BVtcceHiD?Y7Q?G=L-flb1G zDW&cH+LiDY~&$aNT1Z(o_QZcJ$Vhyyyq0rt)7*p*Ll!nOtIeo#xTsYGU|ICjC!00P49YX z%-}%KM-nOHs+}7eb1*EW*#=b6v7*#aGV^kC7Ua&JKYwoixG`$Btf|B@cJ#a)GzUj? zbRe-wsRvI@cSNdEm1##VbVR9Xv5Xo#cJMf5J~iRBD+=Y9pF3dsbR{nOH{tB~!2{C~ ziNvB3XktGG@gb>4&Y3=I#=?3s00SA{PV$Y_uwxVN@n{};)&LhXo{#64m&4PSu9eFJ z;GCCOr%N<1-WGTM)qpRu~>_Ri!%cxkFHk)at$K#|`xqK3qOGp}zXG~I%y-MKS;P(mun4{%kGdkTOO{8 z^G23~;UyO<3*o}#F{Ma_5Gc6eg9V&4zDQx)Es7S#K72xJEPhX80Dil72=2xM8i<4H z1P{Yl=3}Fw8G@K>OGt_n*YmugERj*ox=n>cVt zpKgOkj8Ns~BP8~JHEb!xdo-I|)RecPiB&xW_X>L^;DD;Kcu4BmEs6efzo+H=-M`4aR z0)MtaqNv<`Xca@yP6voMv{RFH2w~PCjM*SGlacrvf`(1a`fL{P!UA#qq^fjX>99b8 zMANoBIb{j#Q41GE#gm1Sb}Ah#1&Zy6+*54oHTFG8bvf$FD9Cpy!W;272PzJ%tti@g zrl?WlKsz4PH({ne18>dLNjh3sPWEz&Gy@xoQ`szJK@}z3FqZGp+Lt@L)$jBb{?g|Cd!)>MX{Uq`Fo0o*;xqtvS$@ID7D zZEBY{4{Tv$^Uwk3IN((dc!vW%?ts$*59JukaljiKFcn~$vL7`tX9;?PA2?v>XXd)F zUQX1G>mo>Uiy)4E2rp3^5FziPDNxU{6kpZ5Xm$g^@T+zlY!c0G2~6w}^spPQrWRw) zy@Wbb^bNt19R;KG5VXPumhiN-Ku#^Rl_5fZfOYQd_>8s z217*KxkN6p<0vy#lj#u+De;^m4xb&h>k%Tdh&sgCrgb$A>$mM@ul2R51Ij2}g5t|P zp~>^+%vms5!fCxH51BM*$cS!3CJlioB7aSG*Z3$aZ8+KNBZH5hf?A-55}6LLWuu#Y z4!FP;DHtdvQo~9_P3N>WHZ8Qca@LL0=lo^<6&f`eeDimELVZ{#0ddRr_R= zl68sF0L+xdm7$+=#Br4zbSo+2p#AAi2|HqMb=OnZwD7+6HI^)cKObvnqg_TsaJ4Lc z_S!Rg=+I$zbqPCHm%Mbqx6u?7uWWy=8k)5e~W<|J-@uPV2CzB z8R9vIfzst-b*b;%o86C&OzZ(RGTox(;%f{oZ2-*{!Um;^9DHL_c>s%V=_Qs zut+NS)yMCC=)MuFs-HgTA04q<6-lbCp;vref0$b4Gr>WUjItzRbZ#nu;;oYKUA#n>0uidHa=ia^vYt}K46)o%C7%>y!ZQYMdN5ID&mx?_s<2V z)%2@J(kZ3Yy|YbwRiv_u>Vs>)eNO%qk5FI%ZaI-b(K#jJDXcz z(xuvcE+tc0l&^T~nz_SUc&#TfAV%euEmyo$9%|O5@T$TN?J;=ajXAStO;d)X55Fm= z>_+#rrcw97({cFvdo4SfDvvt#=y}#yHT|o*eFRFPPR^=0Ojq){`>f3$ycf5jj1 z{NeLwJ3!65 z5a;}K+}=89Aw+%v?fep1RRF8TOr}oXGMv@Gvqif!JgT78Lw~zwcvK6;TsXH-?I>cY z*3=sCqfu14BgS2$@j2F#BgPn4wT98V0#S6V-M+$KM2-4x*-ZO~%7 zX&6b=_dwdFv9|wc46uCBZg;6W(*3flw9M=FyVf>!Z))5pqgUS^Lo@pJ>X9)ty~iN( zYvbLSyj2)G;{@2XwHC&^7x5bF$9Ojuo7}p&iF+*fg^>r^i`KSwm#uB- sUZ6!m?w0P`j6|fGMe$cye*D_3wfCUzv9emZH7B@KAz82~y+3nG_Rkl{H2^5;V3>U0ykW99OlSh^j86vNf! z4fl*J8R$;78FDW**(2O|(KzeDZv=Y~2pRnWn+ICxdX>LZvLJ43;=>%9c+MMjTj5QN z`*3XLjGW<|w;RxIl)E~Rq&FMSc{UKY${anN1DF$B6`bc=-b+07Pz+N%8FfXB1X*T8<{ zbDt^CvGKYf=gQs4dsC8q+km)c={eGu>15k`1Hy+6whz90DsV~HYxbYlY?$rTyV(n$ z=6Bep@PJ-cb3#4+CYAY&?5GXDT&x-2=>4xo&dd9`cwO|u#-ZAMt^L^9+?T$~hkYiU7ni$6n7G`{J9*>E;HYJvW0pMkFPlRgjLV|!xbjkCg`=3xsXmuy>6 zHn`Pbk3WByXVEvd+5CR{ruz3z_$_{X^_?cHJPpPX&jf~7={-1q3OjV1l#D$?7x)x}tgEr#U%d@t$m zR!jPA_S)%U2ppf)npHolc(9|O`=}QWUpz7n*jb`p{Np#j{S;qa_U_7Ts#W*Zd-+Pf zjVcQ0(BfSk{T)JFp12got%@&f=sULP*6LPyEhj}_J3yJp+3a5~pxj_YY zyIxJIx!a>+SzZ;rYjdve)8{u1ecSKw-n#+Qep;zYZcSq#-#5}pZ z(sNqs?Pm-3XF5A%w48LOU>5E2uH1>IHdCt+QMPEGX-}WB|vd--9 z(xYKT(l6{g*7;78+*RmcT#Iu+{AdOjKv#*4iE| zLyOM(64-zidHNH0gcfCYATSgy$qgVd7A+av5rLuw6`cs|M+?q&MtLp3!9W5_5qM%( z0^JaJc{c=V570V@zza0sdN6@+5%~K$0s#p4y$}N42y|~KfseD?0D^iG&?4gHeb99n zg0tZS<{|Qwz63lF`49aFOhe?Z0|=Z!q}FxeAcf`2^JHvELUEh(I7iKOt}&fgH~vphF<*787tnAkUT%n1r61mrLLo z0(zQ&viP4lMn%Zdze5&1bD0n=MDlp_&tHf=sB++3CzS0&Mn5-kHET?5XeB!8PESg zPFPu5|3RQtIe~v(VR!G5t;VREBu^toTtjyn|Gr03G(=#dpOWpCQ|}N6dX8bO;etiR zvS(y*BWXx;0UX|8q@%EkEqoxPGoL&<#CS?8wDz+6prruU+6z$TYsB_X8#wgqEWo|K z0`!R%;KYXl*y#lryHr*-#wMv&QI@}6&>A0x3Ag=7zVXU5p^wUTn<^D&{tK{#QFwaV z#yV#TQ!oL2rBv=S{x-2?eOAL0XlCM z;N}4VuACAerCfl3VN2Rz~YJuuH32> z-Ab9>QKdC*nXfw8qmI?d+-l>zVpUKlb;3Orw0~Kv(~|6csaipz?&Atb#FB(%JeEo< z$yjD!K|ez(mWfyt*Jr>G|zT|_O}^cnGW#=PAp%jbwo;tCK-%&05zMR@S zQ@~YidX}4ND?5Jyy*TiD>Rck;cdZ zrY}tSm}~IiW0>TPfB!(25mwSuXv6f!33Y}_6gZ0-Wn2<#F8mwTZH+M}={k~MN_Ci_ z_`_QW(Xj!gGz8ObO${zQ_FXx3WQR*>jLA4fRDsHzFHv_k_h)*L-MNH5{I3I^rGJwD zXRsb@{jYQtt9+rdb92A|{0H04QBRV8hK3SrmVJ-9;J38B*bTv#vy3yeuRt2SVmIi= z*-AKB1G|Ao%~KP~$0f3k?h z{7%~&7oVkj{x1(+$D^e9-vc#3^2E&@0M96Rl+tL?4G^W!R-BGiXbqp0c%0xfkxx!} z3ZXp3y$#Y$GMvU8ocCkJ=}jgY_ea2ePVOI%D^O~pc}JBtN?Sh$JigT*SemJh}=Des>TmTRJUwL+n}ky%ivyvT!XQfS$-eI`C1 ztW=?8%WjxxKA4;zZ~#6SW{X#Y`I=}h8mQ2+M|BDDB+Ib2PDqN^B8-GYPd=wc&0`cHZ$KQVsm7zP+0sU zhQ&4!9TB+)-vDsz)>!$PXx^NQ&F^BgYFV(U4!w`lhzVgr2{C7fy=Vc?eErdtJii^n z_qgN8V4k(ji9ellyOyrF5tF_Y_4T7gN;tTg=%B^fAN{tORQx2x%N zQp$Ebrst(kgv^sm9p7hEA-{ z2q(uX_|0rqAOCjsi&VT!LzAL;h6t3b$E45w^3x2&dV+M5xtuaKccUppx1!Cc~ldv9Lp8HFK^Sc2RHBw z2$=3B?S>{^keL?pBII4;PDe2WaGCS*V8gf0N`;os6dKdv2PcbsZ-_GTnZj4$Yc=_| zs2BOf_|7fLNGQK)yoVFL3X2Mp!b7b29S`R}G1b*rQ*7fOhtH9I!TDHfu<%n0JKaQV z%MX9JkoZ2#&j21Kny+ykr(fUv!5dlOiVSUs^u#)JVI8`(4vpI%@8>m7a9v-{AA@e; zFR}c^MCaC_i|SFvH2{?+8BPPw9B%;SHfoX2@*KqgX6+(6W5$UxF>Oh9lldnWT1<=jE9LHh_pAS(S3a8rE^-!)`;F{ z!bM*Z@3&a4pV%COR~pQYv=AL4F9*xw@{t5*7N6LJd%KeJk>=f0DYVcDX-yA>&t-H9 zO*ucjmd`x=Mf`CN7Mhwl!WBK(T}RP@Mf;2V%6wlBcEm$;Xi=qzSjM1;Mu&e8EAKhc zMDzJDQO5?g6+LbACLVXtP94i?D?0QkQFs;{Wu-z}^+FnYV#(H6@V>$o+M4qt>hM=6 zw1hG&po2UcqBma(kkB;S?q4S$!Rmf>{IH!vg zzJ}wutk4!bO;nor0@4tIC0ir4#!6$Nxt)Ou&A$v-Y=DRtJ`fSY#xxfl9Q7tKen?(u zqT^9)Q-Ih9yH5|3dsOk>_l2>$&Bb;$MG8;kJ(q;BL9IoH<`n*MN^x7S%^p4nD_ zHXGAAijjOamvj@)<4wM?u!nep*U2H`RbEH*5gUlZP*;AU;b+(idLL)9;_%;3b2}q zycCtvz%)aogFX`^2^C$CwopDz}ACU4wgEQr89A0`D8%6=Or`LK0S(kXuX_n|R8PKqIT z0%sTErGPxWrU6b3peT85q3JJy|QtpBvW-*xg|))pRJn?*HS;MZpnH2jX}yT!re>tA>B1KZ=&zl^r` znQ$EKYuj~O)8<-lo%L4yisSq)~jd4&ENm*nyn`)2-N&IAHQ!8n?4&QfT!PFGIT>4(MajB%*yF${b@>faWLgQLV zaRbV{!!lM$nPfM6v`Wen_5k~6wKPOCBSm&_b zA%XsNi>I|^Xhg3d&(Ofoo*^OF9I6!L_X!E|^!NAo?a--nSfF3$-n?`UGj=YJ77$jn zM$+wFC*=wju&$Y$J5+`|u_Y^7k11%QlqMWTWE-Vf;weOt#CEL}`my8X)P~JEfxj5z U#kPjUekm0)-3F;>? - + - + - + - + @@ -204,10 +204,10 @@ - - - - + + + + @@ -286,7 +286,7 @@ import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' import MaterDialog from '@/views/wms/st/in/MaterDialog' -const defaultForm = { info_id: null, material_id: null, material_code: null, material_name: null, material_spec: null, product_code: null, AlongSide: null, BshortSide: null, Htrapezoidal: null, Wthickness: null, tray_qty: null, tray_high: null, crib_category: null, palletX1_line: null, palletY1_row: null, palletA1_angle: null, palletX2_line: null, palletY2_row: null, palletA2_angle: null, palletX3_line: null, palletY3_row: null, palletA3_angle: null, pressCribX1_line: null, pressCribY1_row: null, pressCribA1_angle: null, pressCribX2_line: null, pressCribY2_row: null, pressCribA2_angle: null, pressCribX3_line: null, pressCribY3_row: null, pressCribA3_angle: null, Zoffset: null, pallet_layerQty: null, pressCrib_layerQty: null, codeLayerX1_interval: null, codeLayerY1_interval: null, codeLayerX2_interval: null, codeLayerY2_interval: null, codeLayerX3_interval: null, codeLayerY3_interval: null, codeLayerX1_offset: null, codeLayerY1_offset: null, codeLayerX2_offset: null, codeLayerY2_offset: null, codeLayerX3_offset: null, codeLayerY3_offset: null, pressLayerX1_interval: null, pressLayerY1_interval: null, pressLayerX2_interval: null, pressLayerY2_interval: null, pressLayerX3_interval: null, pressLayerY3_interval: null, pressLayerX1_offset: null, pressLayerY1_offset: null, pressLayerX2_offset: null, pressLayerY2_offset: null, pressLayerX3_offset: null, pressLayerY3_offset: null, one_cribTotal: null, two_cribTotal: null, one_qty: null, two_qty: null, tool_coordinate: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, is_delete: null } +const defaultForm = { info_id: null, material_id: null, material_code: null, material_name: null, material_spec: null, product_code: null, alongide: null, bshortside: null, htrapezoidal: null, wthickness: null, tray_qty: null, tray_high: null, crib_category: null, palletX1_line: null, palletY1_row: null, palletA1_angle: null, palletX2_line: null, palletY2_row: null, palletA2_angle: null, palletX3_line: null, palletY3_row: null, palletA3_angle: null, pressCribX1_line: null, pressCribY1_row: null, pressCribA1_angle: null, pressCribX2_line: null, pressCribY2_row: null, pressCribA2_angle: null, pressCribX3_line: null, pressCribY3_row: null, pressCribA3_angle: null, Zoffset: null, pallet_layerQty: null, pressCrib_layerQty: null, codeLayerX1_interval: null, codeLayerY1_interval: null, codeLayerX2_interval: null, codeLayerY2_interval: null, codeLayerX3_interval: null, codeLayerY3_interval: null, codeLayerX1_offset: null, codeLayerY1_offset: null, codeLayerX2_offset: null, codeLayerY2_offset: null, codeLayerX3_offset: null, codeLayerY3_offset: null, pressLayerX1_interval: null, pressLayerY1_interval: null, pressLayerX2_interval: null, pressLayerY2_interval: null, pressLayerX3_interval: null, pressLayerY3_interval: null, pressLayerX1_offset: null, pressLayerY1_offset: null, pressLayerX2_offset: null, pressLayerY2_offset: null, pressLayerX3_offset: null, pressLayerY3_offset: null, one_cribTotal: null, two_cribTotal: null, one_qty: null, two_qty: null, tool_coordinate: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, is_delete: null } export default { name: 'Cribbinginfo', components: { pagination, crudOperation, rrOperation, udOperation, MaterDialog },