From 73fcf38138807181000ab84c21e063b5958a8f00 Mon Sep 17 00:00:00 2001 From: ldj_willow Date: Mon, 17 Oct 2022 16:11:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/wms/basedata/st/wql/stivt.xls | Bin 238080 -> 222720 bytes .../acs/service/impl/AcsToWmsServiceImpl.java | 30 +++++++------ .../main/java/org/nl/wms/log/LokiLogType.java | 4 +- .../src/main/java/org/nl/wms/pdm/wql/pdm.xls | Bin 177664 -> 177664 bytes .../nl/wms/sch/tasks/CallMaterialTask.java | 8 ++-- .../nl/wms/sch/tasks/GjxFullMaterialTask.java | 41 +++++++++++++++++- .../nl/wms/sch/tasks/SendMaterialTask.java | 12 ++--- .../src/main/java/org/nl/wms/sch/wql/sch.xls | Bin 185344 -> 190976 bytes .../service/impl/RegionioInServiceImpl.java | 6 +-- .../nl/wms/st/inbill/wql/ST_REGION_IN_01.wql | 2 +- .../service/impl/RegionioOutServiceImpl.java | 6 +-- .../wms/st/outbill/wql/ST_REGION_OUT_01.wql | 2 +- 12 files changed, 77 insertions(+), 34 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls index 9f1614cafeb39e33a2f27ca9a322a6d2eee3586e..c224a5590894771035af01998bf9207f79c7c0f1 100644 GIT binary patch delta 19356 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�lLRV76kE91r!Z+YtoP+{-@ai|~v@7BlY z`1|p{Tw59kh(-aP!}1<1#>(3UiBT>`p1@!%r4MjRZuBGb` z(S-_IpOKTx#T_D9G)q2TE~bLYB?auJe(}g8zwGA)U!fN6y_2+ zy8=qXn5(T2gG4&oGWRZVnK&%Rl#`L0m79^9XM4o>dX)?<>J?L1R#;M0lvkRSou84P zouA1M$n9I)E2gZpthlr=8|IAC^x~}23_LQ6&# zTRVpdNPebD%<(W~v;Q70f{RI7HC`-mg}8|HluO5p18J1J0uwL!`|;we1bn{Xqd$*c pZT(~a1>$4i^pUnZ9NRa3ePipdFyq5dcUl^%#S+2NRwEV&{|BZ>^p5}l 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 8d07f92..e0cee6c 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 @@ -16,6 +16,8 @@ import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.wms.ext.acs.service.AcsToWmsService; +import org.nl.wms.log.LokiLog; +import org.nl.wms.log.LokiLogType; import org.nl.wms.pdm.service.DeviceService; import org.nl.wms.pdm.service.dto.DeviceDto; import org.nl.wms.sch.manage.TaskStatusEnum; @@ -46,6 +48,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { * @param string 条件 * @returnzss */ + @LokiLog(type = LokiLogType.ACS_TO_LMS) @Override public Map receiveTaskStatusAcs(String string) { JSONArray array = JSONArray.parseArray(string); @@ -111,12 +114,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { result.put("errArr", errArr); return result; } - + @LokiLog(type = LokiLogType.ACS_TO_LMS) @Override public Map receivePointStatusFromAcs(Map jsonObject) { return null; } - + @LokiLog(type = LokiLogType.ACS_TO_LMS) @Override public Map orderFinish(String string) { JSONObject orderJson = JSONObject.parseObject(string); @@ -139,6 +142,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { return result; } + @LokiLog(type = LokiLogType.ACS_TO_LMS) @Override @Transactional(rollbackFor = Exception.class) public JSONObject apply(JSONObject whereJson) { @@ -152,10 +156,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { if (ObjectUtil.isEmpty(type)) throw new BadRequestException("类型不能为空"); if (ObjectUtil.isEmpty(point_code)) throw new BadRequestException("点位不能为空"); - WQLObject empTab = WQLObject.getWQLObject("st_ivt_EmptyVehicleRecord");// 空载具作业记录表 - WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");// 空载具作业记录表 - WQLObject regionTab = WQLObject.getWQLObject("ST_IVT_regionIO"); // 区域出入库表 - WQLObject veQtyTab = WQLObject.getWQLObject("PDM_BI_vehicleQty"); // 托盘对应数量表 + WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");// + WQLObject regionTab = WQLObject.getWQLObject("SCH_IVT_regionIO"); // 区域出入库表 +// WQLObject veQtyTab = WQLObject.getWQLObject("PDM_BI_vehicleQty"); // 托盘对应数量表 /* @@ -208,6 +211,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { JSONObject param = new JSONObject(); param.put("start_point_code", point_code); // 满料位 + SendMaterialTask taskBean = SpringContextHolder.getBean(SendMaterialTask.class); String task_id = taskBean.createTask(param); // 创建任务 @@ -337,7 +341,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { // 查询载具号对应的数量 JSONObject jsonVeQty = new JSONObject(); if (ObjectUtil.isEmpty(qty)) { - jsonVeQty = veQtyTab.query("vehicle_code = '" + vehicle_code + "' and is_task = '0' order by create_time DESC").uniqueResult(0); +// jsonVeQty = veQtyTab.query("vehicle_code = '" + vehicle_code + "' and is_task = '0' order by create_time DESC").uniqueResult(0); if (ObjectUtil.isEmpty(jsonVeQty)) throw new BadRequestException("请先手持扫码"); } else { jsonVeQty.put("qty", qty); @@ -367,7 +371,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { taskTab.update(jsonTask); // 更新载具对应数量表 jsonVeQty.put("is_task", "1"); - veQtyTab.update(jsonVeQty); +// veQtyTab.update(jsonVeQty); } else { throw new BadRequestException(jsonObject.getString("message")); } @@ -419,7 +423,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } return resuft; } - + @LokiLog(type = LokiLogType.ACS_TO_LMS) @Transactional(rollbackFor = Exception.class) public void createEmp(JSONObject json) { String vehicle_qty = json.getString("vehicle_qty"); @@ -449,7 +453,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { jsonEmp.put("create_time", DateUtil.now()); empTab.insert(jsonEmp); } - + @LokiLog(type = LokiLogType.ACS_TO_LMS) @Transactional(rollbackFor = Exception.class) public JSONObject inCreateRegion(JSONObject json) { String start_point_code = json.getString("start_point_code"); @@ -458,7 +462,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { Long task_id = json.getLongValue("task_id"); String io_type = json.getString("io_type"); - WQLObject regionTab = WQLObject.getWQLObject("ST_IVT_regionIO"); + WQLObject regionTab = WQLObject.getWQLObject("SCH_IVT_regionIO"); WQLObject orderTab = WQLObject.getWQLObject("mps_bd_produceshiftorder"); WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); @@ -502,13 +506,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { resuft.put("create_mode", jsonRegion.getString("create_mode")); return resuft; } - + @LokiLog(type = LokiLogType.ACS_TO_LMS) @Transactional(rollbackFor = Exception.class) public JSONObject outCreateRegion(JSONObject json) { String next_point_code = json.getString("next_point_code"); String io_type = json.getString("io_type"); - WQLObject regionTab = WQLObject.getWQLObject("ST_IVT_regionIO"); + WQLObject regionTab = WQLObject.getWQLObject("SCH_IVT_regionIO"); WQLObject orderTab = WQLObject.getWQLObject("mps_bd_produceshiftorder"); WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/log/LokiLogType.java b/lms/nladmin-system/src/main/java/org/nl/wms/log/LokiLogType.java index 9502736..ec2ed3e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/log/LokiLogType.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/log/LokiLogType.java @@ -9,8 +9,8 @@ public enum LokiLogType { DEFAULT("默认"), LMS_TO_MES("LMS请求MES"), MES_TO_LMS("MES请求LMS"), - LMS_TO_SAP("LMS请求MES"), - SAP_TO_LMS("MES请求LMS"); + LMS_TO_ACS("LMS请求ACS"), + ACS_TO_LMS("ACS请求LMS"); private String desc; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index 143f6cdd7f6cc7d9b9c4faed695baa3399fecbb9..af565c7d906b304fef8bacd4e3c6df69d7d2b37a 100644 GIT binary patch delta 28 kcmZp8!`1MHYeNnTE5lrdv%i}QS=tL(7`GR)F!gT)0H#O^+5i9m delta 28 kcmZp8!`1MHYeNnTYr?DQmW8*(_ciBYrd;WW$*}3OTdEayH%$%7EW$Vn#&YM^Ca7qOL z2GfV8rY6j|D;0L$>o2_{jWNw~#9>XUGs|1Xeuo^7;ngATa{5`fAj`;{o8JIFL z=~nZON@FLTyY}JwC6b1UGF>TO%e)+`d&3_o-7;r5SHM-M$`=F?D@*7O-5>zIfIt`k z@sOa~E$l-?ReX_KXYDnx1p#*QglPp(Vr?D5hOi*?W!0!SIpz;N*?;c(Mi zpc6z6@OT#;DIk2j5OWgFgR>}|soIo3PN>_LZ>#H6(#kncL@Q>93>7VTSh0*i3W`)E z)P+8=(d{eoty*8Qow1|cQFJdLk0pGHB6{3j=fbzsX~)@XFJfbcA2!r#_yFlrR#;$5 z9=R7@ZGvsIQ*33pdTBy>wtD;%>RQ%ZDrv3*P=t?dF`cfqgy;TzD8c&hp@eK4cse>E z&i0GO*>hIOf+BUnk*cZ6S&A98{%f^&|yB@Q=8r_~vrNuBwPB z1FXV#=vVTa${5w<-fB;U`P#-kjX#tIIAuKPcJS3-L3frlG@hC;r+g@x-?7$rUD=L} zVK+B**|u-bt99kBa<*}L&53O;kr@DIdLMU?%WQa z)ye8B%O$;h!ZzL>nwaQW64`an*c+LHt{-(Q%BfT7wa4vxM0Y*i?b7bor4uf7_w$)C zIAX@Bio)Wdhuc?AU*)s(LB*~46L*hlBfo2RM;qO3&8{Ctdsb?*VMb_L zes=NG(wgD{ewL!tkPg}k=t!2eKGl<~o0T>yz3VjpzXH_912=|vBp)uj&^=z!y;kM$ z!fjGYGQ;NITAHv{I_lbg%-zSW3v|xN?pGLll%wMFV?;}aDGLQeQ9EP4h><-SczVvO{nD{(5+5W_ynW+XqITfgIRy*5 z`A$E4?6r6HqVd>GmnN_Fjcd)uuK8or*~K`~l=bRHQFrIlwkw_tY&UgN$MhQQ)e#TfWO?m|OlUVV z>t$)pcN1A&#~HKa?^?NXvcuTe=&|?uJ<4Bw zy+_oAfSSd*(GAD{O8l$($0a9U91PN(@ApE!Uz_zyX~Pn)S1*3J|KYr-ama;b{hplr zzG0y@=i>1rL30;2-1soDVB)X6U$h;S*mnN(&5Qa+UvGV&^jYhJuhiY7>1CbE8kV~x zn};;a3{F{A9ChcJ=hanSr&Ub{Z)To;HlKfr={v|q{osyQL*fsKPVO%~*340*<-DnW z-DAXxH$HPWJiT=4uNT>|>X-c2{E*Iq(afx0zy5xV$FdQLFE$J=y`nGP;`uVB58P~m z$6Njrp&O+Q69{nL@2%RVZNoCF?5pZ4-R&I2Ah5*gsRR}@ajl!YF@J-(&U>jtmoc-C z5AGJ2Qe?12B5)(^DX9gF+VyTV23%t_;TFcAfm;$*azlym~WB-B+dYcmH`~b zyb5#wnExL+e-JFhURQT@5e| zJ#=FYz((}Us(v5A<4QOG( zW`G_x0E@N&q@jhUwgN1)tJ=OZ$$ZbOqD8 z(+L!Dyu(S%PhmQZX&}mHFu#V0ZY0iQx}b|Y*M-#UCY)1?pP>8{lkVub_RjC|f$mg4 zVBUm@Mo-TIO;%xSG+{hIM|QWW3Oo=+Bf#K5>@?Q=`zTV7#G8|2mG0GVc~m;E!Ph#%6FF zs*wX?J8})oU2xk&8@ParK0cp>>0(c?<~XQe)<^nK7?9S%*9_h?ZO$LS{(adv;A z!*L99eW(Mm(YEZDS}w;$1TzyS9NwRFfkPd2Qz#8nJskF*)Wa$8i4GSA)NvR=rpDAk zErF?{S`wsglY@q@AM8$2Z9aAsE(mDXBu8RnW@@It?@qetV{C|6n?`;?yJ|pz)d-}M z|8;AK4Bmr;P6QZEoblHn5g0+LOcI0Ac9X<|41%-RSd))sJ4})Q%XZ>|XDk$=SZyj4 zK_=N{lEhfH+a#Hx^ovQ7ptQ#%nWMDVBw3)e&m>7v!llKCCxels1|{u8M#7EOyC^&k zrZzEX<2|&|P?e70d&s<5;=v}IV$BjCc4N2bIYx-}1X$D1gAncmuE0jU2p$;qVyr=r z7&Tyx_08a+79OFB-hbiAg_5D8hmwI1+7*u@gHw#_fX9&;Wd!75=_aF|63H^@n~Cr+ z;QvE}hX)D+5gty%dytLwwUh~uGWmoEoj8<;m?OgHh~yZF@Hry6MnJxa2p^A|jqnm% zQIGJ^BabQEWLBA%{|E?1{eI=TL+a z?MaB{zTkSICcc9|j0hCNfI#cqN0%DbV<88i#Q@0xIC20Y1b7Fqo>*3 zP+}w^=3Z>6k%-vzV#P@09*i~V1;&vlHd$)unT{}e8G6Q6WSo(VR{YtQOV?5Ac9tV! zhGYa}ypfCz`fu$hsG#?I*?Ai>CLfTFX|oZv=^1C}7L89kwMV?lzzW*o2tfh|b$q?aJD z)TkH3TG&IhhIc|4?lIjm<13+2f|6;^kugUya`KH4-WoRC7EgjvM>Qzd<0}+ z0;0!>e}F9X7Ndxhmc}s(;LZU^Ie?u;04WDhZ3K{-0Ps}tFH58*0I3Opj&dny34O;> z9JIF}82h24T#6pGBlg6B-df^lbSaIUlt^ceh>Rn$%Sc4V5!r1dA~O+@eMCfNA|m^U zh|EMp_7M>o649ENn26ATO^I~nh{%!11(;?eLU%$=WV%V>!Ftp3h37M@*&JQuNag}i z>*Yvhy=ifgBbip@0xW`?umqN9@n@+qlF(fN1@`2CEfKgiDK|n{B5-T+tfYoaje1rTb~3$X?r-IRhQg0>+uOnr&5)=ZRYKx>VKX1MsZCHL|7KD0Bw4jOtX z86`)?3dy{~NoDBH3dy{KStf}G&ZKz}w?abiU^bS~F<^yWFsy)9=mlrfD7QjFA8_S+ zt%cX{hP&Syy(aTB-&~UW7Y`zgHbQUr)DqE z1(qf4jI^zBENlU@IVjRmX{}$LOYF3C`$Nt4=Fn{r{T_xsgV{ESeh0*KhCJxgl8jJ_BLw zIZ*Bl$4S&;dXl4{_9jq!&e|rEzS&xP6R4qnv$giz3&yUw_iJyk*1?GE$64!urJ)#b z4c0oKwV@b#nf*p+iN{p$RWs~vEPabD1` z%Oz4R9gx&~e~yIXMsC7;zP^XVTojwctJN~Vw9j>L%i7$Rdp9ST3 zm*76G9Hg`GVHQ48phLb{X8Cp^_g|UHed-UqDXqX>S14VPlAo zg@At9|4>~zne>!tBk?nv5|fJiDiwy`rNZzzko$J!3;tLVfVx2N#hZT5Qb7bh1z;^D z1Yz!vWntilN9b|fQ#k7Uux2>c^x#@WqD-G?uc7!vTZUmT9w_ z%f7-y4=;F<>Wt?&z!L;;ryqJep(g`+Fv-J2g9z=M?&CkqO;PQqJW#y)(WVw);@p&m}BsVfeoK>i?n4vDvq*xZE zq-NPU#};VVbWK{8zHtl@Y0oDV6idS*O7a|Y3-O3;rA*LdLta)&ktSSIz|S1Lz*=2g zSd=Ty&Kx^4JUla-g@nPe5lP`;KH%=HRCZ;3IKh*)7qi5Y8NARkzIQ}KLKO51kN7GnAvCNkCL%r|bU?zS2rWeA6lq3i3RrME_P*xo z)<-*G-Pv0^4jq1c4ECO_IuskV?vqg9eXbQ ze(})GQ$!|}#Nv0|Xka6YbJB`3b3=025t^cK$VezF&C|H2rxukFZ&65BHoZ)EoZm^B zC1C+VBej|3ZoLHQX~)gW%?oo!^|P2P%JiNj?8z$CJT-|LUdt-dQ+*V*Qx0{=OUTgV z92ADKP{T5rAX2gkxonVUkVr^GJeQuLF_~T8vC1i)b)q@|$Ejx1g5)zDBP2(ALmLIF zV1Mb@$KE@}zD_#D*ZX*fx=>+6NoEnN4e^Q=hD79~vr)s3@cSieN{ZObBRp3U!NURN znp=>PmZfRZx=wWE4{2~+*{#8K`Me{pP1DVT+q<}G0DlFY+TT)K%PuU;&uUQop_p9S zv|q7bK}OAt9By8z5Gbz0t4hTR{yar#rJ^jiQt_w0sZvp?s8DFIxK7(f1C@#f7r_k0 z-7GeP%&~v+1`JBeyq1}h zt|_^nP)DZ5L`F3b?ed(0+%fHVIqAjO-H23DnK3t`rzPvpy4@JD{oD???0>du|4+yE z-bu00iJ`qz;y2if@4^@4eH|JyVzg#ZZUKx+&CMO<8J__fO;MqzI=9#&r-B3vR$!fv5J+yf#d(PL$7oN-j9NCAWKF zk@=eSV6P8RlF-(5gQvC^<%uq~T_90pYYNk+rLIuyCyGJg(Um0biBvH_J&Cvl^AyA5 zDv8QU(R&{GN~{VVBvudlO?Z^#&8a|(Shr)l&mElPR#$Ji^^sKatH|3kzI{>Y%EiO8 z=Rvr(0CMxfbI0VwWbzA(tdy+V@ArOz)BB%Z+;Qv(8y`w0cf7bGh#z*XO?s_5H>)^1 zr=owzgvz7RCIP+w7WjC65DdFzu4*)=H+xT@vT78#Z8;M!|LyKYIC$!(9hcAU*>&yZ zi5G|VN6C*^Rwz%fZei_T5g*StxbN3?R?Q}EOqHf$CF|~_bML}>$BET@&z-lvbm0f7 zq)Tv5RwXTH#Xeg}mLLE7{AJ7fda2|LYJF$kBqPA>Ne|!p`e!{RKMC2^Ln;}Rk-3F6 z|4zkrcmG<{$y2R~&B`itw-k1*m3YFJDOtrDw#OImSVf9^h0uRzyHCS*tVzXqeBv_DiuymZ4z)MiHeA`*C%W^M4(z3oQv#G{QkUPfZ zx6_N{ujQe~Qw83gfhu4px}`pf%{c9FL9cvVRMud^^)a9@|3sHC4v7P_Eg|gvkfAP`;$f_!i1uJD9KVIgpAu7*sPDR; z*+W2ocR%BWnPV;E#k`8wN7XWTqSIfhWyTUeeS96`Mu>h~9n%$U*RQW*JZWJa*F=1P z>CA(rBlUgiGwln>^xCU3!>NF$oa?5q^;>-w1Dv;Ni+J|9>ZiR1zK= z)>9D_5u^?bRR%=*D}zGS%1}eX(q8JG3O_%;0AKHLwQppQkDrnz|LQkKnKDvcc8od0 zh}WfYyHuX;jKED_c9IDZ(4ABp{jVpPDiW?QJ;jU@oWK{9sSAA?tq&6=(Gv2+r{%O_AqYuCWzb2r~&<+#*lDT{J@2|E#!Wn`eh^x=k RGmS+5-i7$<51eH_{2zi&XdwUq delta 5109 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 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RegionioInServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RegionioInServiceImpl.java index 1e37af6..7ac04a6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RegionioInServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RegionioInServiceImpl.java @@ -137,7 +137,7 @@ public class RegionioInServiceImpl implements RegionioInService { dto.setCreate_time(now); dto.setQty_unit_id(jsonMater.getLongValue("base_unit_id")); - WQLObject wo = WQLObject.getWQLObject("ST_IVT_regionIO"); + WQLObject wo = WQLObject.getWQLObject("SCH_IVT_regionIO"); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); wo.insert(json); } @@ -168,7 +168,7 @@ public class RegionioInServiceImpl implements RegionioInService { dto.setUpdate_optname(nickName); dto.setQty_unit_id(jsonMater.getLongValue("base_unit_id")); - WQLObject wo = WQLObject.getWQLObject("ST_IVT_regionIO"); + WQLObject wo = WQLObject.getWQLObject("SCH_IVT_regionIO"); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); wo.update(json); @@ -197,7 +197,7 @@ public class RegionioInServiceImpl implements RegionioInService { public void createTask(JSONObject jsonObject) { String iostorinv_id = jsonObject.getString("iostorinv_id"); - WQLObject wo = WQLObject.getWQLObject("ST_IVT_regionIO"); + WQLObject wo = WQLObject.getWQLObject("SCH_IVT_regionIO"); WQLObject orderTab = WQLObject.getWQLObject("mps_bd_produceshiftorder"); JSONObject jsonIn = wo.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/ST_REGION_IN_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/ST_REGION_IN_01.wql index 31114c0..2df5afe 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/ST_REGION_IN_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/ST_REGION_IN_01.wql @@ -59,7 +59,7 @@ point1.point_name AS start_point_name, point2.point_name AS end_point_name FROM - ST_IVT_regionIO ios + SCH_IVT_regionIO ios LEFT JOIN md_me_materialbase mater ON mater.material_id = ios.material_id LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ios.qty_unit_id LEFT JOIN SCH_BASE_Region region1 ON region1.region_id = ios.start_region_id diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/RegionioOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/RegionioOutServiceImpl.java index 5d7efc8..33b2154 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/RegionioOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/RegionioOutServiceImpl.java @@ -128,7 +128,7 @@ public class RegionioOutServiceImpl implements RegionioOutService { dto.setCreate_time(now); dto.setQty_unit_id(jsonMater.getLongValue("base_unit_id")); - WQLObject wo = WQLObject.getWQLObject("ST_IVT_regionIO"); + WQLObject wo = WQLObject.getWQLObject("SCH_IVT_regionIO"); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); wo.insert(json); } @@ -159,7 +159,7 @@ public class RegionioOutServiceImpl implements RegionioOutService { dto.setUpdate_optname(nickName); dto.setQty_unit_id(jsonMater.getLongValue("base_unit_id")); - WQLObject wo = WQLObject.getWQLObject("ST_IVT_regionIO"); + WQLObject wo = WQLObject.getWQLObject("SCH_IVT_regionIO"); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); wo.update(json); @@ -187,7 +187,7 @@ public class RegionioOutServiceImpl implements RegionioOutService { @Transactional(rollbackFor = Exception.class) public void createTask(JSONObject jsonObject) { String iostorinv_id = jsonObject.getString("iostorinv_id"); - WQLObject wo = WQLObject.getWQLObject("ST_IVT_regionIO"); + WQLObject wo = WQLObject.getWQLObject("SCH_IVT_regionIO"); JSONObject jsonIn = wo.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0); // 准备参数 并调用入库处理类中的创建任务方法 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_REGION_OUT_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_REGION_OUT_01.wql index 81c7662..a42ecfe 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_REGION_OUT_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_REGION_OUT_01.wql @@ -62,7 +62,7 @@ point1.point_name AS start_point_name, point2.point_name AS end_point_name FROM - ST_IVT_regionIO ios + SCH_IVT_regionIO ios LEFT JOIN md_me_materialbase mater ON mater.material_id = ios.material_id LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ios.qty_unit_id LEFT JOIN SCH_BASE_Region region1 ON region1.region_id = ios.start_region_id