diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/jx/ISxWorkCellTaktCollectPlcCfgService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/jx/ISxWorkCellTaktCollectPlcCfgService.java index 06be411..cc1ca2f 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/jx/ISxWorkCellTaktCollectPlcCfgService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/jx/ISxWorkCellTaktCollectPlcCfgService.java @@ -17,30 +17,30 @@ public interface ISxWorkCellTaktCollectPlcCfgService { /** * 添加MES_松下工位节拍PLC配置 * - * @param mesManageCode 松下工位节拍PLC配置 + * @param workCellTaktCollectPlcCfg 松下工位节拍PLC配置 * @return 插入后的mesManageCode对象 */ @ApiOperation(value = "添加MES_松下工位节拍PLC配置信息", notes = "传入MES_松下工位节拍PLC配置对象") - SxWorkCellTaktCollectPlcCfg insertSxWorkCellTaktCollectPlcCfg(SxWorkCellTaktCollectPlcCfg mesManageCode); + SxWorkCellTaktCollectPlcCfg insertSxWorkCellTaktCollectPlcCfg(SxWorkCellTaktCollectPlcCfg workCellTaktCollectPlcCfg); /** * 更新MES_松下工位节拍PLC配置 * - * @param mesManageCode 松下工位节拍PLC配置 + * @param workCellTaktCollectPlcCfg 松下工位节拍PLC配置 * @param userName 操作人 */ @ApiOperation(value = "更新MES_松下工位节拍PLC配置", notes = "更新MES_松下工位节拍PLC配置") - void updateSxWorkCellTaktCollectPlcCfg(SxWorkCellTaktCollectPlcCfg mesManageCode, String userName); + void updateSxWorkCellTaktCollectPlcCfg(SxWorkCellTaktCollectPlcCfg workCellTaktCollectPlcCfg, String userName); /** * 按条件分页查询MES_松下工位节拍PLC配置信息 * - * @param mesManageCode 松下工位节拍PLC配置 + * @param workCellTaktCollectPlcCfg 松下工位节拍PLC配置 * @param pager 分页条件 * @return 分页数据 */ @ApiOperation(value = "按条件分页查询MES_松下工位节拍PLC配置信息", notes = "按条件分页查询MES_松下工位节拍PLC配置信息") - ListPager querySxWorkCellTaktCollectPlcCfgByPager(SxWorkCellTaktCollectPlcCfg mesManageCode, Pager pager); + ListPager querySxWorkCellTaktCollectPlcCfgByPager(SxWorkCellTaktCollectPlcCfg workCellTaktCollectPlcCfg, Pager pager); /** * 批量软删数据 diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/bean/SxWorkCellTaktCollectPlcCfg.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/bean/SxWorkCellTaktCollectPlcCfg.java index f43557f..2caa3ed 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/bean/SxWorkCellTaktCollectPlcCfg.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/bean/SxWorkCellTaktCollectPlcCfg.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.ext.mes.pojo.bean; +import cn.estsh.i3plus.ext.mes.pojo.util.MesExtEnumUtil; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -48,6 +50,7 @@ public class SxWorkCellTaktCollectPlcCfg extends BaseBean implements Serializabl @Column(name = "STATUS") @ApiParam("状态") + @AnnoOutputColumn(refClass = MesExtEnumUtil.IS_ENABLE.class, refForeignKey = "value", value = "description") private Integer status; @Column(name = "SYSTEM_SYNC_STATUS")