From 9c2134586b5c755b519767293dc42ab60a299b41 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Mon, 21 Apr 2025 14:42:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=96=E5=B0=8F=E7=93=B6?= =?UTF-8?q?=E7=BC=93=E5=86=B2=E6=B6=B2=E6=97=B6=EF=BC=8C=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainctrl/mainflowctrl/action/AC40ApplyIncubatorPos.java | 2 +- src/main/java/a8k/app/service/statemgr/ConsumablesMgrService.java | 8 ++++---- src/main/java/a8k/app/type/a8k/container/LittBottleContainer.java | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/AC40ApplyIncubatorPos.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/AC40ApplyIncubatorPos.java index ec09366..f3f1584 100644 --- a/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/AC40ApplyIncubatorPos.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/AC40ApplyIncubatorPos.java @@ -65,7 +65,7 @@ public class AC40ApplyIncubatorPos extends A8kActionTask { )); //使用耗材 - consumablesMgrService.removeReserveConsumable(cxt.getConsumable()); + consumablesMgrService.useReserveConsumable(cxt.getConsumable()); } tubeStateMgrService.changeTubeStateToResourceIsReady(); diff --git a/src/main/java/a8k/app/service/statemgr/ConsumablesMgrService.java b/src/main/java/a8k/app/service/statemgr/ConsumablesMgrService.java index b27e720..32dc588 100644 --- a/src/main/java/a8k/app/service/statemgr/ConsumablesMgrService.java +++ b/src/main/java/a8k/app/service/statemgr/ConsumablesMgrService.java @@ -277,7 +277,7 @@ public class ConsumablesMgrService { } /** - * 申请耗材 + * 预定耗材 * @param projId 项目索引 * @return 耗材组 */ @@ -287,13 +287,13 @@ public class ConsumablesMgrService { int reserveNum = cState.reactionPlateGroup[group.off].reserveNum; int num = cState.reactionPlateGroup[group.off].num; priSetConsumableGroupNum(group, num, reserveNum + 1); - Integer pos = AppConstant.CONSUMABLE_NUM - num; + Integer pos = AppConstant.CONSUMABLE_NUM - num + reserveNum; return new ConsumableInfo(priGetLotId(group), group, pos); } return null; } - //预定耗材 + //归还预定耗材 synchronized public void bakReserveConsumable(ConsumableInfo consumableInfo) { Integer reserveNum = cState.reactionPlateGroup[consumableInfo.group.off].reserveNum - 1; Integer num = cState.reactionPlateGroup[consumableInfo.group.off].num; @@ -301,7 +301,7 @@ public class ConsumablesMgrService { } //使用耗材 - synchronized public void removeReserveConsumable(ConsumableInfo consumableInfo) { + synchronized public void useReserveConsumable(ConsumableInfo consumableInfo) { int reserveNum = cState.reactionPlateGroup[consumableInfo.group.off].reserveNum - 1; int num = cState.reactionPlateGroup[consumableInfo.group.off].num - 1; priSetConsumableGroupNum(consumableInfo.getGroup(), num, reserveNum); diff --git a/src/main/java/a8k/app/type/a8k/container/LittBottleContainer.java b/src/main/java/a8k/app/type/a8k/container/LittBottleContainer.java index 9c7c94c..2a7e747 100644 --- a/src/main/java/a8k/app/type/a8k/container/LittBottleContainer.java +++ b/src/main/java/a8k/app/type/a8k/container/LittBottleContainer.java @@ -1,9 +1,12 @@ package a8k.app.type.a8k.container; +import a8k.app.constant.AppConstant; import a8k.app.type.a8k.LittleBottleConsumableType; import io.swagger.v3.oas.annotations.media.Schema; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; public class LittBottleContainer implements Serializable { @@ -40,4 +43,5 @@ public class LittBottleContainer implements Serializable { this.num = num; this.isInstall = true; } + }