From e4df9e20af9b605d45f621ce92501a9f2e1ac8ae Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 1 Nov 2022 16:18:27 +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 --- .../pdm/ivt/rest/HotPointIvtController.java | 7 + .../pdm/ivt/service/HotPointIvtService.java | 9 + .../service/impl/HotPointIvtServiceImpl.java | 23 ++ .../impl/RawfoilworkorderServiceImpl.java | 2 +- .../org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql | 75 +++++- .../src/main/java/org/nl/wms/pdm/wql/pdm.xls | Bin 246272 -> 246784 bytes .../wms/sch/service/impl/TaskServiceImpl.java | 5 +- .../nl/wms/sch/service/wql/QSCH_TASK_01.wql | 10 +- .../views/wms/pdm/ivt/coolpointivt/index.vue | 6 +- .../wms/pdm/ivt/coolpointivt/inventory.vue | 2 +- .../views/wms/pdm/ivt/cutpointivt/index.vue | 2 +- .../wms/pdm/ivt/deliverypointivt/index.vue | 2 +- .../views/wms/pdm/ivt/hotpointivt/index.vue | 229 +----------------- .../wms/pdm/ivt/hotpointivt/pointIvt.vue | 229 ++++++++++++++++++ .../views/wms/pdm/ivt/hotpointivt/taskDtl.vue | 164 +++++++++++++ .../views/wms/pdm/ivt/sbpointivt/index.vue | 2 +- .../wms/pdm/order/rawfoilworkorder/index.vue | 6 +- .../src/views/wms/sch/point/index.vue | 8 +- .../src/views/wms/sch/task/index.vue | 62 +---- 19 files changed, 556 insertions(+), 287 deletions(-) create mode 100644 lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/pointIvt.vue create mode 100644 lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/taskDtl.vue diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/HotPointIvtController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/HotPointIvtController.java index b90909798..872e7bf81 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/HotPointIvtController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/HotPointIvtController.java @@ -64,4 +64,11 @@ public class HotPointIvtController { hotpointivtService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } + + @GetMapping("/taskDtlQuery") + @Log("查询烘烤任务明细") + @ApiOperation("查询烘烤任务明细") + public ResponseEntity taskDtlQuery(@RequestParam Map whereJson, Pageable page){ + return new ResponseEntity<>(hotpointivtService.taskDtlQuery(whereJson,page),HttpStatus.OK); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/HotPointIvtService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/HotPointIvtService.java index 396d0011f..fa46ac1cc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/HotPointIvtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/HotPointIvtService.java @@ -61,4 +61,13 @@ public interface HotPointIvtService { * @param ids / */ void deleteAll(Long[] ids); + + /** + * 任务明细分页查询 + * @param whereJson 条件 + * @param page 分页参数 + * @return Map + */ + Map taskDtlQuery(Map whereJson, Pageable page); + } \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java index 5aae32354..93ad86f70 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java @@ -3,6 +3,7 @@ package org.nl.wms.pdm.ivt.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; @@ -137,4 +138,26 @@ public class HotPointIvtServiceImpl implements HotPointIvtService { } } + @Override + public Map taskDtlQuery(Map whereJson, Pageable page) { + + String task_code = MapUtil.getStr(whereJson, "task_code"); + String start_point_code = MapUtil.getStr(whereJson, "start_point_code"); + String next_point_code = MapUtil.getStr(whereJson, "next_point_code"); + + JSONObject map = new JSONObject(); + map.put("flag","2"); + map.put("bill_code", MapUtil.getStr(whereJson,"bill_code")); + map.put("dtl_status", MapUtil.getStr(whereJson,"dtl_status")); + map.put("begin_time", whereJson.get("begin_time")); + map.put("end_time", whereJson.get("end_time")); + if (ObjectUtil.isNotEmpty(task_code)) map.put("task_code","%"+task_code+"%"); + if (ObjectUtil.isNotEmpty(start_point_code)) map.put("start_point_code","%"+start_point_code+"%"); + if (ObjectUtil.isNotEmpty(next_point_code)) map.put("next_point_code","%"+next_point_code+"%"); + + JSONObject json = WQL.getWO("ST_IVT_HOTPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time DESC"); + + return json; + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java index 3ccbcd6af..ab720e6f2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java @@ -156,7 +156,7 @@ public class RawfoilworkorderServiceImpl implements RawfoilworkorderService { WQLObject tab = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder"); JSONObject json = tab.query("workorder_id = '" + workorder_id + "'").uniqueResult(0); - json.put("status", "2"); + json.put("status", "09"); json.put("finish_type", "02"); json.put("realend_time", DateUtil.now()); json.put("update_optid", currentUserId); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql index 89bf9e09f..fe056d997 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql @@ -17,9 +17,14 @@ 输入.point_code TYPEAS s_string 输入.point_status TYPEAS s_string 输入.product_area TYPEAS s_string - 输入.is_used TYPEAS s_string + 输入.is_used TYPEAS s_string 输入.begin_time TYPEAS s_string 输入.end_time TYPEAS s_string + 输入.bill_code TYPEAS s_string + 输入.dtl_status TYPEAS s_string + 输入.task_code TYPEAS s_string + 输入.start_point_code TYPEAS s_string + 输入.next_point_code TYPEAS s_string [临时表] @@ -71,4 +76,72 @@ ENDOPTION ENDSELECT ENDPAGEQUERY + ENDIF + + IF 输入.flag = "2" + PAGEQUERY + SELECT + mst.bill_code, + dtl.start_point_code, + dtl.next_point_code, + dtl.temperature, + dtl.oven_time, + dtl.create_name, + dtl.create_time, + dtl.confirm_optname, + dtl.confirm_time, + ( + CASE + dtl.dtl_status + WHEN '10' THEN '生成' + WHEN '40' THEN '执行中' + WHEN '50' THEN '确认' + END + ) AS dtl_status, + ( + CASE + dtl.task_type + WHEN '0' THEN 'AGV任务' + WHEN '1' THEN '桁架任务' + END + ) AS task_type, + task.task_code + FROM + ST_IVT_HotRegionIODtl dtl + LEFT JOIN ST_IVT_HotRegionIOMst mst ON mst.iostorinv_id = dtl.iostorinv_id + LEFT JOIN sch_base_task task ON task.task_id = dtl.task_id + + WHERE + mst.is_delete = '0' + + OPTION 输入.bill_code <> "" + mst.bill_code = 输入.bill_code + ENDOPTION + + OPTION 输入.dtl_status <> "" + dtl.dtl_status = 输入.dtl_status + ENDOPTION + + OPTION 输入.task_code <> "" + task.task_code like 输入.task_code + ENDOPTION + + OPTION 输入.start_point_code <> "" + dtl.start_point_code like 输入.start_point_code + ENDOPTION + + OPTION 输入.next_point_code <> "" + dtl.next_point_code like 输入.next_point_code + ENDOPTION + + OPTION 输入.begin_time <> "" + dtl.create_time >= 输入.begin_time + ENDOPTION + + OPTION 输入.end_time <> "" + dtl.create_time <= 输入.end_time + ENDOPTION + + ENDSELECT + ENDPAGEQUERY ENDIF \ No newline at end of file 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 e965fb4e87a848217a9c7f9ed803acc665fcdb6e..0c256b0b84d9bd9e34d74367b0b2b0f7d581ec66 100644 GIT binary patch delta 8819 zcmcgxcU)9Q@Sl0_4h{v5rhtOrSy8|{j;g2}2iOoRmIMP*6hx$|B#H-`D6zzH(X|2^ z?5I)Dr#~a2M(j1wXe_9)S1d6qD!+Nh*%JNv-;e#weRpT(&F;+3&bwQ3zm@0a%V+gB zsRn>VWO;@BgpFyfaSkWL0KFO4SlSK&yi47<4xD9=;iIS7-#dfV6{`pAyQj~POy(+s z^)Dp1EptPZmAgq&l;uNM`bhf7%Cb6AW#GYmwSm{r7fpD8@Iiz18i#@U-VV0<`3@;) zT596h(?q|riK~7?lZGY;GWdnl*EDIVH*;xN+RtT;r{1Gami~E9C;gBJrM^K#M5#Vv zA%{WwuR7bKMjzp6PyHq;d&gjM0r^G%+16G;uHXtL?yi@>4z!|)x6PxHq&vE6R zz3V=I*M0G>TVw3%UGbGZZ@RPI_Xk^it&hoRtnWVBimQF2X{A3f)rtd7-)E>=-#f*M zLr%Xm$wA-b$3~^K`tA*NTY$CzIK-$}_8nNkD>HE{!6^xGiBG0k4ikAzZ0mSw38Ui1 zjh{A9Vqj3V$cr8Hjq-isIqa)9bpqB@vV=M&;D07@FQEA72@Eb61z%Jln68ksUv zQE_JJ&5}4?=K@%Li*i8$rq!1TImxV~=}PNKYi726@`oyOpW3_@b`alSRx}M$%Y!;L zs@_bze`_wTXHYPF%%;y4L_y_N;H;FuB+`f1*|=`Np&mc>vFlvrCm-!J!cJ#l>!SWC zAwIN!NQcd>X7`B?wl0&^U*2%k2CmW~9ameM zdB?VOU)R!dV)u%*^Q=yPF)07?vI#5WZ@Q1}nt(v!85-d1& z`Age9c%SFZ1&6Lx4DQuWb5WfXcwta^_^y-fvX34)(jYLWmDXv=Gp~Dzf!%uSei$`) zuv@l?&T0FYziw4Ninp1N7kqT2@0Zo)?F&+Vu7By+)64hE_WPIZ+N8c3)v-`@;NG6A zcfZY(NY+iu6~H+!xOSk;634Kio7R@*=BKSw(*!D&uT{i!?pJ~*vu{Pfshw-YVR`uCl3 z{doH`Z6B`+oO`3~fu*_~w@c%y&c$x{J=yv2vGY-9*B&f!8b$Dh^2n~UUZ&%&t$Eb^*^%3G$J!sbIAiZu ztH<7n8Fkv)biZxMPZq0+2kvk=KYp=#m-?D}WE0aWuK%0|(f^zs^Xp7*@jl&_z?q@9 z9|zu;fDTgI%7v$xOW=X?Po8h@l#_62@u^X-Q}0?`S3Wopb>zv(o`Fsqzgjfuar09b zbR%|pq~6cD`Z{fFY(bUN(FMh0)ijt_M>jaFE_aK+QxurBZ~Pbas&rOI7gaeF$Zsi>^}M;jKeofMndOrvmF9Ga zKKArhlbjmt)Z^uY@1EKQsng67cRFw1l0G_nyvL6Ay-l|{`KzxFD~T_-5gs{ntJ}4W zOa3er&enTv{>&k$9&U%q*mVd0nqM!ls@tEL`qfPU z^kd38NK>eaEG^wq7Tt8ynXPF4fKKW|qF1%GwfbMr29`EBeFxcAQ?xF%{_}zpPA+}$ zv=!<*zcwv(e->@6D=q*qCw=cifW?FZegY_$kZr;mLYrcMZ=?X<6FwyLSPn4P1fb0d zfH|fBRfJt=37IPa&Jmie0!TLlC?qtclG0)|zzo7t!p8Lhyw(6LBz!>_YYsYCu@=D6 zf)qt!Vi_0Am^hTqF#0qM}QMdW18;KZMb=E7Ed+6c+&Jo#Y`!ba@59ZK}Y( z?*ee7LV991Ktqab_^$x7brjN=y`)4T&8`I4K_SiC2T)0&oVK4Po~EA#*g~G>{0Xp|JY9MY;JWDP1=?%!u;wB_bMg!? zQ67+I4+$G_0C%qdG$7ALT?Js|Sn)N0Bjnhj>i|#4v6!2bN953^Ta+u56JOtkHn5C5 ztGEMji#+Rkk0vLN@BtYnPn7g+YA|^c{E!wWD9!PxdA;L^a94`3O2*RKVu?`Zi2G4@ z!SISJhlaq@+wLNM*kn)+4nQmWkK`iC;1$#ZS|wDGWy&$KVL~>l@WWPTgS_~UqzYv^ zgAww8gcJya5%W(Pp}qT<5rYlNT#`|m7;M;n(gyA4dp1msYh`&(m}&c`@p&6)OyT$w zsWDS$3^g@$Y0&TeLE(D?;f^y7#dmrx?>$ub{@{)aPIEkmq9^6_)zBR{IFD}|o9T*e zEzZ4T;CZ&s6@Ou+P0^oCYKlshs>Oy36&PY-TOWb97B{m3WlZIcK7ythcIR}LkWzun zQwmcUF5$aoVhEMETUU@0-=Kq}a|Pcu6T`y9&3MNXdv$yR~Ux% zX?PjU4aUR-`rskv-V%K*K4gt*iQ0d$%Kyuq`I7JW7gA||n}k>KO}j=B z7ZXNI!s|#y@of^`z&Gutu(}-%H^)wbbs(1TCevCY^lBq!dXW$pg#Os=7Sd~yo)lMw za0~z4%-+s%8&?}O#YDf2|7yZj4PL`~i`)^MeGn{s4d+SFhu}-D<1M6j-&-HvpW~em z_p!{VBies}Z(21w+y%$sL)Nt`_QOYPaaZg`aJMUJ36$LokW~j;MR?3!itvO5b;oA- zH;b=>{5mM9gX1DRWluzS!W?=SGz04(rVhRp;VD}s!V`A5j#*s?cHst@zX*3&ln8fO zZXFcY!Tvh9TL)G>4JzI}aV2S*5bvJQJOV?oUVDFpF+C9a4m1RgDQ}=J3({kA zVR~=0H^oj5cKiOF1ZM-9_?~i}V-2OrO8BTFmP=!SJ2S3?_jYBZcob(-x z`fWa=|K$kmWzx`Q974eigeQdv85_#|VDO9B4rWR!EvC){g;!jSE{|Jlbp${() zr&1{mf{w#AH)?y^f zTu-9`tY$q57Rn?|$Q#@(2Ji<$i%%)=#Y!5(7HVHUp<=vkf!KeE3?n9Gv(63k;4L}08> zCAmAFU8tndLe^&=!2)6LK72040=DxAs=qvirR0OSe{r;br?8Ah$eGZHr%@eWLOse7 zBVYQKZvv;WfOcQ}<`YNz{|BDIv+o+~c@!JV3ytX!Pv(EaA~yCYcB9A@8zVRDGm*P> z6u+@z^CPg0r6bT+LsEC7CY7>9RhTgE3ffuvAEAR)g;4nrp{0bquEH%EPcr|Se#s~a zRYYDyY9cCeu#3o-NW6EU(+lm1=yB*kL3A6r;t8J@Evu?#k| zyys}kHr+=%dA4yXGn%Rie$7tZ#~wIVX!-!tdGc3bcuWD-v_a4DlTFzE2&Gn}-^{4* z@frPF9M_YRYmJk8(d2V6n1xEYE*QdQNI8`})+kexY!$|_BT}xTJpL_H2J10Fa5SM? zJ$Y9n*WX|!l)1^sOqh@^mImCNEX|(A#R-7Ma+^6I@gJY`j9~h@d`Z+i?$)Y8C&GW zb*2}b#^^^D`SHou8$J{GHe5RnM+s_oE|TYD)@*7!t|b-IjqSJ=ygZPsh~*}a_NFa% zWY@g71bJs8b0RSpU=SOu=5EkNX}raadX8O;Gym{^M^O03|NSJ=8+JdK_3I!ek+7%( zHv`|M1~aCHUq?e~=sI$nQJ!O5#v&4~!EsF6nS?oPT4zeX2}apsgKRuIL^3mxDIUJX ztf>hdK4lPRC!c6kTtbQ`@LSd|h>T2Ti-O3=B%`drVB|Y?j$~$2j7AFTj09;o1^FJQ z;ap7RZw~${dY~9bve{iZA53BUx^mrUN4goFRKS|g>_|X2ZYYO3wx|b}iMfnkQ@<3Ym~9 zTpr3T;+g9_&V=2c%b5uI3EW7DX(uYtwWg?VDzOzTM{uL0?`x!TPd*rr<~(IOe+U3y zx-s`73M29WErf!Gng@7O^C77Rjr^#urk)>ZX{jFq!Jr~dCH2Edk^|$2<4^oB@G{sG zErgQ3#_*gsX(~x7+6o{YQR)R@b|eg=$AU>wd{jlvSLil@>l)sJ;sHb81e8F$;gf^E zC0#`({r#IitB(C2K3&a-f5Q2LoU4hhg2E%d7f%xIA=*#0m#C6xACV|KK=>QcA)>=X z^m>J(M8}AZ6P+OXmFNu7??k7FP80n>be8Bm(Vs-;h{Wp^(dI?MOGx)4;^4KAcY<@y z?B^fgtMpTbQOLES8jXiH#oE_Hs3`H|O$gSkVuBNS{k|DHR1>C=IlR6cUp|Md{;XNCPGHwbb*b zjSr&)s7nKX+I0^ac~g>w68RB{si7rOu?Guzdlo*EHxDf=?*>Xm*t(<r!i1ZR)73 zjPa=>Yke+xPqcaAlkKGJ4?n~>rCoK>77YoNseF8b`lz%X6#1|KN*aF(d4RWXsIQ-I zZkR@^QROtd?sWNu&w$|2D2Y7SCk9)MXdGl21oojC6+qvLJs5_UK)!6TX$aU}f$ZNM zbqamIpu~iPEOi&^MHbCYi1Ep)NNlu<_ljK4J6);Qbs4A>h0i=(*ECUJ9_Jow{+GUu zLLq6p3>=rq`X@qCW?fDdr6zX)2Uos-k>%8+ps@odW+y}JB`8XzD%j}0)a!-xNUDuG zXlIJe`l@7`rKO`|T?0~FbpftcEBO@HfB{fzF;sc@Zws$`7G6HL3{Yzk>v`vBBhcQeiA)vU~ISv0qx^n-f9lMm0_>r9M>e#DXf8P%q+%CnCUbCOoJH29Q)dFO-9H z7Sx8ZKS_NJEtraIGkVGsl&tei-m&gj2sak+JMjPK_#NO)K+2ZJaJFW(wH&>zB*3$W z37q5XG#OJa;k`^%FpPrW$C8%tz26Qh-XGW(@F8y{vF{Jo74Y5PN?yM|=vByjV>Zhz zOAc0s2E5^)v7A^~@1eA3VL<-F$lT?R-|&40uP~9UsOc0j_gB~S!-E=r|3;AJ zHFmSmJihzl5f*cIZooNj_#*ZuM{>nV4dZbvnBW;9Xc=FD^YVGSEycV8hrk?H@Cu9* z0$1=2QS#-HyJqZ%mAtDkW+iV+H}I@r1@9!RSViTLn^MV2R`c7*BuiSud(z#&{5AYc z&V4v@Tg#t76{}gxyNgn{68V@ni)!JZf9TC5awxhyd>mTaptEEz^q*s(kVM>-$ z%0DtyDcxOt15|8G89!BcUB-KHSi)2S-%OiG5fE=_bBV-T+37^$E$n;nl|Lt)*?}ZRNA^yzuo_eu~-u0*l?(g#Z8m delta 8723 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 YWASd}X%o9F`jyYY8^VNN`RS(r54C>7?EnA( diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java index e13fbab1c..0814e5756 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java @@ -72,8 +72,9 @@ public class TaskServiceImpl implements TaskService { map.put("vehicle_code", "%" + whereJson.getString("vehicle_code") + "%"); } if (StrUtil.isNotEmpty(whereJson.getString("task_type"))) { - ClassstandardDto task_type = classstandardService.findById(whereJson.getString("task_type")); - map.put("task_type", task_type.getClass_code()); + ClassstandardDto dto = classstandardService.findById(whereJson.getString("task_type")); + String task_type = classstandardService.getChildIdStr(dto.getClass_id().toString()); + map.put("task_type", task_type); } if (StrUtil.isNotEmpty(whereJson.getString("finishTypeList"))) { map.put("finishTypeList", whereJson.getString("finishTypeList")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql index 729b8ca4d..4725b6026 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql @@ -16,9 +16,9 @@ 输入.flag TYPEAS s_string 输入.task_status TYPEAS s_string 输入.finished_type TYPEAS s_string - 输入.task_type TYPEAS s_string - 输入.point_code1 TYPEAS s_string - 输入.point_code2 TYPEAS s_string + 输入.task_type TYPEAS f_string + 输入.point_code1 TYPEAS s_string + 输入.point_code2 TYPEAS s_string 输入.task_code TYPEAS s_string 输入.vehicle_code TYPEAS s_string 输入.begin_time TYPEAS s_string @@ -60,7 +60,7 @@ WHERE task.is_delete = '0' OPTION 输入.task_type <> "" - task.task_type = 输入.task_type + md.class_id in 输入.task_type ENDOPTION OPTION 输入.finished_type <> "" task.finished_type = 输入.finished_type @@ -83,7 +83,7 @@ OPTION 输入.task_code <> "" (task.task_code like 输入.task_code) ENDOPTION - OPTION 输入.point_code <> "" + OPTION 输入.point_code1 <> "" (task.point_code1 like 输入.point_code1) ENDOPTION OPTION 输入.begin_time <> "" diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/index.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/index.vue index 1f6b96e5d..f1f1c4b76 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/index.vue @@ -5,10 +5,10 @@ 库存查询 - + + diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue index 669cfa6c2..f271b83b0 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue @@ -279,7 +279,7 @@ export default { crudMethod: { ...crudStIvtCoolpointivt }, optShow: { add: false, - edit: true, + edit: false, del: false, download: false, reset: true diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue index 20292fee9..ece475d58 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue @@ -216,7 +216,7 @@ export default { crudMethod: { ...crudCutpointivt }, optShow: { add: false, - edit: true, + edit: false, del: false, download: false, reset: true diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue index a9092e964..6c4379fa8 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue @@ -210,7 +210,7 @@ export default { crudMethod: { ...crudDeliverypointivt }, optShow: { add: false, - edit: true, + edit: false, del: false, download: false, reset: true diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/index.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/index.vue index da964c872..e66a76abc 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/index.vue @@ -1,226 +1,23 @@ diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/pointIvt.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/pointIvt.vue new file mode 100644 index 000000000..576c52efb --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/pointIvt.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/taskDtl.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/taskDtl.vue new file mode 100644 index 000000000..8b70d23ff --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/taskDtl.vue @@ -0,0 +1,164 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/sbpointivt/index.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/sbpointivt/index.vue index 3f190b42b..543f9afe1 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/ivt/sbpointivt/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/sbpointivt/index.vue @@ -167,7 +167,7 @@ export default { crudMethod: { ...crudSbpointivt }, optShow: { add: false, - edit: true, + edit: false, del: false, download: false, reset: true diff --git a/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue index 293f4f21e..6f8827693 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue @@ -162,6 +162,8 @@ @@ -254,8 +256,8 @@ export default { compelEnd() { const _selectData = this.$refs.table.selection const data = _selectData[0] - if (data.status !== '01') { - return this.crud.notify('只能对开始状态的工单结束', CRUD.NOTIFICATION_TYPE.INFO) + if (data.status === '09') { + return this.crud.notify('不能对完成状态的工单强制结束', CRUD.NOTIFICATION_TYPE.INFO) } crudRawfoilworkorder.compelEnd(data).then(res => { this.crud.toQuery() diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue index 6a99cf2ff..cdfcb18d7 100644 --- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue @@ -69,7 +69,7 @@ /> - - + 仓位同步 @@ -307,7 +307,7 @@ - - - - - - + - - - - - - - - - - + + + + + + + + + +