diff --git a/src/main/java/a8k/baseservice/appeventbus/appevent/A8kEcodeContextListPromptEvent.java b/src/main/java/a8k/baseservice/appeventbus/appevent/A8kEcodeContextListPromptEvent.java index 339897d..db74cee 100644 --- a/src/main/java/a8k/baseservice/appeventbus/appevent/A8kEcodeContextListPromptEvent.java +++ b/src/main/java/a8k/baseservice/appeventbus/appevent/A8kEcodeContextListPromptEvent.java @@ -1,6 +1,6 @@ package a8k.baseservice.appeventbus.appevent; -import a8k.service.appctrl.type.A8kErrorContext; +import a8k.service.appctrl.mainflowctrl.base.A8kErrorContext; import java.util.List; diff --git a/src/main/java/a8k/baseservice/appeventbus/appevent/DoA8kStepActionEvent.java b/src/main/java/a8k/baseservice/appeventbus/appevent/DoA8kStepActionEvent.java index 4811fcc..a7bd5d2 100644 --- a/src/main/java/a8k/baseservice/appeventbus/appevent/DoA8kStepActionEvent.java +++ b/src/main/java/a8k/baseservice/appeventbus/appevent/DoA8kStepActionEvent.java @@ -1,6 +1,6 @@ package a8k.baseservice.appeventbus.appevent; -import a8k.service.appctrl.action.base.A8kActionStepType; +import a8k.service.appctrl.mainflowctrl.base.A8kActionStepType; public class DoA8kStepActionEvent extends AppEvent { public A8kActionStepType actionStep; diff --git a/src/main/java/a8k/service/appctrl/AppDeviceCtrlService.java b/src/main/java/a8k/service/appctrl/AppDeviceCtrlService.java index a61b3b7..0e57436 100644 --- a/src/main/java/a8k/service/appctrl/AppDeviceCtrlService.java +++ b/src/main/java/a8k/service/appctrl/AppDeviceCtrlService.java @@ -3,16 +3,13 @@ package a8k.service.appctrl; import a8k.controler.extapi.pagecontrol.ExtApiTabConfig; import a8k.controler.extapi.utils.ExtApiFn; import a8k.controler.extapi.utils.ExtApiTab; -import a8k.service.appctrl.action.base.A8kStepAction; +import a8k.service.appctrl.mainflowctrl.base.A8kStepAction; import a8k.service.appstate.type.MainFlowCtrlState; import a8k.service.appstate.type.TubeHolder; import a8k.type.ConsumableGroup; import a8k.type.checkpoint.CheckResult; import a8k.service.appstate.GStateService; -import a8k.service.appstate.type.state.A8kWorkState; import a8k.type.exception.AppException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/service/appctrl/ConsumablesScanService.java b/src/main/java/a8k/service/appctrl/ConsumablesScanService.java index 49a07e3..d9a8f19 100644 --- a/src/main/java/a8k/service/appctrl/ConsumablesScanService.java +++ b/src/main/java/a8k/service/appctrl/ConsumablesScanService.java @@ -1,11 +1,15 @@ package a8k.service.appctrl; +import a8k.constant.AppConstant; import a8k.hardware.type.a8kcanprotocol.A8kEcode; import a8k.service.appdata.AppProjInfoMgrService; -import a8k.service.appctrl.type.app_consumables_mgr_service.*; import a8k.service.appstate.GStateService; import a8k.service.devicedriver.ctrl.ConsumablesScanCtrl; import a8k.type.ConsumableGroup; +import a8k.type.consumables.LarBSGroup; +import a8k.type.consumables.LittBSGroup; +import a8k.type.consumables.ReactionPlateGroup; +import a8k.type.consumables.ScanResultState; import a8k.type.exception.AppException; import a8k.type.projecttype.A8kReactionFlowType; import a8k.type.projecttype.a8kidcard.A8kIdCardInfo; @@ -21,17 +25,22 @@ import java.util.Map; @Component public class ConsumablesScanService { - static Logger logger = org.slf4j.LoggerFactory.getLogger(ConsumablesScanService.class); - static final Integer EachConsumableNum = 20; + static Logger logger = org.slf4j.LoggerFactory.getLogger(ConsumablesScanService.class); + + public static class ConsumablesScanResult { + public Integer chNum; + public ScanResultState state; + public Integer projIndex; + public String lotId; + } - @Resource - GStateService gstate; @Resource + GStateService gstate; + @Resource AppProjInfoMgrService appProjMgr; - @Resource - ConsumablesScanCtrl scanCtrlService; + ConsumablesScanCtrl scanCtrlService; /** * 解析扫描结果，返回耗材扫描结果 @@ -111,13 +120,13 @@ public class ConsumablesScanService { assert a8kIdCardInfo != null; assert reactionType != null; - cState.reactionPlateGroup[ch] = new ReactionPlateGroup(result.projIndex, a8kIdCardInfo.projName, result.lotId, a8kIdCardInfo.color, EachConsumableNum); + cState.reactionPlateGroup[ch] = new ReactionPlateGroup(result.projIndex, a8kIdCardInfo.projName, result.lotId, a8kIdCardInfo.color, AppConstant.CONSUMABLE_NUM); if (reactionType.equals(A8kReactionFlowType.ReactionWithLittBS)) { - cState.littBSGroup[ch] = new LittBSGroup(result.projIndex, a8kIdCardInfo.projName, result.lotId, a8kIdCardInfo.color, EachConsumableNum); + cState.littBSGroup[ch] = new LittBSGroup(result.projIndex, a8kIdCardInfo.projName, result.lotId, a8kIdCardInfo.color, AppConstant.CONSUMABLE_NUM); cState.larBSGroup[ch] = new LarBSGroup(); } else if (reactionType.equals(A8kReactionFlowType.ReactionWithLarBsAndDetection)) { - cState.littBSGroup[ch] = new LittBSGroup(result.projIndex, a8kIdCardInfo.projName, result.lotId, a8kIdCardInfo.color, EachConsumableNum); - cState.larBSGroup[ch] = new LarBSGroup(result.projIndex, a8kIdCardInfo.projName, result.lotId, a8kIdCardInfo.color, EachConsumableNum); + cState.littBSGroup[ch] = new LittBSGroup(result.projIndex, a8kIdCardInfo.projName, result.lotId, a8kIdCardInfo.color, AppConstant.CONSUMABLE_NUM); + cState.larBSGroup[ch] = new LarBSGroup(result.projIndex, a8kIdCardInfo.projName, result.lotId, a8kIdCardInfo.color, AppConstant.CONSUMABLE_NUM); } else { throw new RuntimeException("未知的反应流程类型"); } diff --git a/src/main/java/a8k/service/appctrl/MainFlowCtrlService.java b/src/main/java/a8k/service/appctrl/MainFlowCtrlService.java index 30d08cd..58d72fc 100644 --- a/src/main/java/a8k/service/appctrl/MainFlowCtrlService.java +++ b/src/main/java/a8k/service/appctrl/MainFlowCtrlService.java @@ -1,10 +1,10 @@ package a8k.service.appctrl; -import a8k.service.appctrl.action.base.A8kActionStepType; -import a8k.service.appctrl.action.base.A8kStepAction; -import a8k.service.appctrl.action.ctrl.DO_STOP; -import a8k.service.appctrl.scheduler.MainFlowCtrlScheduler; -import a8k.service.appctrl.type.A8kErrorContext; +import a8k.service.appctrl.mainflowctrl.MainFlowCtrlScheduler; +import a8k.service.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.appctrl.mainflowctrl.base.A8kErrorContext; +import a8k.service.appctrl.mainflowctrl.base.A8kStepAction; +import a8k.service.appctrl.mainflowctrl.action.DO_STOP; import a8k.service.appstate.GStateService; import a8k.service.appstate.type.MainFlowCtrlState; import a8k.service.appstate.type.state.A8kWorkState; @@ -40,7 +40,6 @@ public class MainFlowCtrlService { @PostConstruct void init() { - scheduler.regClearErrorProcesser(this::clearErrorcodeBeforeContinueDo); scheduler.regEcodePostProcesser(this::postPorcessA8kEcode); scheduler.regCheckBeforeGuess(this::checkBeforeGuess); diff --git a/src/main/java/a8k/service/appctrl/AppTubeSettingMgrService.java b/src/main/java/a8k/service/appctrl/TubeSettingMgrService.java similarity index 98% rename from src/main/java/a8k/service/appctrl/AppTubeSettingMgrService.java rename to src/main/java/a8k/service/appctrl/TubeSettingMgrService.java index 31cce2a..a68bfef 100644 --- a/src/main/java/a8k/service/appctrl/AppTubeSettingMgrService.java +++ b/src/main/java/a8k/service/appctrl/TubeSettingMgrService.java @@ -22,8 +22,8 @@ import java.util.List; @Component @ExtApiTab(cfg = ExtApiTabConfig.AppTubeSettingMgrService) -public class AppTubeSettingMgrService { - static Logger logger = LoggerFactory.getLogger(AppTubeSettingMgrService.class); +public class TubeSettingMgrService { + static Logger logger = LoggerFactory.getLogger(TubeSettingMgrService.class); static class ORDER { static final int getA8kDeviceCfg = 1; diff --git a/src/main/java/a8k/service/appctrl/CondtionMgrService.java b/src/main/java/a8k/service/appctrl/mainflowctrl/CondtionMgrService.java similarity index 97% rename from src/main/java/a8k/service/appctrl/CondtionMgrService.java rename to src/main/java/a8k/service/appctrl/mainflowctrl/CondtionMgrService.java index 5e589ee..fa9b279 100644 --- a/src/main/java/a8k/service/appctrl/CondtionMgrService.java +++ b/src/main/java/a8k/service/appctrl/mainflowctrl/CondtionMgrService.java @@ -1,4 +1,4 @@ -package a8k.service.appctrl; +package a8k.service.appctrl.mainflowctrl; import a8k.hardware.A8kCanBusService; import a8k.hardware.type.a8kcanprotocol.IOId; @@ -7,10 +7,8 @@ import a8k.service.appstate.IncubationPlateMgrService; import a8k.service.appstate.OptScanModuleStateMgrService; import a8k.service.appstate.type.Tube; import a8k.service.appstate.type.state.A8kWorkState; -import a8k.service.appstate.type.state.IncubationSubTankState; import a8k.service.appstate.type.state.TubeHolderState; import a8k.service.appstate.type.state.TubeState; -import a8k.type.exception.AppException; import jakarta.annotation.Resource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/a8k/service/appctrl/scheduler/MainFlowCtrlScheduler.java b/src/main/java/a8k/service/appctrl/mainflowctrl/MainFlowCtrlScheduler.java similarity index 80% rename from src/main/java/a8k/service/appctrl/scheduler/MainFlowCtrlScheduler.java rename to src/main/java/a8k/service/appctrl/mainflowctrl/MainFlowCtrlScheduler.java index 510c6d4..27e8dd0 100644 --- a/src/main/java/a8k/service/appctrl/scheduler/MainFlowCtrlScheduler.java +++ b/src/main/java/a8k/service/appctrl/mainflowctrl/MainFlowCtrlScheduler.java @@ -1,12 +1,12 @@ -package a8k.service.appctrl.scheduler; +package a8k.service.appctrl.mainflowctrl; import a8k.OS; import a8k.baseservice.appeventbus.AppEventBusService; import a8k.baseservice.appeventbus.appevent.A8kEcodeContextListPromptEvent; import a8k.baseservice.appeventbus.appevent.DoA8kStepActionEvent; -import a8k.service.appctrl.action.base.A8kActionStepType; -import a8k.service.appctrl.action.base.A8kStepAction; -import a8k.service.appctrl.type.*; +import a8k.service.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.appctrl.mainflowctrl.base.A8kErrorContext; +import a8k.service.appctrl.mainflowctrl.base.A8kStepAction; import a8k.service.appstate.GStateService; import a8k.service.appstate.ResourceMgrService; import a8k.service.appstate.type.MainFlowCtrlState; @@ -35,32 +35,19 @@ public class MainFlowCtrlScheduler { void process(List ecodeList); } - @FunctionalInterface - public interface A8kEcodeClearProcesser { - boolean process(List ecodeList) throws AppException; - } - @Resource - GStateService gstate; - - + GStateService gstate; @Resource AppEventBusService ebus; - @Resource ResourceMgrService resourceMgrService; - - MainFlowCtrlState state = null; - - Thread workThread; - ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 5, 0, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<>(10)); - - Runnable checkBeforeGuess; - A8kEcodePostProcesser ecodePostProcesser; - A8kEcodeClearProcesser ecodeClearProcesser; - - List stepActionList = new ArrayList<>(); + MainFlowCtrlState state = null; + Thread workThread; + ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 5, 0, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<>(10)); + Runnable checkBeforeGuess; + A8kEcodePostProcesser ecodePostProcesser; + List stepActionList = new ArrayList<>(); @PostConstruct void init() { @@ -71,10 +58,6 @@ public class MainFlowCtrlScheduler { * Ext */ - public void regClearErrorProcesser(A8kEcodeClearProcesser ecodeClearProcesser) { - this.ecodeClearProcesser = ecodeClearProcesser; - } - public void regEcodePostProcesser(A8kEcodePostProcesser ecodePostProcesser) { this.ecodePostProcesser = ecodePostProcesser; } @@ -145,24 +128,6 @@ public class MainFlowCtrlScheduler { } } -// void clearError() { -// /* -// * 清除错误 -// */ -// clearErrorPendingFlag = false; -// try { -// beforeDoWhat(A8kActionStepType.DO_CLEAR_ERROR); -// boolean suc = ecodeClearProcesser.process(state.ecodeList); -// if (suc) { -// state.ecodeList.clear(); -// state.errorFlag = false; -// } -// } catch (AppException appe) { -// A8kErrorContext context = new A8kErrorContext(A8kActionStepType.DO_CLEAR_ERROR, appe.error); -// a8kEcodePostProcesser(List.of(context)); -// } -// } - List waitAllActionIsDone(List> futureList) { List ecodeList = new ArrayList<>(); diff --git a/src/main/java/a8k/service/appctrl/action/errorhandler/DO_CLEAR_ERROR_BEFORE_WORK.java b/src/main/java/a8k/service/appctrl/mainflowctrl/action/DO_CLEAR_ERROR_BEFORE_WORK.java similarity index 82% rename from src/main/java/a8k/service/appctrl/action/errorhandler/DO_CLEAR_ERROR_BEFORE_WORK.java rename to src/main/java/a8k/service/appctrl/mainflowctrl/action/DO_CLEAR_ERROR_BEFORE_WORK.java index e1a5495..7252930 100644 --- a/src/main/java/a8k/service/appctrl/action/errorhandler/DO_CLEAR_ERROR_BEFORE_WORK.java +++ b/src/main/java/a8k/service/appctrl/mainflowctrl/action/DO_CLEAR_ERROR_BEFORE_WORK.java @@ -1,18 +1,14 @@ -package a8k.service.appctrl.action.errorhandler; +package a8k.service.appctrl.mainflowctrl.action; -import a8k.OS; -import a8k.service.appctrl.CondtionMgrService; -import a8k.service.appctrl.action.base.A8kActionStepType; -import a8k.service.appctrl.action.base.A8kStepAction; +import a8k.service.appctrl.mainflowctrl.CondtionMgrService; +import a8k.service.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.appctrl.mainflowctrl.base.A8kStepAction; import a8k.service.appstate.GStateService; import a8k.service.appstate.IncubationPlateMgrService; import a8k.service.appstate.OptScanModuleStateMgrService; import a8k.service.appstate.resource.A8kPublicResourceType; -import a8k.service.appstate.type.IncubationSubTank; import a8k.service.appstate.type.MainFlowCtrlState; import a8k.service.appstate.type.state.A8kWorkState; -import a8k.service.appstate.type.state.IncubationSubTankState; -import a8k.service.appstate.type.state.TubeState; import a8k.type.exception.AppException; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/appctrl/action/ctrl/DO_PAUSE.java b/src/main/java/a8k/service/appctrl/mainflowctrl/action/DO_PAUSE.java similarity index 85% rename from src/main/java/a8k/service/appctrl/action/ctrl/DO_PAUSE.java rename to src/main/java/a8k/service/appctrl/mainflowctrl/action/DO_PAUSE.java index 235aac3..843d9c8 100644 --- a/src/main/java/a8k/service/appctrl/action/ctrl/DO_PAUSE.java +++ b/src/main/java/a8k/service/appctrl/mainflowctrl/action/DO_PAUSE.java @@ -1,12 +1,11 @@ -package a8k.service.appctrl.action.ctrl; +package a8k.service.appctrl.mainflowctrl.action; -import a8k.service.appctrl.action.base.A8kActionStepType; -import a8k.service.appctrl.action.base.A8kStepAction; +import a8k.service.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.appctrl.mainflowctrl.base.A8kStepAction; import a8k.service.appstate.GStateService; import a8k.service.appstate.resource.A8kPublicResourceType; import a8k.service.appstate.type.MainFlowCtrlState; import a8k.service.appstate.type.state.A8kWorkState; -import a8k.service.devicedriver.ctrl.SampleScanTransportCtrl; import a8k.type.exception.AppException; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/appctrl/action/errorhandler/DO_PROCESS_ERROR_PLATE.java b/src/main/java/a8k/service/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_PLATE.java similarity index 89% rename from src/main/java/a8k/service/appctrl/action/errorhandler/DO_PROCESS_ERROR_PLATE.java rename to src/main/java/a8k/service/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_PLATE.java index d8b635f..8605cc3 100644 --- a/src/main/java/a8k/service/appctrl/action/errorhandler/DO_PROCESS_ERROR_PLATE.java +++ b/src/main/java/a8k/service/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_PLATE.java @@ -1,16 +1,15 @@ -package a8k.service.appctrl.action.errorhandler; +package a8k.service.appctrl.mainflowctrl.action; import a8k.OS; -import a8k.service.appctrl.CondtionMgrService; -import a8k.service.appctrl.action.base.A8kActionStepType; -import a8k.service.appctrl.action.base.A8kStepAction; +import a8k.service.appctrl.mainflowctrl.CondtionMgrService; +import a8k.service.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.appctrl.mainflowctrl.base.A8kStepAction; import a8k.service.appstate.GStateService; import a8k.service.appstate.IncubationPlateMgrService; import a8k.service.appstate.OptScanModuleStateMgrService; import a8k.service.appstate.resource.A8kPublicResourceType; import a8k.service.appstate.type.IncubationSubTank; import a8k.service.appstate.type.MainFlowCtrlState; -import a8k.service.appstate.type.state.A8kWorkState; import a8k.service.appstate.type.state.IncubationSubTankState; import a8k.type.exception.AppException; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/service/appctrl/action/errorhandler/DO_PROCESS_ERROR_TUBE.java b/src/main/java/a8k/service/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_TUBE.java similarity index 89% rename from src/main/java/a8k/service/appctrl/action/errorhandler/DO_PROCESS_ERROR_TUBE.java rename to src/main/java/a8k/service/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_TUBE.java index 90baf71..916b967 100644 --- a/src/main/java/a8k/service/appctrl/action/errorhandler/DO_PROCESS_ERROR_TUBE.java +++ b/src/main/java/a8k/service/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_TUBE.java @@ -1,9 +1,9 @@ -package a8k.service.appctrl.action.errorhandler; +package a8k.service.appctrl.mainflowctrl.action; import a8k.OS; -import a8k.service.appctrl.CondtionMgrService; -import a8k.service.appctrl.action.base.A8kActionStepType; -import a8k.service.appctrl.action.base.A8kStepAction; +import a8k.service.appctrl.mainflowctrl.CondtionMgrService; +import a8k.service.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.appctrl.mainflowctrl.base.A8kStepAction; import a8k.service.appstate.GStateService; import a8k.service.appstate.IncubationPlateMgrService; import a8k.service.appstate.OptScanModuleStateMgrService; @@ -11,7 +11,6 @@ import a8k.service.appstate.TubeProcessStateMgrService; import a8k.service.appstate.resource.A8kPublicResourceType; import a8k.service.appstate.type.MainFlowCtrlState; import a8k.service.appstate.type.Tube; -import a8k.service.appstate.type.state.A8kWorkState; import a8k.service.appstate.type.state.TubeState; import a8k.type.exception.AppException; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/service/appctrl/action/ctrl/DO_RESUME.java b/src/main/java/a8k/service/appctrl/mainflowctrl/action/DO_RESUME.java similarity index 87% rename from src/main/java/a8k/service/appctrl/action/ctrl/DO_RESUME.java rename to src/main/java/a8k/service/appctrl/mainflowctrl/action/DO_RESUME.java index 51bf333..259aae0 100644 --- a/src/main/java/a8k/service/appctrl/action/ctrl/DO_RESUME.java +++ b/src/main/java/a8k/service/appctrl/mainflowctrl/action/DO_RESUME.java @@ -1,7 +1,7 @@ -package a8k.service.appctrl.action.ctrl; +package a8k.service.appctrl.mainflowctrl.action; -import a8k.service.appctrl.action.base.A8kActionStepType; -import a8k.service.appctrl.action.base.A8kStepAction; +import a8k.service.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.appctrl.mainflowctrl.base.A8kStepAction; import a8k.service.appstate.GStateService; import a8k.service.appstate.resource.A8kPublicResourceType; import a8k.service.appstate.type.MainFlowCtrlState; diff --git a/src/main/java/a8k/service/appctrl/action/ctrl/DO_START.java b/src/main/java/a8k/service/appctrl/mainflowctrl/action/DO_START.java similarity index 89% rename from src/main/java/a8k/service/appctrl/action/ctrl/DO_START.java rename to src/main/java/a8k/service/appctrl/mainflowctrl/action/DO_START.java index 25d1fad..fe35658 100644 --- a/src/main/java/a8k/service/appctrl/action/ctrl/DO_START.java +++ b/src/main/java/a8k/service/appctrl/mainflowctrl/action/DO_START.java @@ -1,7 +1,7 @@ -package a8k.service.appctrl.action.ctrl; +package a8k.service.appctrl.mainflowctrl.action; -import a8k.service.appctrl.action.base.A8kActionStepType; -import a8k.service.appctrl.action.base.A8kStepAction; +import a8k.service.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.appctrl.mainflowctrl.base.A8kStepAction; import a8k.service.appstate.GStateService; import a8k.service.appstate.resource.A8kPublicResourceType; import a8k.service.appstate.type.MainFlowCtrlState; diff --git a/src/main/java/a8k/service/appctrl/action/ctrl/DO_STOP.java b/src/main/java/a8k/service/appctrl/mainflowctrl/action/DO_STOP.java similarity index 87% rename from src/main/java/a8k/service/appctrl/action/ctrl/DO_STOP.java rename to src/main/java/a8k/service/appctrl/mainflowctrl/action/DO_STOP.java index d203e0e..a274cfe 100644 --- a/src/main/java/a8k/service/appctrl/action/ctrl/DO_STOP.java +++ b/src/main/java/a8k/service/appctrl/mainflowctrl/action/DO_STOP.java @@ -1,7 +1,7 @@ -package a8k.service.appctrl.action.ctrl; +package a8k.service.appctrl.mainflowctrl.action; -import a8k.service.appctrl.action.base.A8kActionStepType; -import a8k.service.appctrl.action.base.A8kStepAction; +import a8k.service.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.appctrl.mainflowctrl.base.A8kStepAction; import a8k.service.appstate.GStateService; import a8k.service.appstate.resource.A8kPublicResourceType; import a8k.service.appstate.type.MainFlowCtrlState; diff --git a/src/main/java/a8k/service/appctrl/action/opt/PLATE_OPT_SCAN.java b/src/main/java/a8k/service/appctrl/mainflowctrl/action/PLATE_OPT_SCAN.java similarity index 85% rename from src/main/java/a8k/service/appctrl/action/opt/PLATE_OPT_SCAN.java rename to src/main/java/a8k/service/appctrl/mainflowctrl/action/PLATE_OPT_SCAN.java index efc5696..87f0a6b 100644 --- a/src/main/java/a8k/service/appctrl/action/opt/PLATE_OPT_SCAN.java +++ b/src/main/java/a8k/service/appctrl/mainflowctrl/action/PLATE_OPT_SCAN.java @@ -1,19 +1,15 @@ -package a8k.service.appctrl.action.opt; +package a8k.service.appctrl.mainflowctrl.action; -import a8k.OS; -import a8k.dbservice.type.ReactionResultRecord; -import a8k.service.appctrl.CondtionMgrService; -import a8k.service.appctrl.action.base.A8kActionStepType; -import a8k.service.appctrl.action.base.A8kStepAction; +import a8k.service.appctrl.mainflowctrl.CondtionMgrService; +import a8k.service.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.appctrl.mainflowctrl.base.A8kStepAction; import a8k.service.appdata.AppReactionResultMgrService; import a8k.service.appstate.GStateService; import a8k.service.appstate.IncubationPlateMgrService; import a8k.service.appstate.OptScanModuleStateMgrService; import a8k.service.appstate.TubeProcessStateMgrService; import a8k.service.appstate.resource.A8kPublicResourceType; -import a8k.service.appstate.type.IncubationSubTank; import a8k.service.appstate.type.MainFlowCtrlState; -import a8k.service.appstate.type.state.IncubationSubTankState; import a8k.type.ReactionResult; import a8k.type.exception.AppException; import a8k.type.reaction_result_type.ReactionResultStatus; diff --git a/src/main/java/a8k/service/appctrl/action/incubate/PROCESS_INCUBATE_COMPLETED_PLATE.java b/src/main/java/a8k/service/appctrl/mainflowctrl/action/PROCESS_INCUBATE_COMPLETED_PLATE.java similarity index 88% rename from src/main/java/a8k/service/appctrl/action/incubate/PROCESS_INCUBATE_COMPLETED_PLATE.java rename to src/main/java/a8k/service/appctrl/mainflowctrl/action/PROCESS_INCUBATE_COMPLETED_PLATE.java index 7f070d5..e718e10 100644 --- a/src/main/java/a8k/service/appctrl/action/incubate/PROCESS_INCUBATE_COMPLETED_PLATE.java +++ b/src/main/java/a8k/service/appctrl/mainflowctrl/action/PROCESS_INCUBATE_COMPLETED_PLATE.java @@ -1,9 +1,9 @@ -package a8k.service.appctrl.action.incubate; +package a8k.service.appctrl.mainflowctrl.action; import a8k.OS; -import a8k.service.appctrl.CondtionMgrService; -import a8k.service.appctrl.action.base.A8kActionStepType; -import a8k.service.appctrl.action.base.A8kStepAction; +import a8k.service.appctrl.mainflowctrl.CondtionMgrService; +import a8k.service.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.appctrl.mainflowctrl.base.A8kStepAction; import a8k.service.appstate.GStateService; import a8k.service.appstate.IncubationPlateMgrService; import a8k.service.appstate.OptScanModuleStateMgrService; @@ -11,9 +11,7 @@ import a8k.service.appstate.TubeProcessStateMgrService; import a8k.service.appstate.resource.A8kPublicResourceType; import a8k.service.appstate.type.IncubationSubTank; import a8k.service.appstate.type.MainFlowCtrlState; -import a8k.service.appstate.type.Tube; import a8k.service.appstate.type.state.IncubationSubTankState; -import a8k.service.appstate.type.state.TubeState; import a8k.type.exception.AppException; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/appctrl/action/mainflow/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java b/src/main/java/a8k/service/appctrl/mainflowctrl/action/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java similarity index 92% rename from src/main/java/a8k/service/appctrl/action/mainflow/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java rename to src/main/java/a8k/service/appctrl/mainflowctrl/action/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java index eee8b55..1ecd313 100644 --- a/src/main/java/a8k/service/appctrl/action/mainflow/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java +++ b/src/main/java/a8k/service/appctrl/mainflowctrl/action/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java @@ -1,13 +1,13 @@ -package a8k.service.appctrl.action.mainflow; +package a8k.service.appctrl.mainflowctrl.action; import a8k.baseservice.appeventbus.AppEventBusService; import a8k.baseservice.appeventbus.appevent.AppWarningNotifyEvent; import a8k.hardware.A8kCanBusService; import a8k.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.service.appctrl.CondtionMgrService; -import a8k.service.appctrl.AppTubeSettingMgrService; -import a8k.service.appctrl.action.base.A8kActionStepType; -import a8k.service.appctrl.action.base.A8kStepAction; +import a8k.service.appctrl.mainflowctrl.CondtionMgrService; +import a8k.service.appctrl.TubeSettingMgrService; +import a8k.service.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.appctrl.mainflowctrl.base.A8kStepAction; import a8k.service.appstate.GStateService; import a8k.service.appstate.TubeProcessContextMgrService; import a8k.service.appstate.resource.A8kPublicResourceType; @@ -69,7 +69,7 @@ public class SEQ1_ENTER_TUBEHOLDER_AND_SCAN extends A8kStepAction { @Resource A8kCanBusService canBus; @Resource - AppTubeSettingMgrService appTubeSettingMgrService; + TubeSettingMgrService tubeSettingMgrService; @Resource TubeProcessContextMgrService tubeProcessContextMgrService; @@ -128,7 +128,7 @@ public class SEQ1_ENTER_TUBEHOLDER_AND_SCAN extends A8kStepAction { TubeHolder parseScanResult(SampleScanResult scanResult) throws AppException { TubeHolder state = new TubeHolder(); - TubeHolderSetting setting = appTubeSettingMgrService.getThelastActiveTubeHolderSettingAndLock(); + TubeHolderSetting setting = tubeSettingMgrService.getThelastActiveTubeHolderSettingAndLock(); try { //获取试管架类型 A8kTubeHolderType tubeHolderType = A8kTubeHolderType.of(scanResult.tubeHolderType); @@ -184,12 +184,12 @@ public class SEQ1_ENTER_TUBEHOLDER_AND_SCAN extends A8kStepAction { //设置试管架状态 state.state = TubeHolderState.PROCESSING; //删除之前的试管架配置 - appTubeSettingMgrService.removeTubeHolderSetting(setting); + tubeSettingMgrService.removeTubeHolderSetting(setting); return state; } catch (AppException e) { //回滚部分状态 - appTubeSettingMgrService.removeTubeHolderSetting(setting); + tubeSettingMgrService.removeTubeHolderSetting(setting); throw e; } } diff --git a/src/main/java/a8k/service/appctrl/action/mainflow/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java b/src/main/java/a8k/service/appctrl/mainflowctrl/action/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java similarity index 92% rename from src/main/java/a8k/service/appctrl/action/mainflow/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java rename to src/main/java/a8k/service/appctrl/mainflowctrl/action/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java index 48bfebf..3654d2e 100644 --- a/src/main/java/a8k/service/appctrl/action/mainflow/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java +++ b/src/main/java/a8k/service/appctrl/mainflowctrl/action/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java @@ -1,8 +1,8 @@ -package a8k.service.appctrl.action.mainflow; +package a8k.service.appctrl.mainflowctrl.action; -import a8k.service.appctrl.CondtionMgrService; -import a8k.service.appctrl.action.base.A8kActionStepType; -import a8k.service.appctrl.action.base.A8kStepAction; +import a8k.service.appctrl.mainflowctrl.CondtionMgrService; +import a8k.service.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.appctrl.mainflowctrl.base.A8kStepAction; import a8k.service.appstate.*; import a8k.service.appstate.resource.A8kPublicResourceType; import a8k.service.appstate.type.MainFlowCtrlState; diff --git a/src/main/java/a8k/service/appctrl/action/mainflow/SEQ3_APPLAY_RESOURCE.java b/src/main/java/a8k/service/appctrl/mainflowctrl/action/SEQ3_APPLAY_RESOURCE.java similarity index 94% rename from src/main/java/a8k/service/appctrl/action/mainflow/SEQ3_APPLAY_RESOURCE.java rename to src/main/java/a8k/service/appctrl/mainflowctrl/action/SEQ3_APPLAY_RESOURCE.java index 32d3be6..cc1e803 100644 --- a/src/main/java/a8k/service/appctrl/action/mainflow/SEQ3_APPLAY_RESOURCE.java +++ b/src/main/java/a8k/service/appctrl/mainflowctrl/action/SEQ3_APPLAY_RESOURCE.java @@ -1,11 +1,11 @@ -package a8k.service.appctrl.action.mainflow; +package a8k.service.appctrl.mainflowctrl.action; import a8k.baseservice.AppExceptionBuilder; import a8k.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.service.appctrl.CondtionMgrService; +import a8k.service.appctrl.mainflowctrl.CondtionMgrService; import a8k.service.appdata.AppProjInfoMgrService; -import a8k.service.appctrl.action.base.A8kActionStepType; -import a8k.service.appctrl.action.base.A8kStepAction; +import a8k.service.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.appctrl.mainflowctrl.base.A8kStepAction; import a8k.service.appstate.*; import a8k.service.appstate.resource.A8kPublicResourceType; import a8k.service.appstate.type.MainFlowCtrlState; diff --git a/src/main/java/a8k/service/appctrl/action/mainflow/SEQ4_PRE_PROCESS.java b/src/main/java/a8k/service/appctrl/mainflowctrl/action/SEQ4_PRE_PROCESS.java similarity index 96% rename from src/main/java/a8k/service/appctrl/action/mainflow/SEQ4_PRE_PROCESS.java rename to src/main/java/a8k/service/appctrl/mainflowctrl/action/SEQ4_PRE_PROCESS.java index a9986fc..8911d4f 100644 --- a/src/main/java/a8k/service/appctrl/action/mainflow/SEQ4_PRE_PROCESS.java +++ b/src/main/java/a8k/service/appctrl/mainflowctrl/action/SEQ4_PRE_PROCESS.java @@ -1,12 +1,12 @@ -package a8k.service.appctrl.action.mainflow; +package a8k.service.appctrl.mainflowctrl.action; import a8k.OS; -import a8k.service.appctrl.CondtionMgrService; +import a8k.service.appctrl.mainflowctrl.CondtionMgrService; import a8k.service.appdata.AppProjInfoMgrService; import a8k.baseservice.AppExceptionBuilder; import a8k.baseservice.appeventbus.AppEventBusService; -import a8k.service.appctrl.action.base.A8kActionStepType; -import a8k.service.appctrl.action.base.A8kStepAction; +import a8k.service.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.appctrl.mainflowctrl.base.A8kStepAction; import a8k.service.appstate.*; import a8k.service.appstate.resource.A8kPublicResourceType; import a8k.service.appstate.type.Tube; diff --git a/src/main/java/a8k/service/appctrl/action/mainflow/SEQ5_PROCESS.java b/src/main/java/a8k/service/appctrl/mainflowctrl/action/SEQ5_PROCESS.java similarity index 89% rename from src/main/java/a8k/service/appctrl/action/mainflow/SEQ5_PROCESS.java rename to src/main/java/a8k/service/appctrl/mainflowctrl/action/SEQ5_PROCESS.java index aa7b41b..e511dbb 100644 --- a/src/main/java/a8k/service/appctrl/action/mainflow/SEQ5_PROCESS.java +++ b/src/main/java/a8k/service/appctrl/mainflowctrl/action/SEQ5_PROCESS.java @@ -1,10 +1,10 @@ -package a8k.service.appctrl.action.mainflow; +package a8k.service.appctrl.mainflowctrl.action; import a8k.OS; import a8k.baseservice.AppExceptionBuilder; -import a8k.service.appctrl.CondtionMgrService; -import a8k.service.appctrl.action.base.A8kActionStepType; -import a8k.service.appctrl.action.base.A8kStepAction; +import a8k.service.appctrl.mainflowctrl.CondtionMgrService; +import a8k.service.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.appctrl.mainflowctrl.base.A8kStepAction; import a8k.service.appstate.*; import a8k.service.appstate.resource.A8kPublicResourceType; import a8k.service.appstate.type.MainFlowCtrlState; diff --git a/src/main/java/a8k/service/appctrl/action/mainflow/SEQ6_POST_PROCESS.java b/src/main/java/a8k/service/appctrl/mainflowctrl/action/SEQ6_POST_PROCESS.java similarity index 89% rename from src/main/java/a8k/service/appctrl/action/mainflow/SEQ6_POST_PROCESS.java rename to src/main/java/a8k/service/appctrl/mainflowctrl/action/SEQ6_POST_PROCESS.java index 74b8733..ac4d5c7 100644 --- a/src/main/java/a8k/service/appctrl/action/mainflow/SEQ6_POST_PROCESS.java +++ b/src/main/java/a8k/service/appctrl/mainflowctrl/action/SEQ6_POST_PROCESS.java @@ -1,10 +1,10 @@ -package a8k.service.appctrl.action.mainflow; +package a8k.service.appctrl.mainflowctrl.action; import a8k.OS; import a8k.baseservice.AppExceptionBuilder; -import a8k.service.appctrl.CondtionMgrService; -import a8k.service.appctrl.action.base.A8kActionStepType; -import a8k.service.appctrl.action.base.A8kStepAction; +import a8k.service.appctrl.mainflowctrl.CondtionMgrService; +import a8k.service.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.appctrl.mainflowctrl.base.A8kStepAction; import a8k.service.appstate.*; import a8k.service.appstate.resource.A8kPublicResourceType; import a8k.service.appstate.type.MainFlowCtrlState; diff --git a/src/main/java/a8k/service/appctrl/action/mainflow/SEQ7_EJECT_TUBEHOLDER.java b/src/main/java/a8k/service/appctrl/mainflowctrl/action/SEQ7_EJECT_TUBEHOLDER.java similarity index 87% rename from src/main/java/a8k/service/appctrl/action/mainflow/SEQ7_EJECT_TUBEHOLDER.java rename to src/main/java/a8k/service/appctrl/mainflowctrl/action/SEQ7_EJECT_TUBEHOLDER.java index 22ea511..dee50a9 100644 --- a/src/main/java/a8k/service/appctrl/action/mainflow/SEQ7_EJECT_TUBEHOLDER.java +++ b/src/main/java/a8k/service/appctrl/mainflowctrl/action/SEQ7_EJECT_TUBEHOLDER.java @@ -1,8 +1,8 @@ -package a8k.service.appctrl.action.mainflow; +package a8k.service.appctrl.mainflowctrl.action; -import a8k.service.appctrl.CondtionMgrService; -import a8k.service.appctrl.action.base.A8kActionStepType; -import a8k.service.appctrl.action.base.A8kStepAction; +import a8k.service.appctrl.mainflowctrl.CondtionMgrService; +import a8k.service.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.appctrl.mainflowctrl.base.A8kStepAction; import a8k.service.appstate.GStateService; import a8k.service.appstate.type.MainFlowCtrlState; import a8k.service.appstate.resource.A8kPublicResourceType; diff --git a/src/main/java/a8k/service/appctrl/action/base/A8kActionStepType.java b/src/main/java/a8k/service/appctrl/mainflowctrl/base/A8kActionStepType.java similarity index 92% rename from src/main/java/a8k/service/appctrl/action/base/A8kActionStepType.java rename to src/main/java/a8k/service/appctrl/mainflowctrl/base/A8kActionStepType.java index 7a023e4..ea5c1fd 100644 --- a/src/main/java/a8k/service/appctrl/action/base/A8kActionStepType.java +++ b/src/main/java/a8k/service/appctrl/mainflowctrl/base/A8kActionStepType.java @@ -1,4 +1,4 @@ -package a8k.service.appctrl.action.base; +package a8k.service.appctrl.mainflowctrl.base; public enum A8kActionStepType { DO_START,//启动 diff --git a/src/main/java/a8k/service/appctrl/type/A8kErrorContext.java b/src/main/java/a8k/service/appctrl/mainflowctrl/base/A8kErrorContext.java similarity index 83% rename from src/main/java/a8k/service/appctrl/type/A8kErrorContext.java rename to src/main/java/a8k/service/appctrl/mainflowctrl/base/A8kErrorContext.java index 8cfbbc1..82b4f25 100644 --- a/src/main/java/a8k/service/appctrl/type/A8kErrorContext.java +++ b/src/main/java/a8k/service/appctrl/mainflowctrl/base/A8kErrorContext.java @@ -1,6 +1,5 @@ -package a8k.service.appctrl.type; +package a8k.service.appctrl.mainflowctrl.base; -import a8k.service.appctrl.action.base.A8kActionStepType; import a8k.type.ecode.AppError; public class A8kErrorContext { diff --git a/src/main/java/a8k/service/appctrl/action/base/A8kStepAction.java b/src/main/java/a8k/service/appctrl/mainflowctrl/base/A8kStepAction.java similarity index 93% rename from src/main/java/a8k/service/appctrl/action/base/A8kStepAction.java rename to src/main/java/a8k/service/appctrl/mainflowctrl/base/A8kStepAction.java index c5796af..fce44c1 100644 --- a/src/main/java/a8k/service/appctrl/action/base/A8kStepAction.java +++ b/src/main/java/a8k/service/appctrl/mainflowctrl/base/A8kStepAction.java @@ -1,4 +1,4 @@ -package a8k.service.appctrl.action.base; +package a8k.service.appctrl.mainflowctrl.base; import a8k.service.appstate.resource.A8kPublicResourceType; diff --git a/src/main/java/a8k/service/appctrl/type/app_consumables_mgr_service/ConsumablesScanResult.java b/src/main/java/a8k/service/appctrl/type/app_consumables_mgr_service/ConsumablesScanResult.java deleted file mode 100644 index 04cd498..0000000 --- a/src/main/java/a8k/service/appctrl/type/app_consumables_mgr_service/ConsumablesScanResult.java +++ /dev/null @@ -1,8 +0,0 @@ -package a8k.service.appctrl.type.app_consumables_mgr_service; - -public class ConsumablesScanResult { - public Integer chNum; - public ScanResultState state; - public Integer projIndex; - public String lotId; -} diff --git a/src/main/java/a8k/service/appstate/GStateService.java b/src/main/java/a8k/service/appstate/GStateService.java index 794e1ba..bb93b5e 100644 --- a/src/main/java/a8k/service/appstate/GStateService.java +++ b/src/main/java/a8k/service/appstate/GStateService.java @@ -1,7 +1,7 @@ package a8k.service.appstate; import a8k.constant.AppConstant; -import a8k.service.appctrl.type.app_consumables_mgr_service.ConsumableState; +import a8k.type.consumables.ConsumableState; import a8k.service.appstate.type.*; import a8k.service.appstate.type.state.A8kWorkState; import a8k.service.appstate.type.state.TubeHolderState; diff --git a/src/main/java/a8k/service/appstate/type/MainFlowCtrlState.java b/src/main/java/a8k/service/appstate/type/MainFlowCtrlState.java index 61a8126..45ebdd1 100644 --- a/src/main/java/a8k/service/appstate/type/MainFlowCtrlState.java +++ b/src/main/java/a8k/service/appstate/type/MainFlowCtrlState.java @@ -1,6 +1,6 @@ package a8k.service.appstate.type; -import a8k.service.appctrl.type.A8kErrorContext; +import a8k.service.appctrl.mainflowctrl.base.A8kErrorContext; import a8k.service.appstate.type.state.A8kWorkState; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/a8k/service/appctrl/type/app_consumables_mgr_service/ConsumableState.java b/src/main/java/a8k/type/consumables/ConsumableState.java similarity index 92% rename from src/main/java/a8k/service/appctrl/type/app_consumables_mgr_service/ConsumableState.java rename to src/main/java/a8k/type/consumables/ConsumableState.java index a21b5fb..78ac953 100644 --- a/src/main/java/a8k/service/appctrl/type/app_consumables_mgr_service/ConsumableState.java +++ b/src/main/java/a8k/type/consumables/ConsumableState.java @@ -1,4 +1,4 @@ -package a8k.service.appctrl.type.app_consumables_mgr_service; +package a8k.type.consumables; import java.util.Date; diff --git a/src/main/java/a8k/service/appctrl/type/app_consumables_mgr_service/LarBSGroup.java b/src/main/java/a8k/type/consumables/LarBSGroup.java similarity index 89% rename from src/main/java/a8k/service/appctrl/type/app_consumables_mgr_service/LarBSGroup.java rename to src/main/java/a8k/type/consumables/LarBSGroup.java index 93e984f..6432068 100644 --- a/src/main/java/a8k/service/appctrl/type/app_consumables_mgr_service/LarBSGroup.java +++ b/src/main/java/a8k/type/consumables/LarBSGroup.java @@ -1,4 +1,4 @@ -package a8k.service.appctrl.type.app_consumables_mgr_service; +package a8k.type.consumables; public class LarBSGroup { public Integer projIndex; //项目ID diff --git a/src/main/java/a8k/service/appctrl/type/app_consumables_mgr_service/LittBSGroup.java b/src/main/java/a8k/type/consumables/LittBSGroup.java similarity index 90% rename from src/main/java/a8k/service/appctrl/type/app_consumables_mgr_service/LittBSGroup.java rename to src/main/java/a8k/type/consumables/LittBSGroup.java index 62243bc..af5c9e7 100644 --- a/src/main/java/a8k/service/appctrl/type/app_consumables_mgr_service/LittBSGroup.java +++ b/src/main/java/a8k/type/consumables/LittBSGroup.java @@ -1,4 +1,4 @@ -package a8k.service.appctrl.type.app_consumables_mgr_service; +package a8k.type.consumables; public class LittBSGroup { public Integer projIndex; //项目ID diff --git a/src/main/java/a8k/service/appctrl/type/app_consumables_mgr_service/ReactionPlateGroup.java b/src/main/java/a8k/type/consumables/ReactionPlateGroup.java similarity index 89% rename from src/main/java/a8k/service/appctrl/type/app_consumables_mgr_service/ReactionPlateGroup.java rename to src/main/java/a8k/type/consumables/ReactionPlateGroup.java index 21f19a4..b9997a7 100644 --- a/src/main/java/a8k/service/appctrl/type/app_consumables_mgr_service/ReactionPlateGroup.java +++ b/src/main/java/a8k/type/consumables/ReactionPlateGroup.java @@ -1,4 +1,4 @@ -package a8k.service.appctrl.type.app_consumables_mgr_service; +package a8k.type.consumables; public class ReactionPlateGroup { public Integer projIndex; //项目ID diff --git a/src/main/java/a8k/service/appctrl/type/app_consumables_mgr_service/ScanResultState.java b/src/main/java/a8k/type/consumables/ScanResultState.java similarity index 86% rename from src/main/java/a8k/service/appctrl/type/app_consumables_mgr_service/ScanResultState.java rename to src/main/java/a8k/type/consumables/ScanResultState.java index edcf27f..036a14a 100644 --- a/src/main/java/a8k/service/appctrl/type/app_consumables_mgr_service/ScanResultState.java +++ b/src/main/java/a8k/type/consumables/ScanResultState.java @@ -1,4 +1,4 @@ -package a8k.service.appctrl.type.app_consumables_mgr_service; +package a8k.type.consumables; public enum ScanResultState { PASS, //通过 diff --git a/src/main/java/a8k/service/appctrl/type/app_consumables_mgr_service/Tips.java b/src/main/java/a8k/type/consumables/Tips.java similarity index 53% rename from src/main/java/a8k/service/appctrl/type/app_consumables_mgr_service/Tips.java rename to src/main/java/a8k/type/consumables/Tips.java index fa93c04..3b8c12c 100644 --- a/src/main/java/a8k/service/appctrl/type/app_consumables_mgr_service/Tips.java +++ b/src/main/java/a8k/type/consumables/Tips.java @@ -1,4 +1,4 @@ -package a8k.service.appctrl.type.app_consumables_mgr_service; +package a8k.type.consumables; public class Tips { public Integer tipNum = 0;//剩余可用数量