From 1ade64c898598b1b598c3a77f1a7f4c58216cb36 Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Fri, 31 May 2024 10:27:14 +0800
Subject: [PATCH] sss

---
 app.db                                             | Bin 978944 -> 978944 bytes
 .../com/iflytop/digester/StartResetTaskThread.java |  16 ++--------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/app.db b/app.db
index 670bf98c4646a52244c8e791c9311305ba9c5c4b..17d008882574818a05ca574fccb3827a48489d41 100644
GIT binary patch
delta 280
zcmZp8VBPS*dV)0L)rm6Bj8_{IS`!$zCNP<}u`;rRnx;?R;LqeUJ&T`Nvi+YM6A&{4
zF$)m00x=s9vjZ^)5OV@C7Z7uA|L4ZT*2x$+o%I5bEfZ_>bf*hEY1>y_;5p62#Q0*m
z{d-=O?XxfQ9AMPbWDaFAN-;7vFtxPQO*KzU(KRtPPSv$AOtI88O|&#jHcCk{H8)CR
zxB^l+{nb-GmG-q)d4QOA``W8~;atr8ta{VgAMnXCvFdGB4B%ijXw+>C;Ruy%<Q4U`
iCdTOL1#kEar^meDbLTWNvof*JGc_^Ue*Y<-A{PM8Azh{b

delta 225
zcmZp8VBPS*dV)0L$%!(~j3*ltS`!$zCNP<}31u*`glZNVCK;y~B*lQ(k<&Bt8I9DU
zpLOnhwq~J~p}C>C0T3IS#VS1QTJUV!CWV)+lb+At{IYe2f?@kVHzpuv24WT<W(8t4
zAZ7<*4j|?PVlE)&-u};xhpm$_U^?ps9^2_I7kJW`SoyZEy1;XqiHS*Qy8U}zmF=@H
z^BiDgGe|NpFcO_U|1pmWizag@)AUzQ`Bd81UgZH|-tB9z@`ZCT^ReEa&i;T;cC%u@
NZr1JhpYkbk0RRb_SU&&&

diff --git a/src/main/java/com/iflytop/digester/StartResetTaskThread.java b/src/main/java/com/iflytop/digester/StartResetTaskThread.java
index 60633b5..7740bb1 100644
--- a/src/main/java/com/iflytop/digester/StartResetTaskThread.java
+++ b/src/main/java/com/iflytop/digester/StartResetTaskThread.java
@@ -15,8 +15,6 @@ import java.util.Map;
 public class StartResetTaskThread extends Thread {
     // logger
     public static final Logger LOG = LoggerFactory.getLogger(StartResetTaskThread.class);
-    // 是否需要放置异常处理试管架
-    private Boolean isErrorTubeRackRequired = true;
     // pause lock
     private final Object pauseLock = new Object();
     // action result
@@ -39,9 +37,8 @@ public class StartResetTaskThread extends Thread {
                 this.setupHeatingSlotCover();
                 // 蠕动泵初始化
                 this.setupPeristalticPump();
-                if ( this.isErrorTubeRackRequired ) {
-                    this.setupErrorTubeRack();
-                }
+                // 初始化异常处理区
+                this.setupErrorTubeRack();
                 break;
             } catch ( Exception e ) {
                 UfMdbNotification.error(e.getMessage());
@@ -68,8 +65,6 @@ public class StartResetTaskThread extends Thread {
      */
     private void setupHeatingSlotCover() {
         boolean isDoorOpen = false;
-        Integer errorSlotIndex = UfApplication.getApp().getEnv().getProperty("app.errorSlotIndex", Integer.class);
-
         for ( int i=0; i<5; i++ ) {
             this.setProgressMessage("设备初始化 : 检查试管架 " + (i+1) + "/5");
             UfCmdSnippetExecutor.execute(String.format("HeatingSlotCoverEnable.%d",i));
@@ -85,13 +80,6 @@ public class StartResetTaskThread extends Thread {
                 continue;
             }
 
-            // 如果是空试管架， 又是异常区域则不处理， 因为异常区域始终要有个试管架
-            var emptyRackExistsPos = UfMdbOption.getInteger("HeatingPlateMotorSlotCoverEmptyRackExists", 0);
-            if ( currentPos > emptyRackExistsPos && null != errorSlotIndex && errorSlotIndex == i ) { // 异常区域存在空试管架
-                this.isErrorTubeRackRequired = false;
-                continue;
-            }
-
             // 将试管架移至加液盘
             UfCmdSnippetExecutor.execute(String.format("TubeRackMoveToLiquidPlate.%d", i));
             // 打开柜门