From b1dd30e61caae4f64bf0efee2301c83044bc699f Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 1 Nov 2022 11:30:20 +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 256000 -> 256000 bytes .../src/main/java/org/nl/wms/sch/sch.xls | Bin 177152 -> 177152 bytes .../sch/service/impl/PointServiceImpl.java | 12 ++--- .../wms/sch/service/wql/QSCH_BASE_POINT.wql | 2 +- .../src/views/wms/sch/point/index.vue | 50 ++++++++++++------ .../src/views/wms/sch/region/index.vue | 2 +- 6 files changed, 42 insertions(+), 24 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 ed1540c752c4c929204fedbda91d7f4f96eb6cfb..7d4cdd074d1a1e555020673b8d7c1977371e8a13 100644 GIT binary patch delta 12684 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

^{?T!JU^v`myv~w<1z}$HQ4Oam@-X9MMfr7 zVBRFJ1w1W6-bS|}w8ZU}gSC$l)YiMk4>6fZ0EGfvSuF%A4%JL?xutG88 z%PWct^Csc>v9WoD($wJtkvcs#+TTs?hy1*x{_fJK@=v5GXlGH5$Yi!yHDFLwOoH0p zGI3x^N^-(i7Q;WcNI`wo>eTq8ST!1!o*EUMpiZ$!)kY0Uovw~Asz90?O_|iSalG04?o*XxE~ryDokXc}{^_2izD&9KJns_XY& zx_DvdDQs>lG8u^CQGaRNcvO^Ckyl(K%`w(g#G>5PsuGQ#TXtqeH8xUtNoQwQ3y$;L zMJ7^s%2XH?mp9k74?p|3>0Hxtuj2e9vzbPD(*+SyfnN+AgX70aW!biw{<5Y|4!We~ zYLbc$2%@B@K?*l^eofNUVyRMTB)~?qXr~CHiFsa9zfXMHn~j>`J?SjrY~_4gwaL-G zQK-92DwFo=*Hs>z(6w3gNr3#gOO!yZt+dUnkg9z93)Dr~#?tt)M|eq^%8CMM-Vxdv zt5E@VF1}WlkyW74I!|-vjcjjoUKiTtyk^-E=Q*a4J)N8#H3$ITz2|LNVR`vqr3G!W ztFoC@jj~1=&TpR|H`cU9#+O}3HL|t5WwQ5GHL~jB8rcm}Bdd`uk+o|zKyU7@0lE|a zQ`y~ux6(Y9#nS#Gy{4(!u0!%1uOt4(+qE~*q0K4dGm$i=xG=Lgx)@dZr^n=G6y@B~ zxUKm_WRhXDhHmB~*SZ%i`}WqJzP7(w}MnU(yNjK<0L$mVo zin4#vRQ{gYjAv;R;@j|=qPbm4pMk z$bF)+v*RlSn(abIx}w}I&wYzek!p#Yb{&%sy@}57eGV?`PBBKMyk}T+-qCf8 z!wa)KskgNK`ba+<)vbB>tez!C7kaEPX_6Ic%Cj@q${MksY-nu%8vIlw8`Kgr9lJ)- zvg8`9uzVovy9^IARtzBeVcF4VUikw)Q}y)Ky4D|yk^x@X4} z7rYu@ShQq-YU)u@JHMS@*Uo><_xE|vzip~`Z0h;g^s%Y*9$)d8@4B7(DMftj?u7%V zHlg~(mZv5mkcAd=r^Y{Rmb z=9}0keEG&UFWD;}evsOOPurAO`&ny~(X}9F{M{+c!EX*j%jz;4vDs*WD^f$rqQ~>GPzox4&JS3}HPiy&^ z>>|J|a5`Avc$Ch1BYl_p$2zx}hUIRwZvPg#H?6bYPLJb@ggmyR%h_ITey^KSPmjcS zIJvWvzTyFIX<#X)QF}Xv@82JIJl!sUyNzrq&{5e>p!TF45mF!8N)^ zoU|$ZL@!?yhGg={CKOvr<yfk zD~>iTp%`Ul6r{0>3QAK~W@!pSd}jNhtQo;Rn#yeBY@_AjDp@tU?xPkhM%U~uX8BNK z7T6}5?wJ150sldou>;lFc@;Br2dT(dYou2FnAg;xKvQN`o5%L^4+xY88^@Qn?v?xa zAJ}{RbJ4=IF=fTY6>0R6rWJ#l)NyKUY<#LLq}q~_uC;{etEi%EN^wDZ;I)7mR&N3; zyZfc0MPs^`-0B{)W|Z1k9vG-fmdAJppr|;dca$;&_7BQ{Aazi1P<32XOq6`8^Kad+ zzX==?txn^KqXWla*Kyrc<|-snN68Ty)N}yH;cG~|Zl!T7>T&~Bp0m@+m=qOTOhq3! z8@y(zW=vp3Q?C6++JEpiy88{2zUz=&R`beRy2(L?r&C^;W;YoRnT+ST4%w|UPR&Jm z<@zaZO>ur7WGkgp*O-5rr(> z=5XDeX8K2*d<}NzdJ{3AQq64$<)DI9qJ}M^9I&hj)&RV$1gPY;hu#1KK&cwO!SIa( zN(_AEi5VR55)Q{saLATD?LzJzp?fYZ;c0JuWn8vyi@&Fv2S&B*YQq9Gd+zL?i-@vtxUpXS zQ2VRdZ?s%D@(R5kGk!etoxjqrF#bjN`YIhv!9y$gb=o;57aWDRqFnaaSBVSY%f83^ z9KP&p!EfLT$weC>5O{$NH>L1Oy=r3TIjlyc<~kiHte*a~iT%F{nz7`2etUx!{12UE BP3Qms delta 12520 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 F{{x;-@16hv diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java index 8e64c3995..21da6eca2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java @@ -324,12 +324,12 @@ public class PointServiceImpl implements PointService { structMap.put("point_id", IdUtil.getSnowflake(1,1).nextId()); structMap.put("point_code", json.getString("struct_code")); structMap.put("point_name", json.getString("struct_name")); - structMap.put("region_id", ""); - structMap.put("region_code", ""); - structMap.put("region_name", ""); - structMap.put("point_type", "01"); - structMap.put("point_status", "00"); - structMap.put("lock_type", "1"); + structMap.put("region_id", json.get("sect_id")); + structMap.put("region_code", json.getString("sect_code")); + structMap.put("region_name", json.getString("sect_name")); + structMap.put("point_type", "2"); + structMap.put("point_status", "1"); + structMap.put("lock_type", json.getString("lock_type")); structMap.put("block_num", json.getIntValue("block_num")); structMap.put("row_num", json.getIntValue("row_num")); structMap.put("col_num", json.getIntValue("col_num")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql index b07979978..d4f4223a6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql @@ -91,7 +91,7 @@ FROM ST_IVT_StructAttr struct left join - SCH_BASE_Region region on struct.region_id = region.region_id + SCH_BASE_Region region on struct.sect_id = region.region_id WHERE struct.is_delete = '0' ENDSELECT 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 4946f34d8..6a99cf2ff 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 @@ /> - + + - + > + + @@ -234,7 +242,7 @@ clearable > @@ -255,16 +263,16 @@ /> - + @@ -299,13 +307,14 @@ - + +