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; } + }