From 4e48edc6d1f7ef68571b881595f111c809816775 Mon Sep 17 00:00:00 2001 From: zhongwenkai <3478244299@qq.com> Date: Wed, 15 Jul 2026 11:25:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AEDO?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E4=B8=BB=E9=94=AE=E6=94=B9=E7=94=A8?= =?UTF-8?q?=E9=9B=AA=E8=8A=B1=E7=AE=97=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/dal/dataobject/autocode/AutocodePartDO.java | 2 +- .../erp/dal/dataobject/autocode/AutocodeRecordDO.java | 2 +- .../erp/dal/dataobject/autocode/AutocodeRuleDO.java | 2 +- .../module/infra/dal/dataobject/config/ConfigDO.java | 3 ++- .../admin/printconfig/PrinterConfigController.java | 8 ++++---- .../admin/printconfig/vo/PrinterConfigRespVO.java | 2 +- .../admin/printconfig/vo/PrinterConfigSaveReqVO.java | 2 +- .../mes/dal/dataobject/calholiday/CalHolidayDO.java | 2 +- .../module/mes/dal/dataobject/esopFile/EsopFileDO.java | 2 +- .../mes/dal/dataobject/printconfig/PrinterConfigDO.java | 4 ++-- .../mes/dal/dataobject/printtemplate/PrintTemplateDO.java | 2 +- .../dataobject/processparameter/ProcessParameterDO.java | 3 ++- .../mes/dal/dataobject/processroute/ProcessRouteDO.java | 3 ++- .../dal/dataobject/processroute/ProcessRouteItemDO.java | 3 ++- .../mes/service/printconfig/PrinterConfigService.java | 6 +++--- .../mes/service/printconfig/PrinterConfigServiceImpl.java | 8 ++++---- 16 files changed, 29 insertions(+), 25 deletions(-) diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/autocode/AutocodePartDO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/autocode/AutocodePartDO.java index 672dade34..27b741350 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/autocode/AutocodePartDO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/autocode/AutocodePartDO.java @@ -25,7 +25,7 @@ public class AutocodePartDO extends BaseDO { /** * ID */ - @TableId + @TableId(type = IdType.ASSIGN_ID) private Long id; /** * 规则ID diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/autocode/AutocodeRecordDO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/autocode/AutocodeRecordDO.java index 7a370c13c..0f5ac398a 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/autocode/AutocodeRecordDO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/autocode/AutocodeRecordDO.java @@ -25,7 +25,7 @@ public class AutocodeRecordDO extends BaseDO { /** * ID */ - @TableId + @TableId(type = IdType.ASSIGN_ID) private Long id; /** * 规则ID diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/autocode/AutocodeRuleDO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/autocode/AutocodeRuleDO.java index d0ca70df3..576078064 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/autocode/AutocodeRuleDO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/autocode/AutocodeRuleDO.java @@ -25,7 +25,7 @@ public class AutocodeRuleDO extends BaseDO { /** * ID */ - @TableId + @TableId(type = IdType.ASSIGN_ID) private Long id; /** * 规则编码 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/config/ConfigDO.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/config/ConfigDO.java index 03b677072..a49439cf3 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/config/ConfigDO.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/config/ConfigDO.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.infra.dal.dataobject.config; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.module.infra.enums.config.ConfigTypeEnum; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -24,7 +25,7 @@ public class ConfigDO extends BaseDO { /** * 参数主键 */ - @TableId + @TableId(type = IdType.ASSIGN_ID) private Long id; /** * 参数分类 diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/PrinterConfigController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/PrinterConfigController.java index 4b79dd2ce..761deb687 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/PrinterConfigController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/PrinterConfigController.java @@ -45,8 +45,8 @@ public class PrinterConfigController { @PostMapping("/create") @Operation(summary = "创建打印机配置") @PreAuthorize("@ss.hasPermission('printer:config:create')") - public CommonResult createConfig(@Valid @RequestBody PrinterConfigSaveReqVO createReqVO) { - Integer config = configService.createConfig(createReqVO); + public CommonResult createConfig(@Valid @RequestBody PrinterConfigSaveReqVO createReqVO) { + Long config = configService.createConfig(createReqVO); if(config ==null){ return error(500,"该主机名对应的打印机"); } @@ -65,7 +65,7 @@ public class PrinterConfigController { @Operation(summary = "删除打印机配置") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('printer:config:delete')") - public CommonResult deleteConfig(@RequestParam("id") Integer id) { + public CommonResult deleteConfig(@RequestParam("id") Long id) { configService.deleteConfig(id); return success(true); } @@ -74,7 +74,7 @@ public class PrinterConfigController { @Operation(summary = "获得打印机配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('printer:config:query')") - public CommonResult getConfig(@RequestParam("id") Integer id) { + public CommonResult getConfig(@RequestParam("id") Long id) { PrinterConfigDO config = configService.getConfig(id); return success(BeanUtils.toBean(config, PrinterConfigRespVO.class)); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/vo/PrinterConfigRespVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/vo/PrinterConfigRespVO.java index 1e1a8eec5..62ec32bb0 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/vo/PrinterConfigRespVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/vo/PrinterConfigRespVO.java @@ -17,7 +17,7 @@ public class PrinterConfigRespVO { @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14325") @ExcelProperty("主键ID") - private Integer id; + private Long id; @Schema(description = "主机名（如PACKING-PC-01），不可修改", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") @ExcelProperty("主机名（如PACKING-PC-01），不可修改") diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/vo/PrinterConfigSaveReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/vo/PrinterConfigSaveReqVO.java index 657b6f75c..5ead97bcb 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/vo/PrinterConfigSaveReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/vo/PrinterConfigSaveReqVO.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; public class PrinterConfigSaveReqVO { @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14325") - private Integer id; + private Long id; @Schema(description = "主机名（如PACKING-PC-01），不可修改", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") @NotEmpty(message = "主机名（如PACKING-PC-01），不可修改不能为空") diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/calholiday/CalHolidayDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/calholiday/CalHolidayDO.java index 8797f5993..812552c56 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/calholiday/CalHolidayDO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/calholiday/CalHolidayDO.java @@ -33,7 +33,7 @@ public class CalHolidayDO extends BaseDO { /** * 流水号 */ - @TableId + @TableId(type = IdType.ASSIGN_ID) private Long holidayId; /** * 日期 diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/esopFile/EsopFileDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/esopFile/EsopFileDO.java index f70f6fa36..ed2849b92 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/esopFile/EsopFileDO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/esopFile/EsopFileDO.java @@ -26,7 +26,7 @@ public class EsopFileDO extends BaseDO { /** * id */ - @TableId + @TableId(type = IdType.ASSIGN_ID) private Long id; /** * 配置编号 diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/printconfig/PrinterConfigDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/printconfig/PrinterConfigDO.java index c7ff34b29..ecd9de8e9 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/printconfig/PrinterConfigDO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/printconfig/PrinterConfigDO.java @@ -29,8 +29,8 @@ public class PrinterConfigDO extends BaseDO { /** * 主键ID */ - @TableId - private Integer id; + @TableId(type = IdType.ASSIGN_ID) + private Long id; /** * 主机名（如PACKING-PC-01），不可修改 */ diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/printtemplate/PrintTemplateDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/printtemplate/PrintTemplateDO.java index d95ff131d..9a1aeec66 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/printtemplate/PrintTemplateDO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/printtemplate/PrintTemplateDO.java @@ -25,7 +25,7 @@ public class PrintTemplateDO extends BaseDO { /** * ID */ - @TableId + @TableId(type = IdType.ASSIGN_ID) private Long id; /** * 模板编码 diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/processparameter/ProcessParameterDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/processparameter/ProcessParameterDO.java index 6fb7ed579..c58ebc231 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/processparameter/ProcessParameterDO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/processparameter/ProcessParameterDO.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.mes.dal.dataobject.processparameter; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -22,7 +23,7 @@ public class ProcessParameterDO extends BaseDO { /** * 编号 */ - @TableId + @TableId(type = IdType.ASSIGN_ID) private Long id; /** * 工艺参数编码 diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/processroute/ProcessRouteDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/processroute/ProcessRouteDO.java index 417d9d56c..b77eb10f2 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/processroute/ProcessRouteDO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/processroute/ProcessRouteDO.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.mes.dal.dataobject.processroute; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -22,7 +23,7 @@ public class ProcessRouteDO extends BaseDO { /** * 编号 */ - @TableId + @TableId(type = IdType.ASSIGN_ID) private Long id; /** * 工艺路线编码 diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/processroute/ProcessRouteItemDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/processroute/ProcessRouteItemDO.java index 3bce67593..1480039c4 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/processroute/ProcessRouteItemDO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/processroute/ProcessRouteItemDO.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.mes.dal.dataobject.processroute; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.module.mes.dal.dataobject.processparameter.ProcessParameterDO; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -23,7 +24,7 @@ public class ProcessRouteItemDO extends BaseDO { /** * 编号 */ - @TableId + @TableId(type = IdType.ASSIGN_ID) private Long id; /** * 工艺路线编号 diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/printconfig/PrinterConfigService.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/printconfig/PrinterConfigService.java index b599ce919..ef0c1d8d4 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/printconfig/PrinterConfigService.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/printconfig/PrinterConfigService.java @@ -22,7 +22,7 @@ public interface PrinterConfigService { * @param createReqVO 创建信息 * @return 编号 */ - Integer createConfig(@Valid PrinterConfigSaveReqVO createReqVO); + Long createConfig(@Valid PrinterConfigSaveReqVO createReqVO); /** * 更新打印机配置 @@ -36,7 +36,7 @@ public interface PrinterConfigService { * * @param id 编号 */ - void deleteConfig(Integer id); + void deleteConfig(Long id); /** * 获得打印机配置 @@ -44,7 +44,7 @@ public interface PrinterConfigService { * @param id 编号 * @return 打印机配置 */ - PrinterConfigDO getConfig(Integer id); + PrinterConfigDO getConfig(Long id); /** * 获得打印机配置分页 diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/printconfig/PrinterConfigServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/printconfig/PrinterConfigServiceImpl.java index b5d67a3aa..53cde814d 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/printconfig/PrinterConfigServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/printconfig/PrinterConfigServiceImpl.java @@ -34,7 +34,7 @@ public class PrinterConfigServiceImpl implements PrinterConfigService { @Override @Transactional(rollbackFor = Exception.class) - public Integer createConfig(PrinterConfigSaveReqVO createReqVO) { + public Long createConfig(PrinterConfigSaveReqVO createReqVO) { // 插入 PrinterConfigDO config = BeanUtils.toBean(createReqVO, PrinterConfigDO.class); try { @@ -57,21 +57,21 @@ public class PrinterConfigServiceImpl implements PrinterConfigService { } @Override - public void deleteConfig(Integer id) { + public void deleteConfig(Long id) { // 校验存在 validateConfigExists(id); // 删除 printerConfigMapper.deleteById(id); } - private void validateConfigExists(Integer id) { + private void validateConfigExists(Long id) { if (printerConfigMapper.selectById(id) == null) { throw exception(CONFIG_NOT_EXISTS); } } @Override - public PrinterConfigDO getConfig(Integer id) { + public PrinterConfigDO getConfig(Long id) { return printerConfigMapper.selectById(id); }