From 8655501ffb8dbdaf2508e575933063e6731be714 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 28 八月 2026 17:14:40 +0800
Subject: [PATCH] refactor(mes): 重构MES生产批次和袋码管理功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java
index 55a450b..6c4830a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.mes.controller.admin.pro.batch;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -10,6 +11,8 @@
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.mes.controller.admin.pro.bagcode.vo.MesProBagCodeRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.batch.vo.MesProBatchPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.batch.vo.MesProBatchPreGenerateReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.batch.vo.MesProBatchPreGenerateRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.batch.vo.MesProBatchRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.batch.vo.MesProBatchSaveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.batch.vo.MesProBatchTraceRespVO;
@@ -75,10 +78,27 @@
private MesProBagCodeService bagCodeService;
@PostMapping("/create")
- @Operation(summary = "鍒涘缓鐢熶骇鎵规锛堣嚜鍔ㄧ敓鎴愭壒娆″彿锛�")
+ @Operation(summary = "鍒涘缓鐢熶骇鎵规锛堜竴娆″綍鍏ヤ笟鍔′俊鎭紝鑷姩鐢熸垚鎵规鍙凤級")
@PreAuthorize("@ss.hasPermission('mes:pro-batch:create')")
public CommonResult<Long> createBatch(@Valid @RequestBody MesProBatchSaveReqVO createReqVO) {
return success(batchService.createBatch(createReqVO));
+ }
+
+ @PostMapping("/pre-generate")
+ @Operation(summary = "棰勭敓鎴愮敓浜ф壒娆′簩缁寸爜锛堜粎鐢熸垚涓存椂鎵规鐮侊紝涓嶅綍鍏ヤ笟鍔′俊鎭級")
+ @PreAuthorize("@ss.hasPermission('mes:pro-batch:create')")
+ public CommonResult<List<MesProBatchPreGenerateRespVO>> preGenerateBatch(
+ @Valid @RequestBody MesProBatchPreGenerateReqVO preGenerateReqVO) {
+ List<MesProBatchDO> list = batchService.preGenerateBatch(preGenerateReqVO);
+ return success(BeanUtils.toBean(list, MesProBatchPreGenerateRespVO.class));
+ }
+
+ @PutMapping("/fill-info")
+ @Operation(summary = "琛ュ綍鐢熶骇鎵规涓氬姟淇℃伅锛堢敓鎴愭寮忔壒娆″彿锛屼粎涓存椂鎵规鍙敤锛�")
+ @PreAuthorize("@ss.hasPermission('mes:pro-batch:update')")
+ public CommonResult<Boolean> fillBatchInfo(@Valid @RequestBody MesProBatchSaveReqVO fillReqVO) {
+ batchService.fillBatchInfo(fillReqVO);
+ return success(true);
}
@PutMapping("/update")
@@ -183,7 +203,8 @@
if (pallets.size() + 1 > QrCodeImageUtils.MAX_QR_EXPORT) {
throw exception(PRO_QR_EXPORT_TOO_MANY);
}
- QrCodeImageUtils.writeZip(response, "鎵规浜岀淮鐮�-" + batch.getCode(), buildBatchQrLabels(batch, pallets));
+ String qrCode = StrUtil.blankToDefault(batch.getCode(), batch.getTempCode());
+ QrCodeImageUtils.writeZip(response, "鎵规浜岀淮鐮�-" + qrCode, buildBatchQrLabels(batch, pallets));
}
// ==================== 鎷兼帴 VO ====================
--
Gitblit v1.9.3