From 7e3ecd282c440f1d74e0adb8e34eecf26068c028 Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Fri, 26 Apr 2024 15:23:56 +0800
Subject: [PATCH] 1

---
 app.db                                             | Bin 704512 -> 704512 bytes
 .../com/iflytop/digester/DigestionTaskThread.java  |  64 +++++++++++----------
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/app.db b/app.db
index 414b9685398fa2609ea9b0ceffd4b87ecb615552..8d4f73999714e41c5b4faecae1df363447f43271 100644
GIT binary patch
delta 161
zcmV;S0ABxqfGdE2E07xj7Lgo71r`7<Pkn)8g=7JRWCDd`1BGM+g=7VVWCn#~2eo7f
zpbrBk1Ynm35C}^G1YolfAPfXjP+tfUOAkp88vr>qL}_Pbb98BMZd74&YejN$Z*ov_
zZ)0V1b46}pVr*qF=C+9Fr=#S%yXA_Z<-CIBxVYt{gy)ck<&dxEl&CRcZ*Od6VQz=A
P6bOg16bZMo6beqOt$aP{

delta 75
zcmZo@&~9kZo*>OAI#I@%Rg^)mtgA7lHHEP?g{d`#xiy8QHHEb`g{?J(eQOHG0)A#y
emQB;y1vtDn3o0bAv~LpO0AkMVn?$($Rs#TABNoyC

diff --git a/src/main/java/com/iflytop/digester/DigestionTaskThread.java b/src/main/java/com/iflytop/digester/DigestionTaskThread.java
index b919376..08aa9bb 100644
--- a/src/main/java/com/iflytop/digester/DigestionTaskThread.java
+++ b/src/main/java/com/iflytop/digester/DigestionTaskThread.java
@@ -285,40 +285,46 @@ public class DigestionTaskThread extends Thread {
             // 拍照检查异常试管
             this.executeLastRoundTakeShotAndCheckErrorTubes();
 
-            // 申请异常处理位
-            var errorSlot = device.heatingTurntable.getErrorSlot();
-            var emptyTubeIndexes = errorSlot.getEmptyTubeIndexes(this.errorTubeIndexes.size());
-            var errorTubeIndexes = this.errorTubeIndexes;
-            if ( emptyTubeIndexes.size() < this.errorTubeIndexes.size() ) {
-                errorTubeIndexes = this.errorTubeIndexes.subList(0, emptyTubeIndexes.size());
-            }
 
-            // 将异常试管放入异常处理区域
-            String srcErrorTubeIndexes = String.join(",", errorTubeIndexes.stream().map(Object::toString).toArray(String[]::new));
-            String dstErrorTubeIndexes = String.join(",", emptyTubeIndexes.stream().map(Object::toString).toArray(String[]::new));
-            this.updateTaskStatus("MoveTube", String.format("移动异常试管 [%s] -> [%s]", srcErrorTubeIndexes, dstErrorTubeIndexes));
-            device.transferArm.moveTubesToErrorSlot(errorTubeIndexes, emptyTubeIndexes);
-            this.errorTubeIndexes.clear();
-            this.errorTubeIndexes.addAll(emptyTubeIndexes);
+            // 如果启用异常处理则执行异常处理操作
+            Boolean errorProcessEnable = UfMdbOption.getBoolean("DigestionTaskErrorProcessEnable", true);
+            if ( errorProcessEnable ) {
+                // 申请异常处理位
+                var errorSlot = device.heatingTurntable.getErrorSlot();
+                var emptyTubeIndexes = errorSlot.getEmptyTubeIndexes(this.errorTubeIndexes.size());
+                var errorTubeIndexes = this.errorTubeIndexes;
+                if ( emptyTubeIndexes.size() < this.errorTubeIndexes.size() ) {
+                    errorTubeIndexes = this.errorTubeIndexes.subList(0, emptyTubeIndexes.size());
+                }
 
-            // 更新试管状态
-            for ( int i=0; i<errorTubeIndexes.size(); i++ ) {
-                var srcErrorTubeIndex = errorTubeIndexes.get(i);
-                var destErrorTubeIndex = emptyTubeIndexes.get(i);
+                // 将异常试管放入异常处理区域
+                String srcErrorTubeIndexes = String.join(",", errorTubeIndexes.stream().map(Object::toString).toArray(String[]::new));
+                String dstErrorTubeIndexes = String.join(",", emptyTubeIndexes.stream().map(Object::toString).toArray(String[]::new));
+                this.updateTaskStatus("MoveTube", String.format("移动异常试管 [%s] -> [%s]", srcErrorTubeIndexes, dstErrorTubeIndexes));
+                device.transferArm.moveTubesToErrorSlot(errorTubeIndexes, emptyTubeIndexes);
+                this.errorTubeIndexes.clear();
+                this.errorTubeIndexes.addAll(emptyTubeIndexes);
+
+                // 更新试管状态
+                for ( int i=0; i<errorTubeIndexes.size(); i++ ) {
+                    var srcErrorTubeIndex = errorTubeIndexes.get(i);
+                    var destErrorTubeIndex = emptyTubeIndexes.get(i);
+
+                    var tube = this.heatingSlot.tubes.get(srcErrorTubeIndex);
+                    tube.index = destErrorTubeIndex;
+                    errorSlot.tubes.set(destErrorTubeIndex, tube);
+                    this.heatingSlot.tubes.set(srcErrorTubeIndex, null);
+                }
 
-                var tube = this.heatingSlot.tubes.get(srcErrorTubeIndex);
-                tube.index = destErrorTubeIndex;
-                errorSlot.tubes.set(destErrorTubeIndex, tube);
-                this.heatingSlot.tubes.set(srcErrorTubeIndex, null);
-            }
+                // 将正常试管放入加热转盘
+                device.transferArm.moveTubeRackToHeatingTurntable(this.heatingSlot.index);
+                this.unlockLiquidPlate();
 
-            // 将正常试管放入加热转盘
-            device.transferArm.moveTubeRackToHeatingTurntable(this.heatingSlot.index);
-            this.unlockLiquidPlate();
+                // 启动异常处理线程
+                DigestionTaskThread.this.errorProcessThread = new Thread(DigestionTaskThread.this::executeErrorProcess);
+                DigestionTaskThread.this.errorProcessThread.start();
+            }
 
-            // 启动异常处理线程
-            DigestionTaskThread.this.errorProcessThread = new Thread(DigestionTaskThread.this::executeErrorProcess);
-            DigestionTaskThread.this.errorProcessThread.start();
             // 预检查完成
             DigestionTaskThread.this.isPrecheckFinished = true;
             synchronized ( DigestionTaskThread.this.precheckLock ) {