From d314fb46d7f1cc4ecffd33e0e89e6ded41a05c94 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 31 May 2024 16:10:55 +0800 Subject: [PATCH] step --- .../pcn/api/busi/IMesProdRuleCfgExtService.java | 34 +++++++++++----------- .../step/MesAssemblyShowNosortStepService.java | 5 ++-- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProdRuleCfgExtService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProdRuleCfgExtService.java index db9934d..2d5140f 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProdRuleCfgExtService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProdRuleCfgExtService.java @@ -1,17 +1,17 @@ -package cn.estsh.i3plus.ext.mes.pcn.api.busi; - -import cn.estsh.i3plus.pojo.mes.bean.MesProdRuleNosortCfg; -import cn.estsh.i3plus.pojo.mes.bean.MesProdRuleSortCfg; -import io.swagger.annotations.ApiOperation; - -import java.util.List; - -public interface IMesProdRuleCfgExtService { - - @ApiOperation(value = "【非排序线】获取产品加工规则信息") - List getProdRuleNosortCfgList(MesProdRuleNosortCfg prodRuleNosortCfg); - - @ApiOperation(value = "【排序线】获取产品加工规则信息") - List getProdRuleSortCfgList(MesProdRuleSortCfg prodRuleSortCfg); - -} +//package cn.estsh.i3plus.ext.mes.pcn.api.busi; +// +//import cn.estsh.i3plus.pojo.mes.bean.MesProdRuleNosortCfg; +//import cn.estsh.i3plus.pojo.mes.bean.MesProdRuleSortCfg; +//import io.swagger.annotations.ApiOperation; +// +//import java.util.List; +// +//public interface IMesProdRuleCfgExtService { +// +// @ApiOperation(value = "【非排序线】获取产品加工规则信息") +// List getProdRuleNosortCfgList(MesProdRuleNosortCfg prodRuleNosortCfg); +// +// @ApiOperation(value = "【排序线】获取产品加工规则信息") +// List getProdRuleSortCfgList(MesProdRuleSortCfg prodRuleSortCfg); +// +//} diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyShowNosortStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyShowNosortStepService.java index 9e196f8..3aff091 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyShowNosortStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyShowNosortStepService.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesAssemblyExtService; -import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProdRuleCfgExtService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesCellEquipContext; @@ -32,8 +31,8 @@ public class MesAssemblyShowNosortStepService extends BaseStepService { @Autowired private IMesProductionDispatchContextStepService productionDispatchContextStepService; - @Autowired - private IMesProdRuleCfgExtService prodRuleCfgExtService; +// @Autowired +// private IMesProdRuleCfgExtService prodRuleCfgExtService; @Autowired private IMesAssemblyExtService assemblyExtService;