From 892aa7b93b56c11831be6d99c0651831811bfcf3 Mon Sep 17 00:00:00 2001 From: sige Date: Sun, 24 Dec 2023 17:38:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=BC=93=E5=86=B2=E6=B6=B2=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dreamworks/boditech/controller/DeviceController.java | 2 +- .../boditech/driver/consumable/CsmBufferTubeBox.java | 15 ++++----------- .../boditech/driver/consumable/CsmBufferTubeManager.java | 11 +++-------- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/dreamworks/boditech/controller/DeviceController.java b/src/main/java/com/dreamworks/boditech/controller/DeviceController.java index 9335592..8c97881 100644 --- a/src/main/java/com/dreamworks/boditech/controller/DeviceController.java +++ b/src/main/java/com/dreamworks/boditech/controller/DeviceController.java @@ -170,7 +170,7 @@ public class DeviceController extends BaseController { @ResponseBody @PostMapping("/api/device/buffer-tube-status-get") public ApiResponse bufferTubeStatusGet() { - return this.success(this.deviceService.device.bufferTubes.getAll()); + return this.success(this.deviceService.device.bufferTubes.getAllBoxes()); } @ResponseBody diff --git a/src/main/java/com/dreamworks/boditech/driver/consumable/CsmBufferTubeBox.java b/src/main/java/com/dreamworks/boditech/driver/consumable/CsmBufferTubeBox.java index 44773a3..a909628 100644 --- a/src/main/java/com/dreamworks/boditech/driver/consumable/CsmBufferTubeBox.java +++ b/src/main/java/com/dreamworks/boditech/driver/consumable/CsmBufferTubeBox.java @@ -1,16 +1,9 @@ package com.dreamworks.boditech.driver.consumable; -public class CsmBufferTubeBox { +public class CsmBufferTubeBox extends ConsumableBase { // index of buffer tube box : 0 - 5 - public Integer index; + public Integer index = -1; // if the buffer tube box is loaded public Boolean isLoaded = false; - - public Integer projectId; - public String projectName; - public String projectColor; - public Integer tubeAmount; - - public static final String STATUS_NOT_LOADED = "NOT_LOADED"; - public static final String STATUS_LOADED = "LOADED"; - public String status; + // amount of buffer tubes in the box + public Integer tubeAmount = 0; } diff --git a/src/main/java/com/dreamworks/boditech/driver/consumable/CsmBufferTubeManager.java b/src/main/java/com/dreamworks/boditech/driver/consumable/CsmBufferTubeManager.java index d372ac4..dba6913 100644 --- a/src/main/java/com/dreamworks/boditech/driver/consumable/CsmBufferTubeManager.java +++ b/src/main/java/com/dreamworks/boditech/driver/consumable/CsmBufferTubeManager.java @@ -1,12 +1,10 @@ package com.dreamworks.boditech.driver.consumable; import com.dreamworks.boditech.driver.Device; import com.dreamworks.boditech.driver.entity.ParamBufferTubeUpdateByBox; -import com.dreamworks.boditech.entity.IdChip; import com.dreamworks.boditech.entity.Project; import java.util.ArrayList; import java.util.List; import java.util.Objects; - public class CsmBufferTubeManager { // device instance private final Device device; @@ -24,13 +22,12 @@ public class CsmBufferTubeManager { for ( int i=0; i<6; i++ ) { CsmBufferTubeBox box = new CsmBufferTubeBox(); box.index = i; - box.status = CsmBufferTubeBox.STATUS_NOT_LOADED; this.bufferTubeBoxes.add(box); } } // get all buffer tube boxes - public List getAll() { + public List getAllBoxes() { return this.bufferTubeBoxes; } @@ -57,12 +54,10 @@ public class CsmBufferTubeManager { } CsmBufferTubeBox box = this.bufferTubeBoxes.get(index); - box.projectName = project.name; - box.projectId = project.id; - box.projectColor = project.color; + box.setProject(project); box.tubeAmount = 25; + box.lotCode = lotCode; box.isLoaded = true; - box.status = CsmBufferTubeBox.STATUS_LOADED; }