From f7273277023f3497ac071bf98f556a569cb4dd25 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 17 九月 2026 16:24:10 +0800
Subject: [PATCH] feat(mes): 重构袋码生成与物料分类功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 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..05ba023 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 ====================
@@ -192,21 +213,13 @@
if (CollUtil.isEmpty(list)) {
return Collections.emptyList();
}
- // 1. 鑾峰緱鍏宠仈鏁版嵁锛堣矗浠讳汉銆佸搧绉嶇墿鏂欙級
+ // 1. 鑾峰緱鍏宠仈鏁版嵁锛堣矗浠讳汉锛夛紱鍝佺宸蹭笅娌夊埌琚嬬爜鏁版嵁鍖咃紝鎵规鍒楄〃涓嶅啀灞曠ず
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
convertSet(list, MesProBatchDO::getOwnerUserId));
- Map<Long, MesMdmItemDO> itemMap = mdmItemService.getItemMap(
- convertSet(list, MesProBatchDO::getItemId));
// 2. 鏋勫缓缁撴灉
- return BeanUtils.toBean(list, MesProBatchRespVO.class, vo -> {
- MapUtils.findAndThen(userMap, vo.getOwnerUserId(), user ->
- vo.setOwnerUserName(user.getNickname()));
- MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
- vo.setItemCode(item.getCode());
- vo.setItemName(item.getName());
- vo.setItemSpecification(item.getSpecification());
- });
- });
+ return BeanUtils.toBean(list, MesProBatchRespVO.class, vo ->
+ MapUtils.findAndThen(userMap, vo.getOwnerUserId(), user ->
+ vo.setOwnerUserName(user.getNickname())));
}
private List<MesProBatchWorkerRespVO> buildWorkerRespVOList(List<MesProBatchWorkerDO> workers) {
--
Gitblit v1.9.3