From 0a5d44f7b5df0bbb7061f3bc96e2687bf178eeb2 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 7 Mar 2026 19:18:37 +0800 Subject: [PATCH] ✨ feat(mes): 添加条码详情查看功能及相关逻辑 --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/barcode/MesWmBarcodeController.java | 1 + yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/barcode/vo/MesWmBarcodeSaveReqVO.java | 4 ---- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/barcode/MesWmBarcodeServiceImpl.java | 8 ++++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/barcode/MesWmBarcodeController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/barcode/MesWmBarcodeController.java index b569e7f..56a5f09 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/barcode/MesWmBarcodeController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/barcode/MesWmBarcodeController.java @@ -83,6 +83,7 @@ public class MesWmBarcodeController { @Operation(summary = "根据业务对象获取条码信息", description = "前端用于生成条码图片") @Parameter(name = "bizType", description = "业务类型", required = true, example = "102") @Parameter(name = "bizId", description = "业务编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:wm-barcode:query')") public CommonResult getBarcodeByBusiness( @RequestParam("bizType") Integer bizType, @RequestParam("bizId") Long bizId) { diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/barcode/vo/MesWmBarcodeSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/barcode/vo/MesWmBarcodeSaveReqVO.java index 1b417fd..0b548d0 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/barcode/vo/MesWmBarcodeSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/barcode/vo/MesWmBarcodeSaveReqVO.java @@ -15,10 +15,6 @@ public class MesWmBarcodeSaveReqVO { @Schema(description = "条码配置编号", example = "1") private Long configId; - @Schema(description = "条码格式", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotNull(message = "条码格式不能为空") - private Integer format; - @Schema(description = "业务类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "102") @NotNull(message = "业务类型不能为空") private Integer bizType; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/barcode/MesWmBarcodeServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/barcode/MesWmBarcodeServiceImpl.java index da13161..d0a1700 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/barcode/MesWmBarcodeServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/barcode/MesWmBarcodeServiceImpl.java @@ -55,8 +55,8 @@ public class MesWmBarcodeServiceImpl implements MesWmBarcodeService { } // 3. 保存条码记录 - MesWmBarcodeDO barcode = BeanUtils.toBean(createReqVO, MesWmBarcodeDO.class) - .setConfigId(config.getId()).setContent(content).setFormat(config.getFormat()); + MesWmBarcodeDO barcode = BeanUtils.toBean(createReqVO, MesWmBarcodeDO.class).setContent(content) + .setConfigId(config.getId()).setFormat(config.getFormat()); barcodeMapper.insert(barcode); return barcode.getId(); } @@ -165,8 +165,8 @@ public class MesWmBarcodeServiceImpl implements MesWmBarcodeService { // 2. 创建条码记录 MesWmBarcodeSaveReqVO createReqVO = new MesWmBarcodeSaveReqVO() - .setFormat(config.getFormat()).setStatus(CommonStatusEnum.ENABLE.getStatus()) - .setBizType(bizType).setBizId(bizId).setBizCode(bizCode).setBizName(bizName); + .setBizType(bizType).setBizId(bizId).setBizCode(bizCode).setBizName(bizName) + .setStatus(CommonStatusEnum.ENABLE.getStatus()); createBarcode(createReqVO); } -- libgit2 0.21.4