From 94f09d239779fd2ad0999920345cbc7856b8db86 Mon Sep 17 00:00:00 2001 From: liuxy Date: Sat, 11 May 2024 17:13:43 +0800 Subject: [PATCH 01/10] =?UTF-8?q?rev=EF=BC=9A=20=E7=A9=BA=E6=89=98?= =?UTF-8?q?=E7=9B=98=E5=85=A5=E5=BA=93=E6=89=98=E7=9B=98=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=EF=BC=8C=E4=BB=93=E4=BD=8D=E9=A1=BA=E5=BA=8F=EF=BC=8C=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../util/impl/InVehicleManageServiceImpl.java | 1 + .../service/iostorInv/util/wql/BST_INBOX.wql | 2 +- .../service/iostorInv/util/wql/BST_INRULE.wql | 2 +- .../iostorInv/util/wql/BST_INVEHICLE.wql | 8 ++++---- .../service/iostorInv/util/wql/BST_OUTBOX.wql | 2 +- .../iostorInv/util/wql/BST_OUTVEHICLE.wql | 2 +- .../outbill/rest/CheckOutBillController.java | 1 + lms/nladmin-ui/src/assets/styles/eladmin.scss | 19 +++++++++++-------- lms/nladmin-ui/src/assets/styles/index.scss | 5 +++-- .../src/assets/styles/variables.scss | 14 +++++++------- .../src/components/Crud/CRUD.operation.vue | 1 + 11 files changed, 32 insertions(+), 25 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java index f66ff27e1..817042929 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java @@ -164,6 +164,7 @@ public class InVehicleManageServiceImpl implements InVehicleManageService { JSONArray structArray = attrTab.query("IFNULL(storagevehicle_code,'') = '' " + "AND is_used = '" + IOSEnum.IS_NOTANDYES.code("是") + "' AND is_delete = '" + IOSEnum.IS_NOTANDYES.code("否") + "' " + "AND lock_type = '" + IOSEnum.LOCK_TYPE.code("未锁定") + "' AND stor_id = '"+jsonParam.getString("stor_id")+"' " + + "AND storagevehicle_type = '" +jsonParam.getString("vehicle_type")+"'"+ "AND sect_id = '"+jsonParam.getString("sect_id")+"'").getResultJSONArray(0); if (ObjectUtil.isEmpty(structArray)) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql index 728aa8ad2..740615025 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql @@ -140,7 +140,7 @@ AND attr.block_num = 输入.block_num AND attr.row_num = 输入.row_num - order by attr.col_num,attr.layer_num ASC,attr.zdepth DESC + order by attr.col_num DESC,attr.layer_num ASC,attr.zdepth DESC ENDSELECT ENDQUERY diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INRULE.wql b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INRULE.wql index ca0bc7b13..c018f32eb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INRULE.wql +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INRULE.wql @@ -212,7 +212,7 @@ attr.row_num = 输入.row_num ENDOPTION - order by attr.col_num DESC ,attr.layer_num ASC,attr.zdepth DESC + order by attr.col_num,attr.layer_num ASC,attr.zdepth DESC ENDSELECT ENDQUERY diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INVEHICLE.wql b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INVEHICLE.wql index cb8dac055..c603aa489 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INVEHICLE.wql +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INVEHICLE.wql @@ -22,7 +22,7 @@ 输入.row_in TYPEAS f_string 输入.not_row_in TYPEAS f_string 输入.not_block TYPEAS f_string - 输入.storagevehicle_type TYPEAS s_string + 输入.vehicle_type TYPEAS s_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -64,8 +64,8 @@ attr.block_num NOT IN 输入.not_block ENDOPTION - OPTION 输入.storagevehicle_type <> "" - attr.storagevehicle_type = 输入.storagevehicle_type + OPTION 输入.vehicle_type <> "" + attr.storagevehicle_type = 输入.vehicle_type ENDOPTION group by attr.block_num @@ -147,7 +147,7 @@ AND attr.block_num = 输入.block_num AND attr.row_num = 输入.row_num - order by attr.col_num,attr.layer_num ASC,attr.zdepth DESC + order by attr.col_num DESC,attr.layer_num ASC,attr.zdepth DESC ENDSELECT ENDQUERY diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTBOX.wql b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTBOX.wql index 9b30a0e8b..aaccdb7b7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTBOX.wql +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTBOX.wql @@ -228,7 +228,7 @@ box.num = 输入.num ENDOPTION - order by attr.col_num, attr.zdepth, attr.layer_num + order by attr.col_num DESC, attr.zdepth, attr.layer_num ENDSELECT ENDQUERY diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTVEHICLE.wql b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTVEHICLE.wql index b8b81a94a..9dbab0059 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTVEHICLE.wql +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTVEHICLE.wql @@ -168,7 +168,7 @@ attr.row_num = 输入.row_num ENDOPTION - order by attr.col_num, attr.zdepth + order by attr.col_num DESC, attr.zdepth ENDSELECT ENDQUERY diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java index c98d16eab..a99c71e1f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java @@ -375,6 +375,7 @@ public class CheckOutBillController { @PostMapping("/testInEmp") @Log("空载具入库测试") + @SaIgnore public ResponseEntity testInEmp(@RequestBody JSONObject whereJson) { new InVehicleManageServiceImpl().inVehicle(whereJson); return new ResponseEntity<>(HttpStatus.OK); diff --git a/lms/nladmin-ui/src/assets/styles/eladmin.scss b/lms/nladmin-ui/src/assets/styles/eladmin.scss index 0970b01ac..4ed6f2887 100644 --- a/lms/nladmin-ui/src/assets/styles/eladmin.scss +++ b/lms/nladmin-ui/src/assets/styles/eladmin.scss @@ -1,14 +1,17 @@ .head-container { - padding-bottom: 10px; + padding-top: 8px; + padding-bottom: 6px; + background-color: #ffffff; + border-radius: 4px; .filter-item { display: inline-block; vertical-align: middle; - margin: 0 3px 3px 0; + margin: 0 3px 10px 0; input { - height: 28px; - line-height: 28px; + height: 30.5px; + line-height: 30.5px; } } @@ -19,7 +22,7 @@ vertical-align: middle; font-size: 14px; color: #606266; - line-height: 28px; + line-height: 30.5px; padding: 0 7px 0 7px; } @@ -28,7 +31,7 @@ } .el-select__caret.el-input__icon.el-icon-arrow-up { - line-height: 28px; + line-height: 30.5px; } .date-item { @@ -149,7 +152,7 @@ } .el-form-item--mini.el-form-item { - margin-bottom: 8px !important; + margin-bottom: 10px !important; } //去除编辑文本框为数字时的上下箭头start @@ -188,7 +191,7 @@ input[type="number"]::-webkit-outer-spin-button { .el-table__fixed-header-wrapper { th { word-break: break-word; - background-color: #f8f8f9; + background-color: #f5f5f5; color: #515a6e; height: 35px; font-size: 13px; diff --git a/lms/nladmin-ui/src/assets/styles/index.scss b/lms/nladmin-ui/src/assets/styles/index.scss index 21fbda181..c33d34787 100644 --- a/lms/nladmin-ui/src/assets/styles/index.scss +++ b/lms/nladmin-ui/src/assets/styles/index.scss @@ -21,6 +21,7 @@ label { html { height: 100%; box-sizing: border-box; + background-color: #eeeeee; } #app { @@ -98,7 +99,7 @@ div:focus { } aside { - background: #eef1f6; + background: #d40c70; padding: 8px 24px; margin-bottom: 20px; border-radius: 2px; @@ -122,7 +123,7 @@ aside { //main-container全局样式 .app-container { - padding: 20px 20px 45px 20px; + padding: 10px 10px 45px 10px; } .components-container { diff --git a/lms/nladmin-ui/src/assets/styles/variables.scss b/lms/nladmin-ui/src/assets/styles/variables.scss index 384517bb5..1d1c7bffd 100644 --- a/lms/nladmin-ui/src/assets/styles/variables.scss +++ b/lms/nladmin-ui/src/assets/styles/variables.scss @@ -13,17 +13,17 @@ $base-logo-light-title-color: #001529; $base-menu-light-background:#ffffff; // sidebar -$menuText:#bfcbd9; +$menuText: #ffffff; $menuActiveText:#409EFF; -$subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951 +$subMenuActiveText: #ffffff; // https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; //https://cloud.tencent.com/developer/article/1753773 -$menuHover:#263445; +$menuBg: #001529; //https://cloud.tencent.com/developer/article/1753773 +$menuHover:#4e5465; $base-menu-light-color:rgba(0,0,0,.70); -$subMenuBg:#1f2d3d; -$subMenuHover:#001528; +$subMenuBg:#000c17; +$subMenuHover:#4e5465; $sideBarWidth: 205px; @@ -45,4 +45,4 @@ $sideBarWidth: 205px; logoLightTitleColor: $base-logo-light-title-color } -$base-sidebar-width: 200px; +$base-sidebar-width: 2010px; diff --git a/lms/nladmin-ui/src/components/Crud/CRUD.operation.vue b/lms/nladmin-ui/src/components/Crud/CRUD.operation.vue index 4c5cc02cc..b3c07b89b 100644 --- a/lms/nladmin-ui/src/components/Crud/CRUD.operation.vue +++ b/lms/nladmin-ui/src/components/Crud/CRUD.operation.vue @@ -258,6 +258,7 @@ export default { display: -webkit-flex; display: flex; align-items: center; + margin: 0px 10px 0px 10px; } .crud-opts .crud-opts-right { margin-left: auto; From 9d752f91ea31817a23987adc2fcb6e29ac2774c4 Mon Sep 17 00:00:00 2001 From: liuxy Date: Sat, 11 May 2024 17:16:54 +0800 Subject: [PATCH 02/10] =?UTF-8?q?rev=EF=BC=9A=E5=9B=BE=E6=A0=87=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lms/nladmin-ui/public/favicon.ico | Bin 67646 -> 622 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/lms/nladmin-ui/public/favicon.ico b/lms/nladmin-ui/public/favicon.ico index fcb69992e5f0777989b89db9a6318b3621eff240..63a15850348b3f5fd0713efd31939bd593883814 100644 GIT binary patch literal 622 zcmV-!0+IcRP)Mt=q^QwYi1`C(7H(>~@>*zy#mL6X&Q2^Y8%r zsn7zbOXxlURhaMjvecN0A3C9!ik1t0__@b}pw**R?u#+A6^7qlYZCT9npQ$#w~}vh z!n6ol1Sv{s3G^E#BF}z8kOQrPETyyqTELxwX&Us))(Ad8%iyC@Is&ys=gPoT_(ede zt%=P~P^Og5K{ckwhFkj`gmim63YwHYv8;`l?i=oF7u4%{xDa$geJDZr#l;1~m~k=VSx}+~Vlp$?8ux)5s?~#fj#*8F(BrAde1T!yqN-ewe zO$lS&?G(mzCpdqSl9Pnr~AG8&Uena=bn4cxgO7D_^-9qga426j2(8F=PHlKGZqaW@k9AJPvu4Q z#QncZ0ha*qN3?c-m)0!*7SSqw zk>FHcBsAXN5xS!0R82;{o7*Xi0>wQo9$&a=IPe?;EQxan?GVm;&_2WYmuTnFzDD~7 z-(&mM*A)_ewg}JB__yeH@ZHdt`ftzR_$*q`-xYiS-y2;J2@G@j!lHk=&Zc(MdA#A^ zb-=71?Rj8x26B8JSVeI)@J+~36L`jXJcB%S1Pyv3aBaHYeXu^)-`zA67~BXQO&Na! zcz-KpI3XD8`kjS|5ztDQe zo$?>nM1E&b6m$f{jCblp$s3Es+}9R}c`wfs^Is|x3y#kb)xVuBs$ZBb7XG$WEco3V zG5^K6qT-cGQF^jQ6urGvOgq&mf1e)?a*XI*r(n#$-_Kyo*bO^lg0C|;tl(@@GD$LM z?wucQ1n$}lw3mSSH+{+aw2nqm^j59Jx$>oQvFP~{vFzUqMZ+)iMdKmA2psf^;L~{` zcwnl~o|+;;`=^MeeUruVCms|J?R`M3*mJ*Fx%)n`^6`7cs$KWU>mYtpdt|1lda+ED zo~RLp;EBHa06zFT`uZ&T>i3@t4jnW=CHO^QvkwO?VTWtS(Y}aDbI3SlwD>=kK&~sK zEH61)1k9(4x@QYT{jUl{{WJLk#((vWNn*|RyT#gVcgaScAg}P=Wq)2EX1rS`q;7DG z7wE45{-5J`%p2Aw`of`M2_{cY-wt|oENHizvJ?|{(0ArrOU2wjS4rKy_*juxa&)Gs zeQt(WdU(2&`9$O2{Mba%vh_~Uy5$bBj_r}3Lr>f%pE>unh2VqO;{)D+r|3LKa-6-vHZ!&q7pi2 zI&=c~);30fpE<9D%@V5eb_K6U0I7277R5)4J^s$%XwdB#+SeDzJnXNcH)~;=&4Zm* zD)oHzZ)Rl#{%xCnCfYXMCLZ4KQ}Hm4D|g=yKB$zor}I59CY<+1w0+=(5qxL&pU30t zgk9eiDvQdzU2goqea1V>MEM^p#r)%Q#e(0@fxeI0?3sxFhPDY}-(xE;tPSn>NtmbDOMC*Mn}QC#t1gN9?PBeYW7g zY27Vi^SYa*K4?6Y4?D5`!ZD#s`vmXZ2pSBT`k!@!P8C45;kOGOvEfcTnzkM0-sP{( z7nOe~mvi-O#lO8}ym+MfCea2vVIlaJ{s`OqM*T;7;lsLSurPqPXZhv%k){#AnZ7$~ zKCjC>{WRt9!OZ*Pyqv**%i0^oruDbTc_`dj(tz~fJf8ZVa$f=La}ED3YkndgU44UC1G|9!MF$VikNgUFVN|X%fcI3xw%?g*~~a2fUpc z*XiE0t=9m1&X*O<;@zJc2$^Jq*gY{m7G2ORc*fX-Z25Xnv-k@V?Cv@+mr`F4Ok?fjCzE|#+I;y+dp|DD>;e}3pQ<6U^NfiIDElt{;{@$LC;mHwKNhW9C&D&@znH#IV@?p( z_Q5ywPuao)&|5+HGOV?G-PWh4MqQ6GWyCR?R~~?xcJ{F27><%%nvFN z`=ZhmG(O-ztz}eP@npp3qhBT9%`eTqN}I19x_@xtzu{rTfgvVrJ>mlyBf1Vp#)WNa zyHz}bcmS^d(Es1p_;1Mn-nt)(hY>rV+Jcx@eTFu*;A|*k)Bs}It^ocotJvpD*{{n< z{2A}bSYXD5GjE{bnF1M;I1jQq2kV%#;oq2rd2aC=OJtM&uGi`7u9o>F)yOqzL{7qL zuSV~K(?auLCy)gv_rmdAY*ckFxTUnz7@AgoB#a= znRk;*^1pWbT|zsMCu5H3tDDJK4%+6I&?wup!7H@)n~;yP5pkrCV;;!ypYp$V*(m6M z+hwkS@f_ff{M5kcOi=(>*IQ-ujYrBp*YufpmF@Vi+I6o8JvCLzcM1F#h2U#L7S(r7 z#5sLrq*(>l!8P~*+FNfH^b783xK1oQUS{Jn$Q$MYp|tCO$!`UQ*mOVeFF+pF^sLAK zUQzd}Y0%g6F%L@~=6&(a^!FMN^Ey{FZ=WRA?!4EQV*(w}g_d?50NEb}{E>HU>A`8B zSGMBM{H~?QBjOk?<2ChhSAD;fp5ytPM{%sN*@4kI1!d_T1F%MU8}R=~r3uIWY{Z{= zqH__4VvonL_*#9(OgIPKkEI>|XpW|}#tS`=ZTL6-!YAWRFNn`pbXq3h?d${aKkw_* z#v#}I@^tY5`cQyo&HJ+me+_os;$y||OV=jNrgLJJ(CcWtU2Zw3cNCv)NvSTtb0?$O;yf}L|G?8;u@p5S zq|En{vz?7R01OyE{2}H9%h9f!BwA9U3-GK7X#cI!tN`o1nQH&B-iwT{NVi?D=u4G$ z2{>mA`3vyLrevMS->qGZv8PMzcRtpvG7W#$0bxENeG_V5bMYMblLtP5Tq3VJnAEtT zyi*N~??yhCHBX`+E0g?x_3+QLu2Z(z_bN>Xb}s84?(%gsC5;DA6LA#$p*H^y{iE~& zWrF{gV?E=HSr2SrG_?3S8-K6s0_5H#XFLF1??C(5=@X}{r5pdHr~}2?JkGvlBaWBS zXJAj;umfYk-Fe-Cgw79;$6tgNv*sqpfOM_@unrX0T?ae%D&K$yK1Yn!oGG0RmlQve z7Y>eQ?T*5C0<7Cp3;e&8xhoEvTIvA!ty3NUQ~TUZ~E&;2%VL9kmUa)4k8YU#^=tbO7I*Yv!ql|6YPRozl)v zg-=g^FV-umda+yte&H9a7s=Ql)&$$|@C30L>-Ve!v>x#rtVtr%4#JrL z>sivKJP#iDn}I*;?=she@jn;nJA9u$A<9cK^1oOEGFkQ>Z5!q_bjC<1|h{OC4ctEDL zd;C4xRRbB@`|}&{)-GEgbosTs;66)#?+$OcX}~spe{eUx1OD17<=*Ho|=~xfG z9YOU@ zD4Y4aXe?m8A)m=U0{i9t#h>!RTJ7Y6UTq-Yz_Ej4Ep9*laS}3}UIiQS5-u}=yv47FE;;EW{vDJ(M7GI$i8u%pp=<5pl zF@Ln>`}7BYng5OXALoF~372z4`f8lKz-!41h$Fz5%=zM6_|&+^2lwt_EofN>95vus zKg#?)e}nsRjo(;%;BU!8)bES|VEhlUZ#d+`UJ-?IKOpi&uewRWAr>}C{S5EJdNAv^ z+=+akABraz|G>n*jQ(xCZ@~Tw`12+v8+YUW@cZ3}XWHs}^c#Pr{tInC$qN`CE~;xm z3)%|Q_0gQ-XgvX=h7|4f3f76|-cA@37Qy$*y?^Sk_HXY01G|oU`7jQI&y}`mI`O^8 zvso8z3vx!ESUOVds~us(zlb)8fqz%%Q_TJ1_Tw0M#(SK4su8{f)+Eu_#-*%U^Z(xT ze_!<R$sEuN&B;>WF6^Gv9^yL#~|uAE*7-m;5{N?{EEY z+VFAN|FP(v37>(6^Z!sG+OcM!=6}bM{}oS6wrn2s9kHIxVWp{r>|Q{|74n-2aO_Am;(#K~pDPgytFXJzzHzei7|}SL|pSD~$SYeaZh$jQ!=X zmCXJ}>#I&k74F7!fc-eMvr0eY94a07)BYnL&}TzEWcDe8d4S_3=Wy%We=fEYd*u1| z2mkigTO4)4LT_X5kd*I3jrk^Py&YF+oi6z|?0@F+$yi^=mD;aNJLg=P{+#yK@wWP} z{lR|)YJwT>1Nw9Qb${Wzsaf|iWS_^HQ#F_a1nZ5y@F;D-H0XZ=f6n)6kIcx}9B$Hw zv0-a>PLg#Xo%LTYhCj#t3hXIo&>Yx*134_=d@LRR5KB51eX*?rNgEJzch0p_VgJY4 z|Fib+4ET5|qP~L+83Q;jE(3qE4p=<(zf}A0QP_ua|0v^~;DgDJG$w7G|6)7^yK^Yo z>jpp4CY57An(>!@Klp!Yep4dXluTRMpj!%$l!Ha^Q!`G8`#;4~|52U)(+3bd=(p^C zyaVL_$i*;9=HK(eq07;S<)E*%76cu~nxE;Ee*=H+|IIOh{-BHcmlMeokOS($1&9}0 zh1db^12~ZSk1GBmC!9rro#<~^wE$XgAF5n^npjQvL3ccSp$-S{JWyhl{`x94|<;*Qc z2R6V&@PTbTm@%N~vj0^5&oy6j{qG>wexJ^h>%aV*a>{ilt|>6SqQCgd7;wa@aP5I{ z{frf247fA?J5l(rM@|8G%;+EJecsm{91|~2$@)I`v`3#TUjXF-zQ9bzUwdkbjQ;Qs{y!1;vli$A z)_w#{CH~Cq@6rzDozc=>`_bShS^pXPQ=nf~9U%0VvEG!el;(dS@3TMhZ{Xhqe+uKi zSjTt8p8L)Czf~B&8T+{gxf@3OFXO$5`8qblf1C0Dz2tu+0{=Gn2Md&O3S%wS`nCJ~ zAE#%|Z(!~`vL-qDW~=|sHA=Vs`%Q9>zk%3)+Ys-i`g@}KU)w+J{miNTtnvZ)a;j4Y zxcfg09RDVaOENCan48MA9&Nlz^GrI=?+S5EU^klO6NFtQ#{k4`BxC(Qmj5po^#3C* zH`~^EK+~@wTg|Aqk}>0cEZ)PMbPW1x)q{l{K;KI$@_*^;Vcmyp$A8<3ao8Jru4(U6 z?}Mh8?>A<}K7hz6tcAU5ix1`e#g+g5`F{h*Nl<+g!2T<&wakbmZ<+WR^wjs!=flQ) zl}EmhyZ>X~`0vzyELz|{vd{HHtmU>FbykvA!z&p)l;0U*ZHP})9-u8l9gvLtZ~Aw$ zUH@-vn;`cBG3WYGz25`h+BM0*D4F+cZf^D<7KeL6S+!wxTR`rIgIFCScK=fIKh^dB ztQ`Ll)Aa~yg)j!rfxX=SIhi;m^WLxnSQ~Pksss3bjMsJdf4BDk-HQF682fuc>{?h` zjD4O`lGB|mKEPhk!(a~_0PfcM0Q4HyUzp>^b(6s?|LvIP&3}2G)7ED`XUb!`lfeV5 zLk;||!TY=d9DzbM`n2~BBggK_WZ;pmdjk6rc&`&^b{@bQ z0quZGiT}>V@t=D{a=$=zY(x$pv46>TDz~sF&w0;i9`H1LLx@*)@Br-aGMjUKf9Nl=c8)23DYw+_q z2WEf=KEQZj%?-#8SUYCELm6s3PzPiS{*3=zvF8E!HmYrT`s8uECuRO`@QvMv7{09b z?Ie;(VGoP|{?GU$AuFfY&_afS37b4*B!{|7Ok zj2C6jv8?Ouz}&ze@9`PhhP+7XbF|ZeU80`p4>w}nAaplqcLeQor~M@9OPzo`E5;Yo zZ?F*cvd9Zu1FVDH#r&_{;{W4~|79F7bGe$HoGg|ihotlb>OI4E*-O7T#(##t9YlWa zZTS(+9p?wg7zL*Sm?H$epy#oewt=D-IA>t2A^pkou%=RtnozaRO^=!X(I5OdmNz12 zi2Hc(ezQ=!&K8fUJlmA_E;+^@M4u%>}er#2pZfcVnT z8655Qfr0HyqO!+ zi+(5W=nH)~U1;t2-Z;c+4J&#pkTLYjrH*)emSf+7&}h`Wss+7YhOO8;AE-Q$g!3rw zq2B>>?1!XX=kJbxFNIvfCe`mU^Q}h27=^9|?Xl0Pb_lHlbBHfsH`wfNLpNX2k!x14 zL+}jlt8oy|D9Mk6a%zn>)%YdydBB9e#8JTi4&byH=eu$KHjba5eS!8BKL0x!^X9*y z-oTM-Zfrbf4X&>YG2HGx+=T-Ra?KtONDj6MvpGdl9`@N<_fY?F&~wljd+f0qI-1zZZa6mTiv zQoyBvO97VxE(Kf)xD;?H;8MV)fJ*_F0xkty3b+(-Dd1ATrGQHTlL8_q|9v;o_FCV0 zJhl(cc|4b?Um!ImSs(l_um91yKF4e22d%vJv>0E&-T7~%as7YM>wh+`|0jC=561Pm z=(Tyn*66jz_`7~-^hm$G`2hX)9*_P2*<1cb@3H5{` zGXEUykl7u*L(XfndwK`W?&%$LUYp(3JM6qZXFXrOKp)rgg-%-EzvwkzQ2oC1dXnSs zq`3NhQe3@e2i0qKz;->!aXr#;jR)Aij|bSU0cop8`FEN4&UWo-QOM8lIj&oT?eDmq z?HZ4_U88%>YXxq}0Li`<%G*i?jQ6@#`9X`Y(=XQbN#*u@^8q7`-|KJKVqVJ|nzs`|_E_(&{1Q7b U$^5!t50tOVCyZ47oXe;G53^4nod5s; From fd86281afee2341e0e8adfe797a1d144ab04acf1 Mon Sep 17 00:00:00 2001 From: liuxy Date: Sat, 11 May 2024 17:27:00 +0800 Subject: [PATCH 03/10] =?UTF-8?q?rev=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=A9=BA?= =?UTF-8?q?=E6=89=98=E7=9B=98=E5=87=BA=E5=BA=93=E4=BB=BB=E5=8A=A1=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java | 1 - 1 file changed, 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java index a08fd9b53..a5071535d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java @@ -89,7 +89,6 @@ public class TwoOutEmpTask extends AbstractAcsTask { JSONObject jsonAttr = attrTab.query("struct_code = '" + jsonTask.getString("point_code1") + "'").uniqueResult(0); jsonAttr.put("lock_type",IOSEnum.LOCK_TYPE.code("未锁定")); jsonAttr.put("storagevehicle_code",""); - jsonAttr.put("storagevehicle_type",""); attrTab.update(jsonAttr); } From 34def7f32a468121246e170b242b50b4644f8af0 Mon Sep 17 00:00:00 2001 From: baoge <751575283@qq.com> Date: Sat, 11 May 2024 22:09:26 +0800 Subject: [PATCH 04/10] =?UTF-8?q?opt:=E7=A9=BA=E6=9C=A8=E7=AE=B1=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=A2=9E=E5=8A=A0=E5=B1=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/VehicleTwoServiceImpl.java | 2 -- .../nl/b_lms/sch/tasks/TwoInBoxTrussTask.java | 11 +++++++-- .../util/impl/InBoxManageServiceImpl.java | 8 +++---- .../acs/service/impl/AcsToWmsServiceImpl.java | 23 +++---------------- .../main/java/org/nl/wms/sch/AcsTaskDto.java | 4 ++++ lms/nladmin-ui/.env.development | 5 ++-- 6 files changed, 23 insertions(+), 30 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/VehicleTwoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/VehicleTwoServiceImpl.java index 504d0e3bd..451d34124 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/VehicleTwoServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/VehicleTwoServiceImpl.java @@ -42,10 +42,8 @@ public class VehicleTwoServiceImpl implements VehicleTwoService { public JSONObject boxIn(JSONObject whereJson) { // 调用接口 inBoxManageService.boxBinVehicle(whereJson); - JSONObject result = new JSONObject(); result.put("message", "入库成功!"); - return result; } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java index bb214754a..e53201fe1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import org.apache.commons.lang3.StringUtils; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; @@ -16,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * 二期入木箱行架任务类 @@ -38,7 +40,6 @@ public class TwoInBoxTrussTask extends AbstractAcsTask { ArrayList resultList = new ArrayList<>(); for (int i = 0; i < arr.size(); i++) { JSONObject json = arr.getJSONObject(i); - char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1); AcsTaskDto dto = AcsTaskDto.builder() .ext_task_id(json.getString("task_id")) @@ -50,6 +51,7 @@ public class TwoInBoxTrussTask extends AbstractAcsTask { .priority(json.getString("priority")) .class_type(json.getString("task_type")) .dtl_type(String.valueOf(dtl_type)) + .interaction_json(JSONObject.parseObject(json.getString("request_param"))) .remark(json.getString("remark")) .build(); resultList.add(dto); @@ -143,7 +145,12 @@ public class TwoInBoxTrussTask extends AbstractAcsTask { json.put("create_time", DateUtil.now()); json.put("priority", "1"); json.put("acs_task_type", "7"); - + if(StringUtils.isNotBlank(form.getString("layer"))) + { + JSONObject layer= new JSONObject(); + layer.put("layer",form.getString("layer")); + json.put("request_param", layer); + } WQLObject.getWQLObject("SCH_BASE_Task").insert(json); return json.getString("task_id"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java index bceda36d7..1eda2d531 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java @@ -151,9 +151,9 @@ public class InBoxManageServiceImpl implements InBoxManageService { JSONObject jsonVehicle = vehicleTab.query("storagevehicle_code = '" + whereJson.getString("vehicle_code") + "'") .uniqueResult(0); - if (ObjectUtil.isEmpty(jsonVehicle)) { - throw new BadRequestException("载具不存在!"); - } + if (ObjectUtil.isEmpty(jsonVehicle)) { + throw new BadRequestException("载具不存在!"); + } JSONObject jsonVeExt = new JSONObject(); jsonVeExt.put("storagevehicleext_id", IdUtil.getLongId()); @@ -171,7 +171,7 @@ public class InBoxManageServiceImpl implements InBoxManageService { taskParam.put("next_device_code", "1001"); taskParam.put("vehicle_code", whereJson.getString("box_no")); taskParam.put("vehicle_code2", whereJson.getString("vehicle_code")); - + taskParam.put("layer", whereJson.getString("layer")); TwoInBoxTrussTask taskBean = new TwoInBoxTrussTask(); taskBean.createTask(taskParam); taskBean.immediateNotifyAcs(null); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index bf32c89f0..536a92415 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -1,4 +1,5 @@ package org.nl.wms.ext.acs.service.impl; + import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.NumberUtil; @@ -1323,11 +1324,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { WQLObject.getWQLObject("st_ivt_shaftivt").update(rgv_device); //如果套管工位有货且套轴区域无轴，搬运一根轴到穿拔轴机上 - if (rgv_device.getIntValue("have_qzz") == 0){ + if (rgv_device.getIntValue("have_qzz") == 0) { //判断当前穿拔轴机构上是否存在可用的气涨轴 String cbj_qzz = cbz_jo.getString("have_qzz"); //判断是否存在未完成的成品下卷任务 - JSONObject container_jo = WQLObject.getWQLObject("sch_base_task").query("task_type = '010605' AND product_area = '"+product_area+"' AND task_status < '07' AND is_delete = '0'").uniqueResult(0); + JSONObject container_jo = WQLObject.getWQLObject("sch_base_task").query("task_type = '010605' AND product_area = '" + product_area + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0); if ("0".equals(cbj_qzz) && ObjectUtil.isEmpty(container_jo)) { PaperTrussTask paperTrussTask = SpringContextHolder.getBean(PaperTrussTask.class); //查询套管工位的库存信息 @@ -1814,46 +1815,35 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { public JSONObject applyTwo(JSONObject whereJson) { log.info("applyTwo请求参数：---------------------------------------------" + whereJson.toString()); JSONObject result = new JSONObject(); - String type = whereJson.getString("type"); RLock lock = redissonClient.getLock("acs_to_wms_two_a:" + type); boolean tryLock = lock.tryLock(5, TimeUnit.SECONDS); - try { if (tryLock) { // 基础校验 if (ObjectUtil.isEmpty(whereJson.getString("device_code"))) { throw new BadRequestException("设备不能为空!"); } - if (type.equals(IOSEnum.ACSTOLMS_TYPE.code("空盘入库"))) { if (ObjectUtil.isEmpty(whereJson.getString("container_type"))) { throw new BadRequestException("载具类型不能为空!"); } - if (ObjectUtil.isEmpty(whereJson.getString("vehicle_code"))) { throw new BadRequestException("载具不能为空!"); } } - // 1-成品入库任务 if (type.equals(IOSEnum.ACSTOLMS_TYPE.code("成品入库任务"))) { - // 调用服务处理 if (ObjectUtil.isEmpty(whereJson.getString("material_barcode"))) { throw new BadRequestException("子卷号不能为空!"); } - inBussManageService.inTask(whereJson); - } else if (type.equals(IOSEnum.ACSTOLMS_TYPE.code("空盘入库"))) { - // 2-空盘入库 whereJson.put("vehicle_type", whereJson.getString("container_type")); inVehicleManageService.inVehicle(whereJson); - } else if (type.equals(IOSEnum.ACSTOLMS_TYPE.code("空盘出库"))) { - // 3-空盘出库 if (ObjectUtil.isEmpty(whereJson.getString("container_type"))) { throw new BadRequestException("载具类型不能为空!"); @@ -1861,28 +1851,22 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { whereJson.put("vehicle_type", whereJson.getString("container_type")); outVehicleManageService.outVehicle(whereJson); } else if (type.equals(IOSEnum.ACSTOLMS_TYPE.code("异常处理位"))) { - // 4-空木箱异常处理 if (ObjectUtil.isEmpty(whereJson.getString("material_barcode"))) { throw new BadRequestException("木箱号不能为空!"); } - JSONObject jsonTaskParam = new JSONObject(); jsonTaskParam.put("task_type", "010710"); jsonTaskParam.put("start_device_code", whereJson.getString("device_code")); jsonTaskParam.put("next_device_code", "B1_ERRO"); jsonTaskParam.put("vehicle_code", whereJson.getString("material_barcode")); - TwoBoxExcepTask taskBean = new TwoBoxExcepTask(); taskBean.createTask(jsonTaskParam); } else if (type.equals(IOSEnum.ACSTOLMS_TYPE.code("木箱入库"))) { - // 5-木箱入库 whereJson.put("box_no", whereJson.getString("material_barcode")); inBoxManageService.inBox(whereJson); } - - result.put("status", HttpStatus.OK.value()); result.put("message", "下发成功!"); log.info("applyTwo返回参数：---------------------------------------------" + result.toString()); @@ -1893,7 +1877,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { lock.unlock(); } } - result.put("status", HttpStatus.BAD_REQUEST.value()); result.put("message", "申请任务超时！" + type); log.info("applyTwo返回参数：---------------------------------------------" + result.toString()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java index 08ad052de..fbcd0967b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java @@ -59,6 +59,10 @@ public class AcsTaskDto { * 扩展参数 */ private String params; + + + + /** * 温度 */ diff --git a/lms/nladmin-ui/.env.development b/lms/nladmin-ui/.env.development index 809e77ff1..383d102d2 100644 --- a/lms/nladmin-ui/.env.development +++ b/lms/nladmin-ui/.env.development @@ -1,8 +1,9 @@ ENV = 'development' # 接口地址 -VUE_APP_BASE_API = 'http://localhost:8010' -VUE_APP_WS_API = 'ws://localhost:8010' +VUE_APP_BASE_API = 'http://localhost:8011' +VUE_APP_WS_API = 'ws://localhost:8011' # 是否启用 babel-plugin-dynamic-import-node插件 VUE_CLI_BABEL_TRANSPILE_MODULES = true + From 9eea3bb5ea3b9798547d43a96b26a66b4ab0c81f Mon Sep 17 00:00:00 2001 From: baoge <751575283@qq.com> Date: Sat, 11 May 2024 22:23:02 +0800 Subject: [PATCH 05/10] =?UTF-8?q?opt:=E7=A9=BA=E6=9C=A8=E7=AE=B1=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=A2=9E=E5=8A=A0=E5=B1=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/b_lms/sch/tasks/TwoInBoxTrussTask.java | 23 +++++++------------ .../util/impl/InBoxManageServiceImpl.java | 1 - 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java index 35c9fd25d..4bcee8deb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java @@ -36,12 +36,10 @@ public class TwoInBoxTrussTask extends AbstractAcsTask { * 下发给ACS时需要特殊处理 */ JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0); - ArrayList resultList = new ArrayList<>(); for (int i = 0; i < arr.size(); i++) { JSONObject json = arr.getJSONObject(i); - - JSONObject params = json.getJSONObject("params"); + //JSONObject params = json.getJSONObject("params"); char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1); AcsTaskDto dto = AcsTaskDto.builder() .ext_task_id(json.getString("task_id")) @@ -53,13 +51,13 @@ public class TwoInBoxTrussTask extends AbstractAcsTask { .priority(json.getString("priority")) .class_type(json.getString("task_type")) .dtl_type(String.valueOf(dtl_type)) - .interaction_json(JSONObject.parseObject(json.getString("request_param"))) + .interaction_json(json.getJSONObject("request_param")) .remark(json.getString("remark")) - .layer(json.getString("layer")) - .barcode(params.getString("box_no")) - .height(params.getString("height")) - .width(params.getString("width")) - .length(params.getString("length")) + // .layer(params.getString("layer")) + // .barcode(params.getString("box_no")) + // .height(params.getString("height")) + // .width(params.getString("width")) + // .length(params.getString("length")) .build(); resultList.add(dto); } @@ -152,12 +150,7 @@ public class TwoInBoxTrussTask extends AbstractAcsTask { json.put("create_time", DateUtil.now()); json.put("priority", "1"); json.put("acs_task_type", "7"); - if(StringUtils.isNotBlank(form.getString("layer"))) - { - JSONObject layer= new JSONObject(); - layer.put("layer",form.getString("layer")); - json.put("request_param", layer); - } + json.put("request_param", form.getString("request_param")); WQLObject.getWQLObject("SCH_BASE_Task").insert(json); return json.getString("task_id"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java index 288a48ad8..477c225e9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java @@ -188,7 +188,6 @@ public class InBoxManageServiceImpl implements InBoxManageService { param.put("vehicle_type", boxDao.getVehicle_type()); param.put("box_no", whereJson.getString("box_no")); taskParam.put("request_param", param.toString()); - TwoInBoxTrussTask taskBean = new TwoInBoxTrussTask(); taskBean.createTask(taskParam); taskBean.immediateNotifyAcs(null); From 28059f42691a25715d19e3faff59f3cc4f02261c Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Sun, 12 May 2024 15:12:00 +0800 Subject: [PATCH 06/10] =?UTF-8?q?rev:=E7=A9=BA=E6=9C=A8=E7=AE=B1=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/iostorInv/util/impl/InBoxManageServiceImpl.java | 2 +- .../master/service/impl/StoragevehicleinfoServiceImpl.java | 3 +++ .../org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java index 3d4612271..573cb3f17 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java @@ -177,7 +177,7 @@ public class InBoxManageServiceImpl implements InBoxManageService { JSONObject taskParam = new JSONObject(); taskParam.put("task_type", "010713"); taskParam.put("start_device_code", whereJson.getString("point_code")); - taskParam.put("next_device_code", "1001"); + taskParam.put("next_device_code", "1005"); taskParam.put("vehicle_code", whereJson.getString("vehicle_code")); taskParam.put("vehicle_code2", whereJson.getString("vehicle_code")); JSONObject param = new JSONObject(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java index 2de67c2ec..c15e827d0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java @@ -128,6 +128,9 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService case "0002": code = "VEHICLE_CODE_GXTP"; break; + case "0003": + code = "VEHICLE_CODE_LK"; + break; default: break; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index bf32c89f0..1a669c7fa 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -1827,6 +1827,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } if (type.equals(IOSEnum.ACSTOLMS_TYPE.code("空盘入库"))) { + String vehicleCode = whereJson.getString("vehicle_code"); + if (StrUtil.isEmpty(vehicleCode)) { + vehicleCode = CodeUtil.getNewCode("VEHICCLE_CODE_KTP"); + whereJson.put("vehicle_code", vehicleCode); + } if (ObjectUtil.isEmpty(whereJson.getString("container_type"))) { throw new BadRequestException("载具类型不能为空!"); } From a296a4845d4fe8b842802c86cda03dc9f6bc17df Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Sun, 12 May 2024 15:12:49 +0800 Subject: [PATCH 07/10] =?UTF-8?q?rev:=E7=A9=BA=E6=9C=A8=E7=AE=B1=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java index 2a295cf89..b140f1f62 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java @@ -177,7 +177,7 @@ public class InBoxManageServiceImpl implements InBoxManageService { JSONObject taskParam = new JSONObject(); taskParam.put("task_type", "010713"); taskParam.put("start_device_code", whereJson.getString("point_code")); - taskParam.put("next_device_code", "1005"); + taskParam.put("next_device_code", "RK1005"); taskParam.put("vehicle_code", whereJson.getString("vehicle_code")); taskParam.put("vehicle_code2", whereJson.getString("vehicle_code")); JSONObject param = new JSONObject(); From a6b9e54572459649d83d09361f17a4b83d52f8dd Mon Sep 17 00:00:00 2001 From: baoge <751575283@qq.com> Date: Sun, 12 May 2024 15:26:32 +0800 Subject: [PATCH 08/10] =?UTF-8?q?opt:=E7=A9=BA=E6=9C=A8=E7=AE=B1=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=A2=9E=E5=8A=A0=E5=B1=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/b_lms/sch/tasks/TwoInBoxTrussTask.java | 2 +- .../util/impl/InBoxManageServiceImpl.java | 40 +++++++++---------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java index 4bcee8deb..62836f889 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java @@ -149,7 +149,7 @@ public class TwoInBoxTrussTask extends AbstractAcsTask { json.put("create_name", SecurityUtils.getCurrentUsername()); json.put("create_time", DateUtil.now()); json.put("priority", "1"); - json.put("acs_task_type", "7"); + json.put("acs_task_type", "6"); json.put("request_param", form.getString("request_param")); WQLObject.getWQLObject("SCH_BASE_Task").insert(json); return json.getString("task_id"); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java index b140f1f62..3ea681570 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java @@ -155,24 +155,22 @@ public class InBoxManageServiceImpl implements InBoxManageService { new QueryWrapper().lambda() .eq(BstIvtBoxinfo::getBox_no, whereJson.getString("box_no")) ); - - + if (boxDao == null) { + throw new BadRequestException("木箱不存在!"); + } JSONObject jsonVehicle = vehicleTab.query("storagevehicle_code = '" + whereJson.getString("vehicle_code") + "'") .uniqueResult(0); - - if (ObjectUtil.isEmpty(jsonVehicle)) { - throw new BadRequestException("载具不存在!"); - } - - JSONObject jsonVeExt = new JSONObject(); - jsonVeExt.put("storagevehicleext_id", IdUtil.getLongId()); - jsonVeExt.put("storagevehicle_id", jsonVehicle.getLongValue("storagevehicle_id")); - jsonVeExt.put("storagevehicle_code", jsonVehicle.getString("storagevehicle_code")); - jsonVeExt.put("storagevehicle_type", jsonVehicle.getString("storagevehicle_type")); - jsonVeExt.put("pcsn", whereJson.getString("box_no")); - jsonVeExt.put("device_uuid", IdUtil.getLongId()); - veExtTab.insert(jsonVeExt); - + // if (ObjectUtil.isEmpty(jsonVehicle)) { + // throw new BadRequestException("载具不存在!"); + // } +// JSONObject jsonVeExt = new JSONObject(); +// jsonVeExt.put("storagevehicleext_id", IdUtil.getLongId()); +// jsonVeExt.put("storagevehicle_id", jsonVehicle.getLongValue("storagevehicle_id")); +// jsonVeExt.put("storagevehicle_code", jsonVehicle.getString("storagevehicle_code")); +// jsonVeExt.put("storagevehicle_type", jsonVehicle.getString("storagevehicle_type")); +// jsonVeExt.put("pcsn", whereJson.getString("box_no")); +// jsonVeExt.put("device_uuid", IdUtil.getLongId()); +// veExtTab.insert(jsonVeExt); // 下发桁架任务 JSONObject taskParam = new JSONObject(); taskParam.put("task_type", "010713"); @@ -181,10 +179,10 @@ public class InBoxManageServiceImpl implements InBoxManageService { taskParam.put("vehicle_code", whereJson.getString("vehicle_code")); taskParam.put("vehicle_code2", whereJson.getString("vehicle_code")); JSONObject param = new JSONObject(); - param.put("layer",whereJson.getString("layer")); - param.put("box_length",boxDao.getBox_length()); - param.put("box_width",boxDao.getBox_width()); - param.put("box_high",boxDao.getBox_high()); + param.put("layer", whereJson.getString("layer")); + param.put("box_length", boxDao.getBox_length()); + param.put("box_width", boxDao.getBox_width()); + param.put("box_high", boxDao.getBox_high()); param.put("vehicle_type", boxDao.getVehicle_type()); param.put("box_no", whereJson.getString("box_no")); taskParam.put("request_param", param.toString()); @@ -248,7 +246,7 @@ public class InBoxManageServiceImpl implements InBoxManageService { * box_length：木箱长度 * box_width：木箱宽度 * box_high：木箱高度 - * } + * } * @return JSONObject ： 仓位对象 */ public JSONObject getStruct(JSONObject jsonParam) { From 6831a82a5a416cc3678d42b712b66abf548af6d5 Mon Sep 17 00:00:00 2001 From: baoge <751575283@qq.com> Date: Sun, 12 May 2024 16:43:16 +0800 Subject: [PATCH 09/10] =?UTF-8?q?opt:=E7=A9=BA=E6=9C=A8=E7=AE=B1=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=A2=9E=E5=8A=A0=E5=B1=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java | 7 +------ .../iostorInv/util/impl/InBoxManageServiceImpl.java | 10 +++++----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java index 62836f889..0c525a0c6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java @@ -52,12 +52,7 @@ public class TwoInBoxTrussTask extends AbstractAcsTask { .class_type(json.getString("task_type")) .dtl_type(String.valueOf(dtl_type)) .interaction_json(json.getJSONObject("request_param")) - .remark(json.getString("remark")) - // .layer(params.getString("layer")) - // .barcode(params.getString("box_no")) - // .height(params.getString("height")) - // .width(params.getString("width")) - // .length(params.getString("length")) + .remark(json.getString("rem ark")) .build(); resultList.add(dto); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java index 3ea681570..96456ed75 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java @@ -180,11 +180,11 @@ public class InBoxManageServiceImpl implements InBoxManageService { taskParam.put("vehicle_code2", whereJson.getString("vehicle_code")); JSONObject param = new JSONObject(); param.put("layer", whereJson.getString("layer")); - param.put("box_length", boxDao.getBox_length()); - param.put("box_width", boxDao.getBox_width()); - param.put("box_high", boxDao.getBox_high()); - param.put("vehicle_type", boxDao.getVehicle_type()); - param.put("box_no", whereJson.getString("box_no")); + param.put("length", boxDao.getBox_length()); + param.put("width", boxDao.getBox_width()); + param.put("height", boxDao.getBox_high()); + param.put("containerType", boxDao.getVehicle_type()); + param.put("barcode", whereJson.getString("box_no")); taskParam.put("request_param", param.toString()); TwoInBoxTrussTask taskBean = new TwoInBoxTrussTask(); taskBean.createTask(taskParam); From 6c4170cd598fad212bf279915b89b146c9cb9f6b Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Mon, 13 May 2024 09:35:01 +0800 Subject: [PATCH 10/10] =?UTF-8?q?rev;=E6=9C=A8=E7=AE=B1=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/b_lms/sch/tasks/TwoInBoxTask.java | 3 +- .../util/impl/InBoxManageServiceImpl.java | 80 ++++++++++--------- 2 files changed, 46 insertions(+), 37 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTask.java index 987963131..d579f2a47 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTask.java @@ -46,7 +46,7 @@ public class TwoInBoxTask extends AbstractAcsTask { .task_type(json.getString("acs_task_type")) .start_device_code(json.getString("point_code1")) .next_device_code(json.getString("point_code2")) - .vehicle_code(json.getString("vehicle_code")) + .vehicle_code(json.getString("vehicle_code2")) .priority(json.getString("priority")) .class_type(json.getString("task_type")) .dtl_type(String.valueOf(dtl_type)) @@ -156,6 +156,7 @@ public class TwoInBoxTask extends AbstractAcsTask { json.put("task_code", IdUtil.getSnowflake(1, 1).nextId()); json.put("task_type", form.getString("task_type")); json.put("vehicle_code", form.getString("vehicle_code")); + json.put("vehicle_code2", form.getString("vehicle_code2")); json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); json.put("point_code1", form.getString("start_device_code")); json.put("point_code2", form.getString("next_device_code")); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java index 3ea681570..361b398fd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java @@ -99,6 +99,7 @@ public class InBoxManageServiceImpl implements InBoxManageService { jsonParam.put("box_length", boxDao.getBox_length()); jsonParam.put("box_width", boxDao.getBox_width()); jsonParam.put("box_high", boxDao.getBox_high()); + jsonParam.put("vehicle_type", boxDao.getVehicle_type()); JSONObject jsonAttr = getStruct(jsonParam); @@ -114,6 +115,7 @@ public class InBoxManageServiceImpl implements InBoxManageService { jsonTaskParam.put("start_device_code", whereJson.getString("device_code")); jsonTaskParam.put("next_device_code", jsonAttr.getString("struct_code")); jsonTaskParam.put("vehicle_code", whereJson.getString("box_no")); + jsonTaskParam.put("vehicle_code2", whereJson.getString("vehicle_code")); TwoInBoxTask taskBean = new TwoInBoxTask(); taskBean.createTask(jsonTaskParam); @@ -240,6 +242,7 @@ public class InBoxManageServiceImpl implements InBoxManageService { /** * 找一个空仓位（木箱区） + * * @param jsonParam { * stor_id：仓库标识 * sect_id：库区标识 @@ -259,8 +262,9 @@ public class InBoxManageServiceImpl implements InBoxManageService { */ JSONArray structArray = attrTab.query("IFNULL(storagevehicle_code,'') = '' " + "AND is_used = '" + IOSEnum.IS_NOTANDYES.code("是") + "' AND is_delete = '" + IOSEnum.IS_NOTANDYES.code("否") + "' " + - "AND lock_type = '" + IOSEnum.LOCK_TYPE.code("未锁定") + "' AND stor_id = '"+jsonParam.getString("stor_id")+"' " + - "AND sect_id = '"+jsonParam.getString("sect_id")+"'").getResultJSONArray(0); + "AND storagevehicle_type = '" + jsonParam.getString("vehicle_type") + "'" + + "AND lock_type = '" + IOSEnum.LOCK_TYPE.code("未锁定") + "' AND stor_id = '" + jsonParam.getString("stor_id") + "' " + + "AND sect_id = '" + jsonParam.getString("sect_id") + "'").getResultJSONArray(0); if (ObjectUtil.isEmpty(structArray)) { notInRowList.clear(); @@ -272,11 +276,11 @@ public class InBoxManageServiceImpl implements InBoxManageService { String block_num = getMinBlock(jsonParam); // 确定排：查看每排的木箱数量，找到数量最小的那排 - jsonParam.put("block_num",block_num); + jsonParam.put("block_num", block_num); String row_num = getMinRow(jsonParam); // 确定仓位： 找到仓位 - jsonParam.put("row_num",row_num); + jsonParam.put("row_num", row_num); JSONObject jsonAttr = queryStruct(jsonParam); // 为空则新找巷道 @@ -300,7 +304,7 @@ public class InBoxManageServiceImpl implements InBoxManageService { json.put("box_high", jsonParam.getString("box_high")); String row_num_2 = getMinRow(json); - json.put("row_num",row_num_2); + json.put("row_num", row_num_2); JSONObject jsonAttr_2 = queryStruct(json); if (ObjectUtil.isNotEmpty(jsonAttr_2)) { @@ -318,13 +322,14 @@ public class InBoxManageServiceImpl implements InBoxManageService { /** * 确定巷道 + * * @param jsonParam { - * stor_id: 仓库标识 - * sect_id: 库区标识 - * box_length：木箱长度 - * box_width：木箱宽度 - * box_high：木箱高度 - * } + * stor_id: 仓库标识 + * sect_id: 库区标识 + * box_length：木箱长度 + * box_width：木箱宽度 + * box_high：木箱高度 + * } * @return String 巷道 */ private String getMinBlock(JSONObject jsonParam) { @@ -342,7 +347,7 @@ public class InBoxManageServiceImpl implements InBoxManageService { .collect(Collectors.joining("','")); jsonParam.put("flag", "2"); - jsonParam.put("block_in", "('"+block_in+"')"); + jsonParam.put("block_in", "('" + block_in + "')"); List boxAllList = WQL.getWO("BST_INBOX").addParamMap(jsonParam) .process().getResultJSONArray(0).toJavaList(JSONObject.class); @@ -376,14 +381,15 @@ public class InBoxManageServiceImpl implements InBoxManageService { /** * 确定排 + * * @param jsonParam { - * stor_id: 仓库标识 - * sect_id: 库区标识 + * stor_id: 仓库标识 + * sect_id: 库区标识 * block_num： 巷道 - * box_length：木箱长度 - * box_width：木箱宽度 - * box_high：木箱高度 - * } + * box_length：木箱长度 + * box_width：木箱宽度 + * box_high：木箱高度 + * } * @return String 排 */ private String getMinRow(JSONObject jsonParam) { @@ -402,7 +408,7 @@ public class InBoxManageServiceImpl implements InBoxManageService { .collect(Collectors.joining("','")); jsonParam.put("flag", "2"); - jsonParam.put("row_in", "('"+row_in+"')"); + jsonParam.put("row_in", "('" + row_in + "')"); List boxAllList = WQL.getWO("BST_INBOX").addParamMap(jsonParam) .process().getResultJSONArray(0).toJavaList(JSONObject.class); @@ -443,15 +449,16 @@ public class InBoxManageServiceImpl implements InBoxManageService { /** * 确定仓位 + * * @param jsonParam { - * stor_id: 仓库标识 - * sect_id: 库区标识 - * block_num： 巷道 - * row_num： 排 - * box_length：木箱长度 - * box_width：木箱宽度 - * box_high：木箱高度 - * } + * stor_id: 仓库标识 + * sect_id: 库区标识 + * block_num： 巷道 + * row_num： 排 + * box_length：木箱长度 + * box_width：木箱宽度 + * box_high：木箱高度 + * } * @return JSONObject 仓位对象 */ private JSONObject queryStruct(JSONObject jsonParam) { @@ -470,7 +477,7 @@ public class InBoxManageServiceImpl implements InBoxManageService { // 新的一排 String row_num_new = this.getMinRow(jsonParam); - jsonParam.put("row_num",row_num_new); + jsonParam.put("row_num", row_num_new); jsonAttr = this.getStructOne(jsonParam); } @@ -479,15 +486,16 @@ public class InBoxManageServiceImpl implements InBoxManageService { /** * 获取一个货位公共方法 + * * @param jsonParam { - * stor_id: 仓库标识 - * sect_id: 库区标识 - * block_num： 巷道 - * row_num： 排 - * box_length：木箱长度 - * box_width：木箱宽度 - * box_high：木箱高度 - * } + * stor_id: 仓库标识 + * sect_id: 库区标识 + * block_num： 巷道 + * row_num： 排 + * box_length：木箱长度 + * box_width：木箱宽度 + * box_high：木箱高度 + * } * @return JSONObject 仓位对象 */ private JSONObject getStructOne(JSONObject jsonParam) {