From 28b78c2cfe792189d1db976def8c9d4650122531 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Fri, 19 Aug 2022 11:07:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/HandTaskServiceImpl.java | 8 +++++++- .../src/main/java/org/nl/wms/sch/wql/sch.xls | Bin 179200 -> 179200 bytes 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/task/service/impl/HandTaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/task/service/impl/HandTaskServiceImpl.java index 6ceb5b40..8473ade3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/task/service/impl/HandTaskServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/task/service/impl/HandTaskServiceImpl.java @@ -137,7 +137,13 @@ public class HandTaskServiceImpl implements HandTaskService { taskjo.put("taskdtl_id", taskdtl_id); taskjo.put("task_id", task_id); taskjo.put("task_code", task_code); - taskjo.put("acs_task_type", acs_task_type); + JSONObject start_point = WQLObject.getWQLObject("sch_base_point").query("point_code = '"+start_point_code+"'").uniqueResult(0); + JSONObject next_point = WQLObject.getWQLObject("sch_base_point").query("point_code = '"+next_point_code+"'").uniqueResult(0); + if (start_point.getString("area_type").equals("30")||next_point.getString("area_type").equals("30")){ + taskjo.put("acs_task_type", "3"); + }else { + taskjo.put("acs_task_type", acs_task_type); + } //其他 taskjo.put("task_type", "11"); //点对点 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls index 9eb4cc89b2c79a00bf156a17bcf168aa00fc7639..8b45bc7dd7e1cb6ab4ad41cf09f505f14daadbf3 100644 GIT binary patch delta 9029 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 G<$nPh&~lRi delta 8854 zcmeHNd0bQ1v!8Pk_C@x!)Bsu+2qqy3i>M?J1Z79X1(jW?BFa)xjGRjd_by=dKP z-OyTEQDgm8rEaY)N~`?ruC#S&f7QCys%Uw0!XEP8=Y8HE@BQ;~KljeL-}1jmx60g-!}}ofPK54d)$yqU`&tZJ2tL3@)s7J*WTm5hYvUJ(X*}Z_zxkkUETeZ za$BaMujgdVepGFn%dnAObzt*z=4F*FsZM2B?TrrXmv~a@{VKz3L2AXU%_Fl{ z_>?=(WKzqui;MDx$xU<3nRLgG!T^AK0#kNpdJmA2CluH)PBhpR|7D`JTI^xA*o+Ak zHux{*@oYu_x#!QvQG(gML0WIVv%0-QRri$=ALKpZp$va~T;1nM+_yzJp}(D3{7T#9 zc4$Fd9|wAQO2S8Z+-pM2P;#?nw?Zh!rWc;gIy-nI=fftHhrdh7u1Rsx6Vypgqwm)J z5B_gxLQMTeiCyV%$W+27q=KIZ4> zxV`a{?96top6p@f@Xu`5N3pw-Tf-7kD(+6n54$sYjrHkEF=g@b@w-P&_lt0zJNxar zQ#G}T>ir?EuCAB2hHRL=>;9qr^RvxEgYJBE@Zh?~O^3t$(r^9T{QK#v!?cQ~;X{76 z4oUqqC$_LHc=+j$Y^TKMot}Q9G`t|VecC1eKOf$`COq%@^~%R%+@{s9Zj}0r8C|~j z>1gfhpwpl2_im0HzMWgN$;>BX*an~5RfAS<8kaNg#n~U4-c`@~Vxao?iz6nJzTN)e zQF&;c)3(q&zeIjzg;HR-nuY~!E^|tB|Mbddldbcw)-T(zz@ws2b6opz;NXK+VMR&T z$RpwlEB$Wml;lt5HP5JW7~AmB{lJAh+kd;2eKT`nZoo~8brEGH?oQW_n{1p>r~6$L z^`tJ@)Nf9Dx#HhnzO-7c%B&wW?UjLpUVprA)~96!fya~UOGINHF371Lo-#Hh+G|rp z*4gK^M`A}u+unKWuGRT}=1Gnx7kvH6lE_^rzbjlDDm81i&pP*f;tlVaw)mtQKdK)5 zaW1yL<@*xRLhJPU>lRm%2){1kuGz?e%}(#!pZId+`~K-C)IZL;y~n&Y?1;K8%;npg z50|{`TH#h}cV%Mv(@(Tbad)r%>6m)#V%c}?FOIvWHdkFdcKGodmv4+(xb>G+o0l)X z(iHty$&1B*7JWOgrRDF-CA&Sho_l)o6Z_HriNfNtfVekwVe#kO>#wI-)!%+^z16gu z?9C0^^QSF5v@Dqa;?xAm#arh_L`+*~W_M?{`p%9YJtPlj(u6ltPAza(m))2?#Aq0c1-6HX}{dU^c>xvmR+1QpXB_#U=o& zklsf+Whp=-W-j$IfSYERDJlUfF~=Q4>TLlqZ8@mn6gF-w2Z+VAqOL+gq_M99G*|)r zg>(i!v3do-1Ei9b02^%pZXu1g1(>=D;1i@DAr)XMY^w&yw8NCO8sH$(BS^jM0sP(o zSckL%>90uFzlpMr01MZu0j@d$%&P(Tmoq@tI)KkzP>B}cyeoECj~(0qTHXQ}=>gEb z0U*~CGk-0>oR7YR(RHL^oWaEd z0Ggi`oO?;_g@eW)835+g4w(QJ&=D3lARl5fg<}zklf7}mB zN%x^W)8uCp*mF;$+UHF{R7$jp`%c=J3*Oot7ev}uF9d5ZU6^Vz{5*h%R(!EDX<+IQ zT=gR6oY;xToGs9_0@DGgAD|qg#}bcpZCvv}lXOc&wH3{Q&V5q{le7UZ?fK>*zI{2E z5*eq@+BR)yZ#FR<))!>qY$(Wf%}lN0isPuh(wI>DNn>*Dhp~mgG}K&iGD=p_Ey@JU#8`gOtzr0?{VzEeZR*I9f*wKu+> zVxvKh6xZ5yv}ser_#cK6%ZZn;*!={s?YdTYHnAhk>pk|mtkJs1O?*r%dIzBf<~9>N zT5SgC6AHUG#iMmNbKvc((})+Ra3_XlW!^HJAInFE7;_ezb4`C07DmLGw+vM<-b!;or>fRHj6w^wpUC%uaD?vEE?XoaqQOcrN;M~J!QJn73bI+n!&?~CVa7?YT z9=P#fmD&CsFmrev4oqNX2QXnQjZju|34`ZX--s@>> zbd4@O+S$|7aYIVE8*XGEDmQT_BmaLb{ZCWh|M^%!8Rwo7k7DoJOh*;m3)d@q4)roG58#kPI zckTr=WQG21h?R9m1H-Vgju^LoIH^wRyZK=69ERd7hdaV4X5#LbESAF!w5EJn^42PY!m7T z9{RyIa+)x*z`#p#BZ}BJ1ViP)Mz9bgSg0O*mjz$9wMOc(PD_vLjGVCEU?(<8kM-?5 z+KAkk4or7!6iKi%n2-W_UE$Pa8Kn^{!Uz`G3+uA9$_N(K8&h|>WNdG+6N@&2#TdcH z>9LL&>w55bBXY4uu+%sso#TxNCK$mIjr2|GkmF_~kRilNSCv4vSX%fX7>*}!@3;_8 zM=!K7Z-hS65g37osi|)2RI;0B6CY)7NF&*{Up~s#|4jpGwjk9Nrjbe>=aNT;axbTo zZ%oQS1R}02op_pH14KH{4AQ0-SgYHeL*`?%fPA1kmq!v!ST}4IkfT;U6jBn~@rS_$ zDR$j0r;ZkKow)5~#7!*%F+_k2ln@M2AjDIQo9{quNkM{~U~C0rI}#r*)Jux6t%MMe zqf{iysE}I@Wyn*Y9;Qo-vO#)X5|oqZbwyx{>1REaC@I9gA)s);n<%^uLNOUCR6!sY zvxE$`s4ZK=qu>C1{Mzryty@A~>I>;EEg_3yVwp{*!$o)xvh`OA5BSXdY_Nv7MvwQG zZ$!Kt(m=3(Y|qXErn=G zqb;yBI+;e}r;_ZwJU$;^G%F`56^Vu61+V606`OzuOn`7|X-X|eQA;yFT1cGCO&u(# z!;6^h)zk4~CLI?>E%`1$LW+vB3+D23MpO49{Od(FKmp8!9I$bM*)Vv98hFFg#zL7$ zB$9}vfwyr&=6rqxSW;W!03wl8UhXRi0FkfAHzG7G74qg~7c4AFOMyj2sR^laX&T|> zNCJxIX8I;TtV*CLDK5xw%_z<*n1|LT%T$7d+}ymZN>u{v$kjj|WGz+g)YzMD(vS+3 zBr+;kjUgnB5X#UlAQX$lN})1xr%I+#DHNIrsm8=qvO=Y)omH5TFMz1Lxj99Gp`{Qk zAC?wTke|;ln8&k7i_6O@go2`i++sn>Y{)3g$xcg%ih`I3l~|q@m(rLJ5E&cm`?}q- zL=cGO0U|*{CaE|hh|S9^%qXN$i#9B!rDO)TXem{jB`{CmGM)b(b>^Iw(L}F~75ELY zv)a|MBJ~0tmt5`r2V=O#Wi(u8UP+(u%%2CQqpONDcCVmRXTFLa;?>MI$2TFizS`S) z=w}mL^{h>BpF%K-9l7~$QgeT9vX4@D5D z;q$UU6e*QSR4TDRs1gN7RfrWr8Vr1)NFo;nqs<~kN~LroH)Rc#h3?i^tY`$~Y>`|H z5~W-r6e)uNV^SO>72^7p%7scvh(Z)BjS`2Cj;Wql1UZF8X{99@^SCe9P;c9;Q$Yba zVWrv8+5ZaD_;BrOsI&SqFHn=5ldH1^8#r1hIPt)iY2un4#mE$B**=li6 zbj;f0;sD9A~d9(#HFB=7TH`q?si2Z-sGsRw~GSxbfL z^y1VVC37HC(TZzg4tV@wB8hlrQs6KcH+uOF@4tU-jzh(VnSzjfL5RSvVGj=}wA*Be zn*OxeC%I!I`OSu1+imJH1Af2w$WwmDM*f@4CPvzAezti~_`8j*g&;IzGN}}g1&4P( zA)1jnPhK< zy!Ui->B*4rYMZwXm~ynG3s3*?&1c`|ge%t_RQf#)Ib`02H>C$ZYpHi1`?2Zi)%jU< zZe94u(~}Q6tbFVpeRz~@>;9XwO1c=citO5MeHRw9KYm8zyywfSbqU+)hr~iPGj2*s zQtY_`mT`39JE#Mt$6w)^c2XbiwVm`OOk1}txQjb6W{&KnPLvYHd%?qhdf-}XsE6+6 zF4{x(2=-_?&d)>r+)R#|ub&KAoYC>AMr}eaGyf{cK69r;zkzsjJh@`zw9~;Za zMCB+SDZ(?61Ny7IMD8zOC)QWIN@aoEkq_xA zt%z@`3qMFjlzhM~I7EG;=3;_ouS=D9TI0DEPxe~08Bg{GvlmawC@yvOI>OR^_M(OQ iHv78DQXrOrtB0uE0