From f5a18cd6397322905ff32ecd8bca42ad2586c022 Mon Sep 17 00:00:00 2001 From: lyd <1419499670@qq.com> Date: Wed, 12 Oct 2022 19:24:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E5=88=86=E7=B1=BB=E3=80=81?= =?UTF-8?q?=E5=88=86=E5=88=87=E8=BE=93=E9=80=81=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../master/rest/ClassstandardController.java | 8 + .../master/service/ClassstandardService.java | 5 + .../master/service/dto/ClassstandardDto.java | 2 - .../impl/ClassstandardServiceImpl.java | 36 ++-- .../org/nl/wms/basedata/master/wql/mdpb.xls | Bin 160768 -> 160256 bytes .../ivt/service/dto/DeliveryPointIvtDto.java | 9 + .../impl/DeliveryPointIvtServiceImpl.java | 13 +- .../wms/pdm/wql/ST_IVT_DELIVERYPOINTIVT.wql | 66 +++++++ nladmin-ui/src/components/Crud/crud.js | 12 ++ .../basedata/master/class/classstandard.js | 9 +- .../views/wms/basedata/master/class/index.vue | 168 ++++++++++++----- .../wms/basedata/master/customer/index.vue | 13 -- .../wms/pdm/ivt/coolpointivt/inventory.vue | 6 +- .../wms/pdm/ivt/deliverypointivt/index.vue | 176 ++++++++++++++++-- 14 files changed, 426 insertions(+), 97 deletions(-) create mode 100644 nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_DELIVERYPOINTIVT.wql diff --git a/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/ClassstandardController.java b/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/ClassstandardController.java index 7ab7de4b6..4d71a0c35 100644 --- a/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/ClassstandardController.java +++ b/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/ClassstandardController.java @@ -121,4 +121,12 @@ public class ClassstandardController { return new ResponseEntity<>(ClassstandardService.getType(type_id,level), HttpStatus.OK); } + @GetMapping("/getClassName") + @Log("获取分类名称下拉框") + @ApiOperation("获取分类名称下拉框") + public ResponseEntity getClassName() { + return new ResponseEntity<>(ClassstandardService.getClassName(), HttpStatus.OK); + } + + } diff --git a/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/ClassstandardService.java b/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/ClassstandardService.java index 6960a8550..2772ff7bd 100644 --- a/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/ClassstandardService.java +++ b/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/ClassstandardService.java @@ -124,4 +124,9 @@ public interface ClassstandardService { */ String getAllChildIdStr(String class_idStr); + /** + * 获取分类名称下拉框 + * @return + */ + JSONArray getClassName(); } diff --git a/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/ClassstandardDto.java b/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/ClassstandardDto.java index 50141143b..2ddb62900 100644 --- a/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/ClassstandardDto.java +++ b/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/ClassstandardDto.java @@ -19,8 +19,6 @@ public class ClassstandardDto implements Serializable { @JsonSerialize(using= ToStringSerializer.class) private Long class_id; - private String base_data_type; - private String path_code; private String class_code; diff --git a/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java b/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java index 6578e4e90..64856070a 100644 --- a/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java @@ -44,10 +44,10 @@ public class ClassstandardServiceImpl implements ClassstandardService { @Override public Map queryAll(Map whereJson, Pageable page) { WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard"); - String base_data_type = (String) whereJson.get("base_data_type"); + String class_code = (String) whereJson.get("class_code"); String where = ""; - if (!StrUtil.isEmpty(base_data_type)) { - where = "AND base_data_type = '" + base_data_type + "'"; + if (!StrUtil.isEmpty(class_code)) { + where = "AND class_code = '" + class_code + "'"; } ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "(parent_class_id is null OR parent_class_id = '0') AND is_delete = '0'" + where + "", "update_time desc"); final JSONObject json = rb.pageResult(); @@ -100,7 +100,7 @@ public class ClassstandardServiceImpl implements ClassstandardService { public void create(ClassstandardDto dto) { String class_code = dto.getClass_code(); ClassstandardDto classstandardDto = this.findByCode(class_code); - if (classstandardDto != null && classstandardDto.getIs_delete().equals("0") && dto.getBase_data_type().equals(classstandardDto.getBase_data_type())) { + if (classstandardDto != null && classstandardDto.getIs_delete().equals("0") ) { throw new BadRequestException("存在相同的基础类别编号"); } Long currentUserId = SecurityUtils.getCurrentUserId(); @@ -120,10 +120,6 @@ public class ClassstandardServiceImpl implements ClassstandardService { dto.setPath_code(dto.getClass_code()); dto.setLong_class_code(dto.getClass_code()); - if (StrUtil.equals(dto.getBase_data_type(), "03")) { - dto.setIs_modify("0"); - } - WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard"); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); wo.insert(json); @@ -144,7 +140,7 @@ public class ClassstandardServiceImpl implements ClassstandardService { String class_code = dto.getClass_code(); ClassstandardDto classstandardDto = this.findByCode(class_code); - if (classstandardDto != null && !dto.getClass_id().equals(classstandardDto.getClass_id()) && classstandardDto.getIs_delete().equals("0") && dto.getBase_data_type().equals(classstandardDto.getBase_data_type())) { + if (classstandardDto != null && !dto.getClass_id().equals(classstandardDto.getClass_id()) && classstandardDto.getIs_delete().equals("0") ) { throw new BadRequestException("存在相同的供应商编号"); } @@ -240,15 +236,10 @@ public class ClassstandardServiceImpl implements ClassstandardService { @Override public JSONArray getSuperior(JSONObject jo, JSONArray ja) { - String base_data_type=jo.getString("base_data_type"); WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard"); if (StrUtil.isEmpty(jo.getString("parent_class_id")) || jo.getString("parent_class_id").equals("0")) { JSONArray null_pids = new JSONArray(); - if (jo.getString("base_data_type").equals(base_data_type)) { - null_pids = wo.query("(parent_class_id = '0' OR parent_class_id is null) and is_delete = '0' and base_data_type = '"+base_data_type+"'").getResultJSONArray(0); - } else { - null_pids = wo.query("(parent_class_id = '0' OR parent_class_id is null) and is_delete = '0'").getResultJSONArray(0); - } + null_pids = wo.query("(parent_class_id = '0' OR parent_class_id is null) and is_delete = '0'").getResultJSONArray(0); for (int m = 0; m < null_pids.size(); m++) { JSONObject null_pid = null_pids.getJSONObject(m); @@ -536,6 +527,21 @@ public class ClassstandardServiceImpl implements ClassstandardService { return str; } + @Override + public JSONArray getClassName() { + WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard"); + // 获取的是父节点 + JSONArray result = wo.query("(parent_class_id is null OR parent_class_id = '0') AND is_delete = '0'").getResultJSONArray(0); + JSONArray res = new JSONArray(); + for (int i=0; i~Y}mjW6qKSUh*4}HS+JnS?u6W!7-Q_Q zCmXY$u>@lhjfvfe8WnqqqUa}f&i zng{@|`EL}&+1O_+_c>Y0$$b|gCdFojO@_@Hn;hFrY@ZlHxlP1&5l%AK& zvEO;Yu=eq}GX!=lZQc4J9WSlm_SMnn(tqu%Hn%{;JYslg_0ZlvvwMty1q_{u)bP+n zORPz+k=lG?hC$`FL*mJCWZs9Vy;a}>=TU_XEG9^xf};(d?oCG>8%NuFH5nxk3A;IQ zZbs8l4%{2(E^0aoIM<^0=cc0sx-?3@|MqAdDwH?QJ?`#KIQornH$CgU8G`pWePOej zHO|_`cnk-;2e?y>+KIN0YD;x$AG%20i{_|X8>-c5oX0e|3ru70#`4dKgrb+1V0NLK(UbZrDS$a)~HAG>~k45 zfHz^|a>izrOq(~5Vf#0ku&ceul)%vpvxn>37$za3<^+|xX3PR7_-PkItVqXRY;Jzv zu!*z47Pg#XC`U>cO{O6^$*n$v+&2v8Kmkx!##lgBmx*^02GAU7GrBTIN4Mp;(5pFK z)?2I@-&%t-H%p@T2U6D{0SE%?x+h3E>8fYHPlU2#-Pdi{U>(s)lF?ML~(^6sY|6ngem&U1^~G-r})Qk!n0kFQH< z(|o!^%js^fm8CVM_y6jY9q?;R-QmtR&;M6{zoc;fob$3zZ&XEYDBICGWPFX|w_PS~ zP5t$t^TF_A{L}n{Emmp=gq#?YaIx_0hokHc9j(zX3@A&F-RxX-d!f4J@GlmZ9W<=% zQhj^8yf`=~sC;z3YmY4pW~_8lu66o#h<)?#($D05I<-TOueRh!I_h+~#d&&<*K>k* z{HE&GWA(9u)9Y1>&xGz;IkE*MH;d0T>vU9h=k}tUY_HFHomN+N&*|)&QK9Xiinw~x zqg(g$H+Sydy^0PW^=^%?4ec@%t71x$Fqf6&>dO zIDDl`m~~K9r(^QEN5NH{Vm+%*9~#uQ;KHJ~KeZ`UepL|iq}N;@IGTQHGLclZjXg0k zDd)#Om+vl#>Hfown-hj~Ss%0EYRXp+22?Jax8rWe?8l=QS$}taeL!`a`qv!-&Mp5a z!tZ!ReeD|i!{1EYK5*%wlb4$Rz3HN_{>je6_1*WJ-uLpa1C@I=_Vm3TUw>%O-36Pj zZt1pp*1tRC-*vtBWeXH?uFZcV{Hs4V_M0>&tmn4n;a6|RZ0uBdn9A1wu;*sNePzwi zkS7;Dzf)OUTRHV?%R8CdS{oJ?Z|ZS%U|z|@TQBx~y=X$N{ffNKD<4XqcF1h`H%B5HR{${PFo!T#zqy?2gSUGv;JW18>ne8-rN z5A3)(ty_nyvlbqXJ2z(c@vsj#Szdm?#MaqiR`qP`9b(%1EPv!Rd zg-KbbXLgZHu3aDc!tV0!XA3SrTilN9kJVI7*kfJy^432m)zz=-?&t5icbtE+OjB3W zytZYz*Gl&@U7U9QIO+P0U%Nj{o@{k(+Ob`S27OdEah%)6*++RlF$ruzYglLZAX zhAY#*x1l@d-_Z{ta@a5sFbx4{2LUWcIwT!nFP?Ke(iceGh5{7hnYRGx1Eej6;cQab?xC4ws zdJ1VB(lif%4j%!m@C4Y8w51ooiSYnY-T?h40PI9sgH-1O@J$h>d0&HU(P7(Wf6W4T zIv3!F`LulNX2aa&XGrgx7-ftxxPb(7@U14797jBaLZj)(Ej&D5;ZewnkK01_W-??n ze}!ioR*c+!=Q8nQY;lC0_Ke?F;K%sB!+l$nkFmosmfRV?Gvjx~_`SqKke37@qq8=q%3J{yj$98MaUR=vUW#`CdN^F03rX6#<9dD@~AcN#BR zw7QMmzm0vkLpQJfg|1tpq+{1;Y555^dUs8NEOZgBfl3U26|thn4@4W3R(pFAjs8|+_m&ts^;=yNDbz znc&AwFN61QcSy5_?Ev5H#8mbZ+c$<|2ii(H*Mm{CsHuuZtDnPvL>?ymh2?rlWBx25 zujr0HQ^{*;^H*=Y5B^Js_pgNeW#JxrSVtOY-eDaFgl;_?MAsa3qE`+(Q5U4LBPQBf zq`i(f;kUx@Bf<0$a(pJDKZ*3BNV%ho%k`*?Km4P!22`9lH*ClJ`{aEwHuGQV|YTHWG{t!)utORpY$Un zlvdXDwrz42S~coCAK#0XTyRLkk7X-cimRdoF5wJQ zkHg+&alX_tUnkza-y*p_7nlN7(eH$VxsJ?BjvXxKSb;1F?!m1Tw% z?x<2>Q?MCU^xip78+Lr+W&{_y{9Ly-W@$2$G*}25VVZc^!^d1R;X9x4dr*ge+`X?t zUknxV*VdU4DaUi`TRi4X^W->hrie?CYpeygvfwg& zGFv9E+(SI|Y<(~*0tERsC_f($WRrXwlwSb)c$5YfSOODaLi#?W~Z15_^{xs!VAz=%X851NJ!xC0Lo?|8f%>-la(Tek(756Qe zAe5dsAL<<<%xNynsT0SW3v(V&rwg4GW<#1|*w7F<>_Vu%g)qk!=Tu-~H0iO$IVG4D zO+mG_IBhGu44nnH!WYWiv_+>E3PEKr&la8DB;s=T0v;hhbJ!LgerE}E5-JepaF}3- zonS~k_L*Qi!H~zILOY8gc4)|a$fEHV+bf=k;_XcFq-7V~y;}>i>;+j*MOpTOtY`H5 zi^+QP9Q*f~BvdBMqPBt*1xm?*=b{t^O3B6CYqC#)7L5d~TLo(sXw@hv#~urV0(VND zh|BOvI6eg2+6_jF19BAh5-02hFHq29H+(y?t#}ru&}w+pr^^$x_lzm)c84ftHTF~%(8GlhB1sAo9(`tfCNE9R>+&3G1Q z!-^2*shXa@9BMaA;AC~*aP-;!N@wKs09X3g6>kNrJ|x5j<+5z+#AMY%h z?r6taIBMx}*u&FD9Ft&=l|m*?DfW(AdREvwVd=@Rchb_chIMet(v#!Z-{zhkSK(SX zZSJB8YoXfGYmU7$mYyy4&RTkQ*kdo*WQ;xb&S8&bR<_z$K{F{E#htrUYWyOiw|Htti%0 zP-2HYCdU)s-+Dp5C%%>W&{LG}iSjE%{7w0uwCb8?NBj^JIL898m@P zi15aZvXOSU?yYwb#QF$gokVwi(3}cz7R~XonB#+*DlF%OkHuXdOE{S(AJlXa%qiUm zHC0&72_I8l6Ay_}u-6MOn3cIK_8x*UzGzHilJZ4k8k3YS8q=7he9@rBB;|_+nUa(* z8q}Did@cFGSI7_M9Oa9~(33a3hO!EpsW+X;eu8>)n(`CWo70q^pq_c@Cqz9BXR#&W zXHo5EQO!2ApDB6K+8c5bKp)>|-w_j+ILF^I$KNuC$?~_D>;G0d^T%}Nsi=ko$i&Z@ zd@d5V=M*~WW;B^bH{VPa>qK)67lK;MH5|j(J_EDwJeC@MFd>w$uDbAAjIl$-No zprD)uIS>_Ne#Dt9Fo71uffmIq$bl?t(v;hB(t-}SZO)iM!dxw#bGw^9OmH|Db>`zo zlxfceqs{_&Aj%F#ou=FnjPn|cp z5YZ6l#zM6kf6kCf0Q%6(J6W{NnpUAUI0e-rD?Z7Wp&UcM! z*#S)Q$yiGszAt{d%<5Z?4AZgA!1fydpoPC;p;rL2vCY9Y7u!5+?zj}@BVB-PA-2WX zG>9!h>VcFZU4^ZZ_PwXJT8dAr4Rh~}A+`1_J%McKG*oPLftql8Rm70|Rj> z`JWf<_}^NEEAq0%#NjmqU5S2_r(pIlOoG@o=ts9bN+zE4$s?75eaf&Asle?`qw8}N zJ|bo%V7_z{Vtyhf6EJ`3|2RhxAY#@67Dy>#=30x@_L#<~^^+bp<^&`c3X~~NTpY~V zhE?dSD5A@s3{nWbqbbbvTy$UZG?@_E<7te-T*I(>7&k4YPkRt4t-%rVj$&1B2L9&P z@>zkxS~QClpcx>is}VEr0#-;CUEUZ@l;#SupwnE_$+&lkzfTOr1(Xh*Q&kIRWO zRlamlv=$lJ(whNoXzI&k(w2VtQl$tNM_3s(1KQDlUN(wwHj9XT<)UaWGP(#>C~4NK z&I*+Ulf&l_LASk9Dbyn7ihQ3yB)yM(X0Ke)t7V{}9bc;y=I!Z*d>QbVmb^~JUjX*M z4#XuGg)-O@WaY^JT!8pi>>6qn(V{+f&d&gCr47lmEK6?zbE_;z%)Bhw0XzddDxVQt zmV6u`jR9uIAqJQ)C!_~y!5?O0F`{^OR#iX;-j2huj{IN_$2y5){=!&i<1&uSCW;S4 zlx6)2=)$*`qV`x3WZAd^;`sFpj2FQm1WQ22`&*$+3H(Sal$|J!u~b?DN&I>%oRBPn zETt`luDrht!EPcLDsXn^c^OLS!Pm%8N>6dD1&)0RF1)`r$+4{PmI&es=czTiB;{+Y zae{e`hY4dc-d~Or%!|C00LppFz!Xt*YXR)VTic+N-o{iL(v$nqmh6^VwS(S}%kOg_ z-d4k5A`}@fJCH9Wl6L5+-iy>5i(E;Wlzht9dy?4S|fz8`sIB}s>| zM&xHBq2yodAOfkKFl*rs{$Ef0%5dVQS3x|);fb!psz41Y2nQu3;-$lf%P5_DQMI;>1g)P+Z)r;*{>`1ojaF(N{(Q%0k2NeM}%B|3B} zA}(5|30Hw8J}Nv?mxOL;W3=(%32KN+)M-_T8m&As$@t(Q8EL0trx42|p4eC}_r?~0 z%@-TX+5XrVPax7Z*n%tPa^4!2;aT!vzrV3;(+-;w8%q={fka@7#KvZ_jn8PbQ8kup zNq*$GB9#@saoEXERdaetwiNgmo}^sL!ecCpgX#Qg- zF5SvFHI5rh_=$bEkND><#DQ<22489%>zLIDxhodm|T7H?1OY)6q3IiI$ zd0?G13i3Wn;5zHqm)Xp%f;f*TP{qVWE0xjVWl6diZFr5w=jD<@yuPPxAQuR=}wVRN?2$W>oM+Ek2rObQVWUd$Z%DZ2DeS5Mj5FO zkI_I}M7TO8LLGG}Dn3D%L?-|4A&HRp95nd2YCwEq`q$YlgH$Q*vG%dxo){R8tGQ}F zNg|g(;rPqva&W!^Q%-r3_(iFsa&n5)$^G%EYC%q{s_0U-SN{!?h^-QzE6uvD0@aTA zFQ3M)^9v&7T-y=08?MrzAgR91D)3w-hqO_769yKJA5%7>uy9N=cmzmVr>(Tl%bYN9 zRnZujKH?G-VqNWZ&nhb7xmBT)I&)Wn)7F~mF;4rojR=S-2#5)AST7lj6dLS?EB~su zi}<_NF5>iH4V>jAnc0dO*=<;+`GC1uc z$ICkA!1&*{t3Yu`S`l$d+P>|WL%7a6e7eOi*dZ(ye*(@)>E9w+Q|qU>?WZYKXlCgZ zpvQVObVZ3m|5z5QARikeFWXm>S2ET523dn_v0Z}ZnatsPdm1S9)TNLS&Qf^>*zg@mNUG{zEAoRED?X^!QhMC>QwvS&##5xFDz z9VuL}4X#Z=T%_?r3TGqv|7{h=ceV<@y)T#Kh>4@g#EsYCUGA^H=h9FV$ebYF9 z{$(oHiC><^IS>#2K^oUlKXd%ES3@feJvVK_Fy?*F8y;IjMWA2*qgAQk1=4Hfm z-B6e9FIzjfz>L?PJ`+sslmp|J^!d2?&Y!8fd7!B1$T**+Tf5KxZBXQjOYU`M{HNWe zFJ`N!rR<)VwEWoRlGS(&{~pGLO01O}|7sZb3FDue!L`DVDByQwm;_umQKM@nmn9(sjZ?EYg(M|DK0YQc zDLN`DF*@$e7G&2fp-+70py;UR$fyXlIxb41iBf8!Obthqb)AFMDz!R7gX2-G#mDf~ zx!hw(v@()EHj>+J{CE^s%#lmRXQMeIA=~-y^10yTe6)%E;b$f`TWstwW`E#Wj*b1! zw*ed44;#>U_M?XsTlUn+!m}KotL~kw+VKnU?ggC2rp#%o5OE3ZYt_ySuYHGoPK^ot=G;k}L9(8}hPr zo6i8Cj$ff5u9fLSxJ6_>C-W~uniP`_CRgwnP z$u#9R=~ZK*H=H9SHeELSy@`&HmU7wm>2v8#r8>4fQYFoRM;>%2W1wmR3hw)APxN+1e$ zb0TlQhOHcU*7MG7*b2yN)w{Q0D}lE4lJCCVT8j#0^}HuMJqe*JgtxhD@?{i!zd07h zWna&=mG!Ck)wjE+w>N;^**RVvuLjtsu12e{iMhym(azeYbgwpoj@EXrc%<#j(dOC+ zuW>Rr7{{i}`e#d||4j9&=pEh7i*R&X=jNP*(AwmHiWi;dyPLMMsRfRZtXzHyIDz9_ zR+o~g#=L@uGnM&_mbu7G8*UtyS3GWJ4@TQpZl+!COo{>rF`5!CZDTYEDVP>C-o4)x zaDmF*jABDtcV@gpGMaok1stK{8Aj#E__?F0qcOGV9LRqIF$XGu+9K8kY-@Ysn}jgq z;8LI^#xC@v(Z}wP9qaQ`#Y1DBM9~sRtv{|>4(w_}XrR>HRL6MV_?zE02-|8T*hhM$ z+nKc8ZM(SlZ?aOg;KR8Yb?`INg(W6%%x@bX=To}}X$^ZWVHm`}d6{dO$U!pi4<#sz~-iN7IOt-(;bJpK^ z@rxRJ?zdhCTFLz4MwL6P9Vnmf*!ISfHHVZp{5QDCPv>sx=+n_px}YpG(7F7hZB9S^ zd?EkfAH94!g`2i%^?KRj$3Ilh)&G&c(5=gtQ-)D8TQa@RHx6U3Js30m%*k%m#nIl! zvcpn;$*J*Zvu@owho!^R2K%q|kq*OImw=_U+v2&Z}m5jo;wi_4;?S+7F9qJm7;{t@_7E_V$^3ne3@n7ak<-_q>Q` z-EuSk@A{#p$FDM9H;zr~(|VP>x8cBn^3{Cokv%8YpX%V~zA&v@%9_6U3j>br9{051 z;^j-GO@2a?h_@ey;hW{jJnrE@>M1;fc~mo7XCjtoU?WkNKwGFIS)4*ke!Y$KQuP z?y%>~{+EY;U9e|kNB^rkZ!Xw=&bP$ke{ zPFt6RU#^MW*rxk$mnUX^e17E0(Tnc3m_I(oqj*i zch|fcJ^tFbW8RxysrEk6OpQ)`p115tU1IpLyH^fZPJR%wr{;Cem0LB>ly|Q8rbADS zJQ}hybNt_x>pXYO`Rmz;egoQgPAGi&qVQbNvoq17W*vL|&C6ZKV&^Sdw&~hjQ!l?e zQx2P+&D-%|^A%Oa-%i*(^)t!YBkR`GDlYDRHv8hUvZKThAHHv-zirWkhqrHkee=TO z{u?u&+&J{&@DB$}Eq64sxjFH}>_a=Bu30m)M~X+}gSgXWX%n@1!+z=Ttj&NGV-Iv{ zKKJ&+fPeDip1M|FhNj#QJFl5Lo87f7`k(1^MgG-ERpoj94(XDzOYm&(O>M1)_8l5; zcdF5TJO_GJtQk7g&BqqV^B(a&#(%Y&%cqoD?#dnej+z#q_JQBoKZRbMvWP6q&sH5Fy#^%oaq7R90Bst z=Pki}S{6VR`n8`ie}Q>YAAqrVGXH@2J?51|JEOU80LvafFcFJe$1a>{#iai zxe`D%03aD1@8_6*hq+=PDs%=IjrnHGza9i|(glSNM#tz1uod&GnA;5jh;swDjd`#; z0v?KhG2esv1I*hFL&cwZ0PGruULEr`g#aTw0ghlU@d5}Oj%YD2$NUoJ5uc!y@L>F8 z1i(5UfQ};(lrJ7zqX1g@0nEevSIpI)0(AEWn2Z6-u0|E|IY%7r50(NvngOtVc187< zlR3o=v^3foJU{}3p7`38rZ1HeDRo}zYhowuP2p@{?YMBT_Vyz~PA?%$dYjH_GI)i@ z7TOcbEDT{X9RE`W+PQ)3n<-WyXhbZtGlmIq{ZAoi&q1XwYD$qrZ4B z9sS39>F7V+rqjqx-xIFl)}}ece&}L!aqH20Y+@_1B4SInB<>EN3lY{9TYq=0Pc539 ztrfQZ?m>XqhpoT+*5^URk?lTCwr4g2Y}|?>msiaGu^rJpgmR%f!$RQUJCEEd_z@s0 zD)&O?RQ;20Md*Pm#Qx=WfGxWKmi}PbFBK<$36sPo)xe>sBr_9T(mY#STr63LWB(vJTlt8Smty!Sv)|7yA8C7xI`M zM%oivE4~M zeq3?s4>d8dHb6IuH#Lr}XFS?K&!!R0rV?nZ(vZe{NJAR)A1c`P7B6!TDhLy3@uECD zuIqWJ_Ywzpi=-0LOVEf1IH>4~Q?5isw{LZAYH7D1VwVpK&BDW+fQsHb<(k^Cg>82W z%_4zqbqmcRfo*dO4g1lw(}lGAX(jQX&Zk`Ih0_zL$0;QVpc$uK>9{jqO*wKDIjSHC z-vqC4|M^txIr9l=bQv?g&eq!_B1GR_v;Brsm!mtwgXI?@y8JOhP2B(&PWda+doqv0ZQu|q>jC!TYcvk6#- z$&I?6*92nZBS^HtFCE1Kj}30-@xXixJ7I0;y>s4l!g(3-qEpYeS1}#t5P<0@rhzrC zt=WVziGBiZI|27Ktg}(r3AnFgjp4Sl;$(7E2bZ$m#w+y@T08WaADI%Z%ne`meN@Io5Iii)uq6f9~wZjif7Icni<$83E3|(usc^JB8f+huODn$=%=2oDl zVt9l#rbA(!A%!qQ2Ac49OZj7LWn)#al}G3NE%OZ%Bq;?+Pee&dLDEyY{qI!yGm%5d z^qbhGWcphOTq=R_eNZRtBmXcY}jpqF0 zYg2_stux(wHPFOD3)Zd`FuDjB3GN-XlUxLhoVb%*1dL`n!>30shQq~*&*d$AE>?Ul zxIXgno0b`$iv=HyM2x;SoK5TyVHlzW3@kG5hhNXk7+euUKm7V-sYxK)YA08;(_pKe zToFe<0kmfKi^MqMAYc!|+W+(5AWDIU?bbEW2;WQsMn70PX035pJ8rE>V2w#Q z&COk<*ocR|$Y_JLKdd!dtev#h>|iaNvesnScG_B#W9^K!W{&RJ`YSTmis zRux!fE7uH0iM2nmHi5Gj=AO+#ZClpnjbkbWM{y3kaSn<>VXd)~j@i`QlkM$^SYz|! zjq_kW1-)?|)(Ly6${ss=<6>D4y6x>CP{?_sMqsCI}5#nzhkH2+1Ort+){2#{r=IQZAjiuHD z&L6ktSe(jn9R+VX9xtzK?%DN#f$iuZ|f~ohX0SE~FDP4Bew-KAN z090-EoB@JovUtt_{5tM@!$*uy*CX+J@wu+5cSl1(?HaP-jx1( z-E5^mlxp^yfhe`!Zw3lh3ML^`cf;Z-gOHbb$^kdpXPV=YU_r0NI|d7SE#5I0^_sn7 zu)t>-Uoei(?7@R^d}a^MykjtWM}OvlP0Xrn1vC-H7J@qJ;( zD5Lvp@`!}CT-Bs03&zj{7`kCewiv-w$gT=UIg;^DiH8R}Oq8_IW=}f%W|DnAI^}B^ z&kng~x#7{%|2Ch0CnsYf_WK;uBuvbMyvE-vOEI5{X&R>Km}X#_g~<#3z--LtV490* z9;Rrd&Bxpu^Di)8MKf+`ZB}B5R!qM&m^iYXhggLlLMw9axJaZD(w)#nXCmmjdzVz6 ztO>UPhtDMNqKobiR54kMCPA8%d_B20kA++W&DXPEh&dSd}HRVKF-HMf&h@8nLDEPhwSeA_x|V_X8Q7 z_GGBavV&O6+z%sv>C>UA`=UY?{SJj5wB%`=$`Xq!ar*NigdTnxtFkz17Vp}Sp49DG z{cQlR=)glL&3>j)H5T=9(WO_(pqUUSOihj>7_=c z6KO1_ngP)?{bfCFcf`FIV(1d=XW4Nc*smWvr59eNl4msJRiJ}}uul=}itR<0oe8C% zzPhH06{WJ{dlIywgI*7`E--d9vjuhuX_f`X4%A8DLqD!dmHP_PT)>ZJKX9je>)fn1 zV}~HK*`>NP(quskqEWRL^{^AE6xu8pM$$;!f?e41q1e($Xlc9iIhjgS@gk8O0i}?@ zmvLmEDp4dde_aX&UM4|el1L0fVlgE1B@&WKQuyB_C^}VaV~(~M+VL_eGPD`G+<*AX`4(78xun zwu#Ut<4bIj!LnqV3PgMUAtQDXMK=?O>3o45O3A3)VMjW0{Baq{`PQE7mf9Hc;xd}w zuOz-UW1tX*RbEt*uOyN|Fo-vKkw=xITnUb10sqL8Oy$){h~tid*j7&SBaWo<3vY6R zdz<>u=FPg7&?}hSvpZ^jsbC4FW4Fw)wKul6Fbm3xxNDQy~aqkS-7FUP}x zy*YR!ZO4fC*N|RjCci^x!8ra^UMM0zj?UC3C#D#5(Kuj@J}ELh3P&0n9-A1g$06zy zlVUXqIJW2%-T2}Z9F#sfQKt{b(L_dsN2SEzFk%gf3E>7U7!0}ugFZS!mY}b^S4##c zG|Z{9gQPj;KA70vVy-(76LZ&%FfkX+`UGJf#!r7ud}Eto(H~O;rf^IxFfmudoJtg? zNKDL`Fz3NoW5irvsTslrlO5bBjZHAp{@}-GIFlqt3j7OCGEvGVys{*cdntKyr9^Yz z6Vj(LQO{M8N@*)D%f?qG?NK;laBgAY;K5$mAQx&Q3yj85`(Ib~ZOip0{F!*J8{aB{ zYcg-R6Q7&FHFNHSQx=8(I1*Qb5zBe}*9lxoU`j(WAYRT3e&?Y{p1TMBn zR?LNJAEzlTxa?V8og7R%CZ6~yva2yaJ-PqDQIiU~#`F1ZkQ~2f;Jzv?jGI)VOzIFB zrPIX7+JAEV2ThB}pME&BNHIGrdqiR3s4Pj@zJ*=)C8s1OweJ?BFLCD7E1cDa!eOIE zj4K>cr>lZTH0FEU79{mrVxwy2dNx!818Q1F)~@Pb7s@gKFgx83egrf}&I2 zK{T^qIZl!`6-&$KZ8T==RJLJDtM_S-Igl{CdZHN@p;i;$gPIL;}|vj+_8y#Zd2%TO&h;= zsLPgr2D_}N$W^zB9jcC1JFSyo2Ak>>IT42+DI#wxB5M?1vaC*#+v4A&4}CXA-&RD| zDA>DBQFBRgf5g8ExjLs6=}D$WXi~vtKPhQ#gg-~D-Jt>1@6yOq(w1RmgMY`3&}wr) zu+uk9;_-8vu~Xw1-FVeT-53>SI{X4=3aQ2auvuEHdTbl7x@Wpu8Ff*4mb|jn)Y;bA zmMPr$B}rT;zc+~+M=~qhBy&w{GnAwmWI-xAD_nKx#+WOzI40)El90|EpB5LiMsQZi z=$)8b#HEO?i?zq#qh)>yy;TaoGmQ)8T{?3uD(yRR)!hHj{_y;d{XtFc-u%ff+y~C7 z4L1<)kj}MoZubtkJ0rJ$hrA-4i+Aqu4*5PKr@ccqWT23a?~vzYa3gqqCf8=(a4&vx zCKtw+bmi3is7%g@FYC%B@m`sndfsq9KB6m!pD1`uSI)pYW^#^vo331xsnwD$X%!1* zw=d~G_}o#QCWkp9^iNQgyw|~3+r8ZkeM-pYm}z4zbi2n{-?-n8Z?|E=jHit|{IbJB ze;T{j%P*_2)6QuR5)a?aO|a0TZ3p>|9kU{S^1wxNz`prk7J7zvUF>M@aXr$iUN+jP z+&T7;rNPc8K>b_oviL7^>+IU~e{jS?-xAm)OmX&kyVZ9m<&R47skP8quE!sAO4zXh z6UZ3+v=$auxv(2Ih)6@S!GYK0a&Ej^cP?FN{#V6w8Ux^va|KZ|fn&d=$I zHv6n6=SDL4nLWAJXsD&hoL}YIUYwM0qucT2A9K4T12TXg*qdv?`Ap;&vpj47f3P># z7kf9!;#v|T-!qFFiWqH_uO8358 zo`m$O9FxPTBweCoqZ4D2ViNV5H&c+pJ}EshE=Xt4B}eJ?8iPJYXNWZ?Y)du71x2Mq zCFv4lBNLNiq7yYSF)T$T^QZfBk0sHu8vdw}+g4eU&lPdxLgljpu9A>)e)}LU*ie9Y z*=PI`OzcNzc8_8o&KF@~A4OMVLIVr8JofPeEe8F^j21qGurm62-ghvklfwZg;Xgtp P)Y+zaWyxT!#P queryAll(Map whereJson, Pageable page){ - WQLObject wo = WQLObject.getWQLObject("st_ivt_deliverypointivt"); - ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc"); - final JSONObject json = rb.pageResult(); + JSONObject map = new JSONObject(); + map.put("flag", "1"); + if (!ObjectUtil.isNull(whereJson.get("point_code"))) + map.put("point_code", "%" + whereJson.get("point_code") + "%"); + map.put("product_area", whereJson.get("product_area")); + map.put("point_status", whereJson.get("point_status")); + map.put("is_used", whereJson.get("is_used")); + JSONObject json = WQL.getWO("ST_IVT_DELIVERYPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc"); return json; } diff --git a/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_DELIVERYPOINTIVT.wql b/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_DELIVERYPOINTIVT.wql new file mode 100644 index 000000000..727f0056e --- /dev/null +++ b/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_DELIVERYPOINTIVT.wql @@ -0,0 +1,66 @@ +[交易说明] + 交易名： 分切输送线点位库存 + 所属模块： + 功能简述： + 版权所有： + 表引用： + 版本经历： + +[数据库] + --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 + +[IO定义] + ################################################# + ## 表字段对应输入参数 + ################################################# + 输入.flag TYPEAS s_string + 输入.point_code TYPEAS s_string + 输入.point_status TYPEAS s_string + 输入.product_area TYPEAS s_string + 输入.is_used TYPEAS s_string + + +[临时表] + --这边列出来的临时表就会在运行期动态创建 + +[临时变量] + --所有中间过程变量均可在此处定义 + +[业务过程] + + ########################################## + # 1、输入输出检查 # + ########################################## + + + ########################################## + # 2、主过程前处理 # + ########################################## + + + ########################################## + # 3、业务主过程 # + ########################################## + IF 输入.flag = "1" + PAGEQUERY + SELECT + deliver.* + FROM + st_ivt_deliverypointivt deliver + WHERE + 1=1 + OPTION 输入.point_code <> "" + point_code LIKE 输入.point_code + ENDOPTION + OPTION 输入.point_status <> "" + point_status = 输入.point_status + ENDOPTION + OPTION 输入.product_area <> "" + product_area = 输入.product_area + ENDOPTION + OPTION 输入.is_used <> "" + is_used = 输入.is_used + ENDOPTION + ENDSELECT + ENDPAGEQUERY + ENDIF \ No newline at end of file diff --git a/nladmin-ui/src/components/Crud/crud.js b/nladmin-ui/src/components/Crud/crud.js index 8479cf5fe..74d4f802f 100644 --- a/nladmin-ui/src/components/Crud/crud.js +++ b/nladmin-ui/src/components/Crud/crud.js @@ -210,6 +210,18 @@ function CRUD(options) { callVmHook(crud, CRUD.HOOK.afterToAdd, crud.form) callVmHook(crud, CRUD.HOOK.afterToCU, crud.form) }, + /** + * 启动添加 可携带参数 + */ + toAddAndData(data) { + crud.resetForm(JSON.parse(JSON.stringify(data))) + if (!(callVmHook(crud, CRUD.HOOK.beforeToAdd, crud.form) && callVmHook(crud, CRUD.HOOK.beforeToCU, crud.form))) { + return + } + crud.status.add = CRUD.STATUS.PREPARED + callVmHook(crud, CRUD.HOOK.afterToAdd, crud.form) + callVmHook(crud, CRUD.HOOK.afterToCU, crud.form) + }, /** * 启动编辑 * @param {*} data 数据项 diff --git a/nladmin-ui/src/views/wms/basedata/master/class/classstandard.js b/nladmin-ui/src/views/wms/basedata/master/class/classstandard.js index a24583e9a..0c216de38 100644 --- a/nladmin-ui/src/views/wms/basedata/master/class/classstandard.js +++ b/nladmin-ui/src/views/wms/basedata/master/class/classstandard.js @@ -72,4 +72,11 @@ export function getClassTable(params) { }) } -export default { add, edit, del, getClass, getClassSuperior, getClassType, getClassTable, getType, queryClassById } +export function getClassName() { + return request({ + url: 'api/Classstandard/getClassName', + method: 'get' + }) +} + +export default { add, edit, del, getClass, getClassSuperior, getClassType, getClassTable, getType, queryClassById, getClassName } diff --git a/nladmin-ui/src/views/wms/basedata/master/class/index.vue b/nladmin-ui/src/views/wms/basedata/master/class/index.vue index fe10a17e2..9fbfab2fa 100644 --- a/nladmin-ui/src/views/wms/basedata/master/class/index.vue +++ b/nladmin-ui/src/views/wms/basedata/master/class/index.vue @@ -2,33 +2,49 @@
- - - - - 基础分类： - - - - - - - - - - - - +
+ + + + + + + + + + +
- + + + 全部展开 + + - - - - - - @@ -105,17 +106,20 @@ @@ -135,7 +139,7 @@ import udOperation from '@crud/UD.operation' import rrOperation from '@crud/RR.operation' import pagination from '@crud/Pagination' -const defaultForm = { +let defaultForm = { class_id: null, base_data_type: null, path_code: null, @@ -180,14 +184,12 @@ export default { data() { return { classes: [], + classNames: [], permission: {}, rules: { class_id: [ { required: true, message: '不能为空', trigger: 'blur' } ], - base_data_type: [ - { required: true, message: '不能为空', trigger: 'blur' } - ], path_code: [ { required: true, message: '不能为空', trigger: 'blur' } ], @@ -218,7 +220,15 @@ export default { } } }, + created() { + this.getClassNames() // 获取分类 + }, methods: { + getClassNames() { + crudClassstandard.getClassName().then((res) => { // 获取分类名称，查询根据分类编码查找对应分支树 + this.classNames = res + }) + }, getClassDatas(tree, treeNode, resolve) { const params = { pid: tree.id } setTimeout(() => { @@ -318,6 +328,72 @@ export default { }, 100) }) } + }, + clearFrom() { + defaultForm = { + id: null, + class_id: null, + base_data_type: null, + path_code: null, + class_code: null, + long_class_code: null, + class_name: null, + class_desc: null, + parent_class_id: null, + is_leaf: null, + sub_count: null, + is_modify: null, + is_delete: null, + class_level: null, + ext_id: null, + ext_parent_id: null, + create_id: null, + create_name: null, + create_time: null, + update_optid: null, + update_optname: null, + update_time: null, + isTop: null + } + }, + addSibling(row) { + this.clearFrom() // 将默认的表单数据清除 + defaultForm.id = row.id // 获取分类树的id - 懒加载依赖此id，不可为空 + defaultForm.class_id = row.class_id + defaultForm.parent_class_id = row.parent_class_id // 同级为父类class_id + defaultForm.isTop = row.isTop + return defaultForm + }, + addChildren(row) { + this.clearFrom() + defaultForm.id = row.id // 获取分类树的id + defaultForm.class_id = row.parent_class_id + defaultForm.parent_class_id = row.id // 子级为本身的class_id + defaultForm.isTop = row.isTop + return defaultForm + }, + // 全部展开 参考：https://www.cnblogs.com/toughy/p/12667805.html + ToExpandall() { + const els = document.getElementsByClassName('el-table__expand-icon') + if (this.crud.data.length !== 0 && els.length !== 0) { + for (let j1 = 0; j1 < els.length; j1++) { + els[j1].classList.add('dafult') + } + if (this.$el.getElementsByClassName('el-table__expand-icon--expanded')) { + const open = this.$el.getElementsByClassName('el-table__expand-icon--expanded') + for (let j = 0; j < open.length; j++) { + open[j].classList.remove('dafult') + } + const dafult = this.$el.getElementsByClassName('dafult') + for (let a = 0; a < dafult.length; a++) { + debugger + dafult[a].click() + } + } + } + }, + hand(value) { + this.crud.toQuery() } } } diff --git a/nladmin-ui/src/views/wms/basedata/master/customer/index.vue b/nladmin-ui/src/views/wms/basedata/master/customer/index.vue index 9facbe86b..3b0791e97 100644 --- a/nladmin-ui/src/views/wms/basedata/master/customer/index.vue +++ b/nladmin-ui/src/views/wms/basedata/master/customer/index.vue @@ -92,19 +92,6 @@ - - - - - - - diff --git a/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue b/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue index a0b6c2645..669cfa6c2 100644 --- a/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue +++ b/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue @@ -228,7 +228,11 @@ - + + +