From ece67d0dd452c6f41012415c6dc8a3d96e3026a2 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Thu, 1 Aug 2024 14:39:05 +0800
Subject: [PATCH] update

---
 .../engineer/utils/EnginnerPageTabOrder.java       |  17 ++++++-----------
 .../devicectrl/commonctrl/HardwareCommonCtrl.java  |   2 +-
 .../service/devicectrl/ctrl/TubeRackMoveCtrl.java  |   2 +-
 zhaohe_app.db                                      | Bin 180224 -> 180224 bytes
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/main/java/a8k/controler/engineer/utils/EnginnerPageTabOrder.java b/src/main/java/a8k/controler/engineer/utils/EnginnerPageTabOrder.java
index a05a790..44a491d 100644
--- a/src/main/java/a8k/controler/engineer/utils/EnginnerPageTabOrder.java
+++ b/src/main/java/a8k/controler/engineer/utils/EnginnerPageTabOrder.java
@@ -12,25 +12,20 @@ public enum EnginnerPageTabOrder {
 	AppFrontEndEventRouter,
 
 
-	MotorTubeRackMoveCtrlService,
-	SamplesPreProcessModuleCtrlService,
-	ReactionPlatesTransmitCtrlService,
-	HbotControlService,
-	HardwareTestScript,
-
-	CodeDebugParam,
-	PositionCalibration,
+	PosParam,
+	TimeParam,
 
 	DeviceStatus,
 
-	PosParam,
-	TimeParam,
 	HardwareCommonCtrl,
 	TubeRackMoveCtrl,
 	SamplesPreProcesCtrl,
 	ReactionPlatesTransmitCtrl,
-	TestScript,
+	HbotControlService,
 
+	PositionCalibration,
+	CodeDebugParam,
+	TestScript,
 
 	Max;
 }
diff --git a/src/main/java/a8k/service/devicectrl/commonctrl/HardwareCommonCtrl.java b/src/main/java/a8k/service/devicectrl/commonctrl/HardwareCommonCtrl.java
index b001252..c0fc6fc 100644
--- a/src/main/java/a8k/service/devicectrl/commonctrl/HardwareCommonCtrl.java
+++ b/src/main/java/a8k/service/devicectrl/commonctrl/HardwareCommonCtrl.java
@@ -18,7 +18,7 @@ import org.slf4j.Logger;
 import org.springframework.stereotype.Component;
 
 @Component
-@EngineerPageTab(name = "硬件控制-通用控制", order = EnginnerPageTabOrder.SamplesPreProcesCtrl)
+@EngineerPageTab(name = "硬件控制-通用控制", order = EnginnerPageTabOrder.HardwareCommonCtrl)
 @EnginnerPageParams(service = HardwareCommonCtrl.class)
 public class HardwareCommonCtrl {
 	static Logger logger = org.slf4j.LoggerFactory.getLogger(HardwareCommonCtrl.class);
diff --git a/src/main/java/a8k/service/devicectrl/ctrl/TubeRackMoveCtrl.java b/src/main/java/a8k/service/devicectrl/ctrl/TubeRackMoveCtrl.java
index 4b369eb..22b8d3c 100644
--- a/src/main/java/a8k/service/devicectrl/ctrl/TubeRackMoveCtrl.java
+++ b/src/main/java/a8k/service/devicectrl/ctrl/TubeRackMoveCtrl.java
@@ -17,7 +17,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 @Component
-@EngineerPageTab(name = "硬件控制-进出料", order = EnginnerPageTabOrder.MotorTubeRackMoveCtrlService)
+@EngineerPageTab(name = "硬件控制-进出料", order = EnginnerPageTabOrder.TubeRackMoveCtrl)
 @EnginnerPageParams(service = TubeRackMoveCtrl.class)
 public class TubeRackMoveCtrl {
 	static Logger logger = LoggerFactory.getLogger(TubeRackMoveCtrl.class);
diff --git a/zhaohe_app.db b/zhaohe_app.db
index 195e082d1a9d016949d52a4e7ede2e11bd57097d..2f2f088beafd427338f2bfdbcd00ac702f0105f3 100644
GIT binary patch
delta 2007
zcma)+-)me&6vvahn>O41aRmt_ZG*`sRY8ZI`Eln5txeN(2_Z3Cnq8rUkj&hfu`OB!
zeNti5hxWPR!@l|GlTfip5d0JRpie54KKM_FDCoI2rbe)Kmt8n_?>Td3&V0V#y}kP0
zUj6>*@kgJYSss6MXZP;z_&2-B7w1kr9!tMW-$`F<ec!s<{ImI4lQw>C+-uPK<NaAk
zzN@p%Mx#G>dcHP3hM(yOEKm~y(E=0^lmXF(DiV~<jAEKP3BxDnlas@X7m`y8UhrHo
zmJ@(riIA2N8!QmxRdkY3X-yb@av@>!;H;qB5#@D8gmZ=%#yQChXAq;nm<@lpkepip
z3X&NgNzP~>!beSXZUvFT1?POEp!4Cv8_COq-N{CO>cz9Q8g5+8=)h_2oFGalhjl>`
zBV)0Gfq>g*Du>QS|IPK)P5ka$z1Hn@m%Hm*?aS}^n;(Y!M*H>l=FNA*?GM`9hkxBV
zUUZnLO=5?&vxY^Pd*+EK4?74l5^KC8+8Kbz45LCFY0<lWwX@aUT-{h%@9gxhEiJEM
zi!0s!<)@F^M_=Bl9K&wY2RHHYw053Jr-4MC0TC=yI9j|D$D*ND<-RM0EV^CkytTUA
zS?c$?JL}z*ZofCN)$Rf80ARZ!poalJ2<YJ}b{Oy?7~Z*<Obzh1Gq5xgt^qHK8ctkL
zoG7Z4g)FyGn#<kpdS_|lNaL&5RyTT8xLz$zFjKO0?j$k+9)u^_yNF9Ei4mRvDe=Lw
zz>Q)59AJHEW2L{ew$iC=wLiMCv%G=354U&vo9*rLaj{aYJ$1lo(}T=72ugtGj0o*H
zu{LC+xCom$WjS}l?ZsqfLGmnuXOXa=kqd1dv0!r&fJx8+-(@iTd@(t*;5=k3*MeBC
z4Z<vuJT7qTA}a1B^D(&Llf`6ij-Nmv8m+0Zbh~vweUOT@-ukxncI%h)r}SRyVry!D
z_EPd&b1;gU8n0IR<D=-PUL=|kbabLfEMzozo{nlo<|x9MEPMZ(|Nq4Qc)8-==nkIA
zE~0y^%p8HXi6U_nma0YKQ7~>ji;PN<ISLrbE0un26fVBLRGr<gzMuTq8br#iG>W2e
z0w+SKjJO;eah7G7rZmqjn>W<Z7-3?ff4Vs-9XNx!CO*p%(ZJAtl@|oP20>O4Y;f~h
zMS&I7vLZqTEb5%dh|7x%1zHG~pe+oPRZ?&l%zTWwFcd0fNhZ;lWsW*w7F{vRDVkS~
zJ#C&@kEUsW&TAQ?mXMScLNjzu7l_mXCustjJIzqZ#^c_jrw$bMzzPcEWd$`EKQEO;
zm!gF%fh&}}z_UB;q%qd!u_)0@ml8Ub*2hpX57K)mq3yK(aBlY3)}XkYQHEF&G|KEs
ug8pY@PbXFqG#F)4B|)PMs3fSE%k#$4L`xZa0e=r`mwta~zxq}3NBS2aiT4En

delta 1985
zcma)7%WGU!9M0TK(oAP^uPC9!G&mut56q$G{lM0|I+WCyDa}kl%8;ICThS`mm79qR
z#bsU1rsz%(go;I?;D6!5u3Y#h6pDy0{N0&W0;TN?cQ~ATzu)8j&i8%y;GlkRP`|xU
zx%1V@t;(Ixu6};C^3&Dq+tV*UoG898J}BPIf6KqjU!47J_Cn)9<D15X`oqH}&VH?D
z)(rA9*$KMWXmpnrmTQ#>_{|5xoeEYU<pM{XP>Gxu0hwq>a#&guXc<RV3=1h*LQo{Z
zA+AV7hBAYK*HmL=Rf=@r&t!Btn8cU|4EF?a>jbhKClo1*f;nlKl!KqoWT#hxP%#kW
zk%HR@&=@&`CBo4OOSQq+g+cvn_G-U3)9B8<bgEW^p2?zNP6X%`S!c^utc40eAVPHr
zPI+y7Z0&a6-PzuQYyaY<cBj47-np{*QMhp{`s=IBy&E6Ko1gR^-?(<HOuty0f%L6Y
z*fH$6@JLXH5jP_Bk&}raDVX7y3n~ddlE3rb#nzR*?cMV`t^LlWjjeZ9o9Eiy&Bwdm
z(MPwYq0;<l`n`GOrIA=kq+Rrghv1QB-XN!>qDf(!ur3Sr&$TXZZ?!hMo%a4t`+U3G
znYz-!cpu}{W(Si;D}A)GM=OW5*TLm>d#cf0m|q$ldSL~QflG%Ju@P~mH5{eEa17E>
z%ybl(ZMNGxt&QDL;j_ca7cXt^cB=StwS0xeVXik$P;ZhkSR?O(MqDz5oQ@88M!X?X
zV4Vh)wQTO(r`Pwlc2}G6=6-jtH{7gEmWk#@P0bn=m3P=8se^$;mLkoCLV^dHq)03X
zKj^Jxiz}WmBS^%^q{sjX?Yo2l9+l8IdTps4e7%;PT!F??B+(%0Fi<hUkRf?Mm^c{?
zmC0B&_+u?wTB66{=o|UmME+;dE9&_#`P;=8#r^zR!Hc{3Tz>noxt{$!+aE_Sjn^l;
zm2u=!9|Fga%kdIess-vlTQ0Rx?dR)brUX98^e2gatOPzLYX4bGoi35%aBHdrjzJt+
zErCag@&418F<BzVAx8GvWVbdBFMeFFHV>;GXTRtDsFh;IOXN#416yOr1fvnq(Ai*<
zkI^g}0*;yR)Kqt2c7`Srz=t#n%z(4WQsPkx<ReXt69z^?mbFS8BC4YZ<rDBXBJfmO
z8gT+035>9heXddxoQbfUlIMot$zcfAA%bN@1m(d!JZRZ4;SghqDlG^lQZH+nl9o6d
z6~SP?JVd0E4p2l;WH7k7=OmV%V?fMM10o2n3?qUK^esgKK{QzSKv>YGGcW+KDHTG3
zW-)^h_y(|2LeoWk0)%rHM8u2xMg87V^RK*L9?m#J95QH}*^L<V^pX8Pu_1%{<4kJE
iAUei?h72m_^1QLk!aOEkfd9SP`aiE6R)5I;E&c=W#qmr4