From a203fb85763c868804c63d59c4f7f1dd507a28ae Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Tue, 28 Jun 2022 13:19:11 +0800
Subject: [PATCH] 1

---
 .../java/org/nl/acs/device/wql/task_inst.xls  | Bin 189440 -> 189440 bytes
 .../service/impl/InstructionServiceImpl.java  |   9 ++++++---
 .../org/nl/acs/order/service/wql/order.xls    | Bin 163840 -> 163840 bytes
 wcs/qd/src/assets/acs/光.png                 | Bin 0 -> 421 bytes
 wcs/qd/src/assets/acs/区.png                 | Bin 0 -> 378 bytes
 wcs/qd/src/assets/acs/激.png                 | Bin 0 -> 543 bytes
 wcs/qd/src/views/acs/stage/editor/index.vue   |   6 ++++--
 7 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 wcs/qd/src/assets/acs/光.png
 create mode 100644 wcs/qd/src/assets/acs/区.png
 create mode 100644 wcs/qd/src/assets/acs/激.png

diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device/wql/task_inst.xls b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device/wql/task_inst.xls
index 1a1098e01ada6a5c4814b3d8ecfadd22f7bcf098..2c352f86d34234b3bee75dcdd68575639e4288c4 100644
GIT binary patch
delta 55
zcmV-70LcG<$P0kT3$Sbi1^~6Xpi_mjas;*k3<&@LZf|02Wo&6?bdx~_SCdc%4TG2l
NhnNNdx0nV3Xx%cz6LJ6m

delta 57
zcmV-90LK4-$P0kT3$Sbi2Cy`vX32)Las;*k4hsMPF*P_dIWRXgF*G-mK?YZoPzDQw
Pm<ETK1_8I21_Ef^FCG$0

diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
index 81558aa7..f5a1225f 100644
--- a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
+++ b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
@@ -205,8 +205,11 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
     public Instruction findById(String instruction_id) {
         WQLObject wo = WQLObject.getWQLObject("acs_instruction");
         JSONObject json = wo.query("instruction_id ='" + instruction_id + "'").uniqueResult(0);
-        final Instruction obj = json.toJavaObject(Instruction.class);
-        return obj;
+        if(ObjectUtil.isNotEmpty(json)){
+            final Instruction obj = json.toJavaObject(Instruction.class);
+            return obj;
+        }
+        return null;
     }
 
     @Override
@@ -635,7 +638,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
     @Transactional(rollbackFor = Exception.class)
     public void update(Instruction dto) {
         Instruction entity = this.findById(dto.getInstruction_id());
-        //if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!");
+        if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!");
 
         String currentUsername = SecurityUtils.getCurrentUsername();
         String now = DateUtil.now();
diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/wql/order.xls b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/wql/order.xls
index 91d6387ec6dd1d50c7f36afe450ddb35b5cd3020..89d456db335a3f66cd12d666e74131dc2ac5efbf 100644
GIT binary patch
delta 55
zcmZo@;A&{#+K|J-c7ZYaidW0#B9?88Je&*+dHG2>sX3WxC6gW5!Y2o?@ixz3YoEc!
LxP1m2Q${5K5epJy

delta 57
zcmZo@;A&{#+K|J-rm&AA_+;DWB9?88eB2BShNc$AmIme~h9>5d9ofPs2e5HB&tPkx
N!N$0K1{+gGB>?Yn5TO77

diff --git a/wcs/qd/src/assets/acs/光.png b/wcs/qd/src/assets/acs/光.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fe3b12696bf6431e10ff960e691799eb3feb838
GIT binary patch
literal 421
zcmV;W0b2fvP)<h;3K|Lk000e1NJLTq001HY001Hg1^@s6I!6n_0004ONkl<ZScUDD
zF^+;j6o!Ad)Dw_cPHnsah4BWo-UAD+L1p(m0KL*#cmU{3v>-8odTf82mB_?RW^l=x
z&3p+31Nr%QGjB2@lEeq__16LqyoiYxG4UcMUc}^Wk)~;|-EQAEp(9zAF-_C<z9<Sl
z$7rn?$1#hdaLRQS+3)uRz%0vNiiijS3@<{GX_^uM>$>iUoX=+}r8*TGR77jte(+f&
z3`0gyM6I=R=7_XE2IP5;>-E|htEvj?^%^3As;U40)9Dld5Cj1hi-lG8TV1o+Y;d_;
zAR<_;Rvigv`b^COr4&Vk-&J*9pwINK$nAE+>2yL61brhq^cLCeb^w6cZ1(bbS(Yfv
z(mt?H86RyL$8kFbV`@Z%N~z(dCeL#$mrKm&b0kUf<9mn0!MbCdD-wobyFksoB8nmc
zXfLG{kH@2Rw$nb+Gz}(`3C82G{hwOmBr+ub=RERTco7pXV&X+iK1SpYGg_r5)UpQJ
P00000NkvXXu0mjf;k~t*

literal 0
HcmV?d00001

diff --git a/wcs/qd/src/assets/acs/区.png b/wcs/qd/src/assets/acs/区.png
new file mode 100644
index 0000000000000000000000000000000000000000..869eda4adb0df9a4d5ee5649175eaf9670e8b6d3
GIT binary patch
literal 378
zcmV-=0fqjFP)<h;3K|Lk000e1NJLTq001HY001Hg1^@s6I!6n_0003&Nkl<ZScUDC
zF^+>U5Ji7hThW6=N8vJ@fg%S;LpplSK?NsBkKh<S00(e7B&exF{ZoNhODow#o2Bq8
z@n?9lhw+IdaR9#lTVTP7=r|D_C!*s-bPgl(Z4(~H5mi+g=Wn+gE|-f@_GEL{JRT36
z&u1v5e$BLPi!93k06`GI_kFYCv_L7v<rOI<r)m1JE~O*@N-1s1k|cMDOw+_9NhpM1
z*LCZ9k|fOY+*)F{2uaTK%=`UL04&RrWmyschhg}v$U@h36haUHo2J<%L6UF(zR%|q
zecwX}fubldj^n;U@9fC-Xy$olnx>y^R;ASX(d}_;WwuRhg4IA<==&Z3Fbo5tC|aL;
zo`<@walKv<$FWt-T?4IY8l!v|hQ^cCs#${|FqW{zYDfN(!`!}3M8}EfI1wEuqH`FL
Y7x!ryYq4deVE_OC07*qoM6N<$f)=Zy-2eap

literal 0
HcmV?d00001

diff --git a/wcs/qd/src/assets/acs/激.png b/wcs/qd/src/assets/acs/激.png
new file mode 100644
index 0000000000000000000000000000000000000000..d82ddd99f8f230e5e2b4cd0121f5b91f3c6de1d4
GIT binary patch
literal 543
zcmV+)0^t3LP)<h;3K|Lk000e1NJLTq001HY001Hg1^@s6I!6n_0005zNkl<ZScUDE
zv5Mm`6h-eWQ#tvF1XTJ5T&YT(6zWs@7hI;(AE-A<m&X0Lbm1nQ0x1G^ZI{7m?-ql_
z#<Q^TlCZPj3r0No@qBcj5b_&I;v4A4zXs?vfebZ)3^joaHGvE@3Z!jY+-^4?*L98k
zet(y<-|ulcoyL=Jgp^VgLa?eTT5El5t!19)?7EHsnCJPJvLwm(G0<t6V!Pd9wOZkF
zxj<`;^?Hq>C;$NS`P}FBt}K^J1VQk}+M`+%1Od`C#mC170N{8$q9_WS&u0KYmSqq^
z;BYt~3`6X8J2Xx6Sn)@#%k!L4N;>CAk^q=x8J%;~T2o3%0JPTn_kHeDTN6bQq9{Tb
zhRCuE0I=C?zT{o6SF~;WXxZ_O{OU|qRU|(*uTsj-_i<U499w!c2ua3qOaNb=BuV_(
z1HKF-NfH`k{HmREbk2E~hI{2DAWhTwbHW%yAq3+%_9ICeV+ep{S-uX$T1z1WyRM^@
zl3Ht$pRLkbv#Kfrpb*06JsqU~h_#m1+PhUtDVZdRcc$w)3L&VJ@-2HRNF2v>&fT@A
zcR)%>rIdG}swxU0XpDKN{u?>|ccQLqEEbEqxwdUFo6R0N&VQ%B0(pi0&-=(LHGvE@
hfebZ)4E1e5egbZ5XIYCbBxC>p002ovPDHLkV1mYx^zi@y

literal 0
HcmV?d00001

diff --git a/wcs/qd/src/views/acs/stage/editor/index.vue b/wcs/qd/src/views/acs/stage/editor/index.vue
index 7700dee0..04fa93b0 100644
--- a/wcs/qd/src/views/acs/stage/editor/index.vue
+++ b/wcs/qd/src/views/acs/stage/editor/index.vue
@@ -231,8 +231,10 @@ export default {
         { id: 10, name: '墙面竖', img1: '墙面竖' },
         { id: 11, name: '区域横', img1: '区域横' },
         { id: 12, name: '区域竖', img1: '区域竖' },
-        { id: 13, name: '专机', img1: '专机' }
-
+        { id: 13, name: '专机', img1: '专机' },
+        { id: 14, name: '激', img1: '激' },
+        { id: 15, name: '光', img1: '光' },
+        { id: 16, name: '区', img1: '区' }
       ],
       arr2: [],
       stageSelectList: [],