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/bagcode/MesProBagCodeController.java | 74 +++++++++++++++++++++++++++++-------
1 files changed, 59 insertions(+), 15 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/bagcode/MesProBagCodeController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/bagcode/MesProBagCodeController.java
index 61cb109..8e6ca6e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/bagcode/MesProBagCodeController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/bagcode/MesProBagCodeController.java
@@ -9,9 +9,14 @@
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.bagcode.vo.MesProBagCodeBindBatchReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.bagcode.vo.MesProBagCodeBindReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.bagcode.vo.MesProBagCodeGenerateRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.bagcode.vo.MesProBagCodeGenerateReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.bagcode.vo.MesProBagCodePageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.bagcode.vo.MesProBagCodeRawGenerateReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.bagcode.vo.MesProBagCodeReplaceReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.bagcode.vo.MesProBagCodeReplaceRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.bagcode.vo.MesProBagCodeRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.bagcode.vo.MesProBagCodeTraceRespVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
@@ -69,10 +74,26 @@
private MesMdmItemService mdmItemService;
@PostMapping("/generate")
- @Operation(summary = "鐢熸垚琚嬬爜鏁版嵁鍖咃紙涓�琚嬩竴鐮侊級")
+ @Operation(summary = "鐢熸垚琚嬬爜鏁版嵁鍖咃紙涓�琚嬩竴鐮侊級锛岀疮璁¤揪鍒伴槇鍊兼椂鑷姩鐢熸垚鎵樼洏鐮�")
@PreAuthorize("@ss.hasPermission('mes:pro-bag-code:create')")
- public CommonResult<String> generateBagCodes(@Valid @RequestBody MesProBagCodeGenerateReqVO generateReqVO) {
+ public CommonResult<MesProBagCodeGenerateRespVO> generateBagCodes(@Valid @RequestBody MesProBagCodeGenerateReqVO generateReqVO) {
return success(bagCodeService.generateBagCodes(generateReqVO));
+ }
+
+ @PostMapping("/raw-generate")
+ @Operation(summary = "鐢熸垚鍘熷琚嬬爜锛堜粎閫夊搧绉嶄笌琚嬬爜鏁伴噺锛屼笉鍏宠仈璁￠噺鍗曚綅绫诲瀷銆佷笉鐢熸垚鎵樼洏锛�")
+ @PreAuthorize("@ss.hasPermission('mes:pro-bag-code:create')")
+ public CommonResult<MesProBagCodeGenerateRespVO> generateRawBagCodes(
+ @Valid @RequestBody MesProBagCodeRawGenerateReqVO rawGenerateReqVO) {
+ return success(bagCodeService.generateRawBagCodes(rawGenerateReqVO));
+ }
+
+ @PostMapping("/replace")
+ @Operation(summary = "浣滃簾鐮存崯琚嬬爜骞剁敓鎴愮瓑閲忔浛鎹㈣鐮�")
+ @PreAuthorize("@ss.hasPermission('mes:pro-bag-code:replace')")
+ public CommonResult<MesProBagCodeReplaceRespVO> replaceBagCodes(
+ @Valid @RequestBody MesProBagCodeReplaceReqVO replaceReqVO) {
+ return success(bagCodeService.replaceBagCodes(replaceReqVO));
}
@DeleteMapping("/delete-by-uuid")
@@ -81,6 +102,14 @@
@PreAuthorize("@ss.hasPermission('mes:pro-bag-code:delete')")
public CommonResult<Boolean> deleteBagCodesByUuid(@RequestParam("uuid") String uuid) {
bagCodeService.deleteBagCodesByUuid(uuid);
+ return success(true);
+ }
+
+ @PutMapping("/bind-batch")
+ @Operation(summary = "琚嬬爜褰曞叆鐢熶骇鎵规")
+ @PreAuthorize("@ss.hasPermission('mes:pro-bag-code:update')")
+ public CommonResult<Boolean> bindBatch(@Valid @RequestBody MesProBagCodeBindBatchReqVO bindReqVO) {
+ bagCodeService.bindBatch(bindReqVO);
return success(true);
}
@@ -203,6 +232,18 @@
private MesProBagCodeTraceRespVO buildBagCodeTraceRespVO(MesProBagCodeDO bagCode) {
MesProBagCodeTraceRespVO respVO = BeanUtils.toBean(bagCode, MesProBagCodeTraceRespVO.class);
+ var replacement = bagCode.getStatus() != null
+ && bagCode.getStatus().equals(cn.iocoder.yudao.module.mes.enums.pro.MesProBagCodeStatusEnum.CANCELED.getStatus())
+ ? bagCodeService.getReplacementByOldBagCodeId(bagCode.getId())
+ : bagCodeService.getReplacementByNewBagCodeId(bagCode.getId());
+ if (replacement != null) {
+ respVO.setReplacementUuid(replacement.getReplaceUuid());
+ if (bagCode.getId().equals(replacement.getOldBagCodeId())) {
+ respVO.setReplacedByCode(replacement.getNewCode());
+ } else {
+ respVO.setReplacementOfCode(replacement.getOldCode());
+ }
+ }
// 鎵规淇℃伅
MesProBatchDO batch = batchService.getBatch(bagCode.getBatchId());
if (batch != null) {
@@ -210,8 +251,7 @@
.setProduceDate(batch.getProduceDate())
.setLineCode(batch.getLineCode())
.setLineName(batch.getLineName())
- .setOwnerUserId(batch.getOwnerUserId())
- .setItemId(batch.getItemId());
+ .setOwnerUserId(batch.getOwnerUserId());
// 璐ｄ换浜�
if (batch.getOwnerUserId() != null) {
AdminUserRespDTO user = adminUserApi.getUser(batch.getOwnerUserId());
@@ -219,14 +259,17 @@
respVO.setOwnerUserName(user.getNickname());
}
}
- // 鍝佺淇℃伅
- if (batch.getItemId() != null) {
- MesMdmItemDO item = mdmItemService.getItem(batch.getItemId());
- if (item != null) {
- respVO.setItemCode(item.getCode())
- .setItemName(item.getName())
- .setItemSpecification(item.getSpecification());
- }
+ }
+ // 鍝佺淇℃伅锛氫紭鍏堝彇琚嬬爜涓婄殑鍝佺锛堟暟鎹寘鐢熸垚鏃剁粦瀹氾級锛屽巻鍙茶鐮佸洖閫�鎵规鍝佺
+ Long itemId = bagCode.getItemId() != null ? bagCode.getItemId()
+ : (batch == null ? null : batch.getItemId());
+ if (itemId != null) {
+ MesMdmItemDO item = mdmItemService.getItem(itemId);
+ if (item != null) {
+ respVO.setItemId(itemId)
+ .setItemCode(item.getCode())
+ .setItemName(item.getName())
+ .setItemSpecification(item.getSpecification());
}
}
return respVO;
@@ -236,11 +279,12 @@
* 鏋勫缓琚嬬爜浜岀淮鐮佹爣绛惧垪琛紙浜岀淮鐮佺紪鐮佺函鐮佸�硷紝鍥剧墖鍙犲姞鍏抽敭淇℃伅鏂囧瓧锛�
*/
private List<QrLabelInfo> buildBagCodeQrLabels(List<MesProBagCodeDO> list) {
- // 1. 鑾峰緱鍏宠仈鏁版嵁锛堟壒娆°�佸搧绉嶃�佽矗浠讳汉锛�
+ // 1. 鑾峰緱鍏宠仈鏁版嵁锛堟壒娆°�佸搧绉嶃�佽矗浠讳汉锛夛紱鍝佺闆嗗悎鍚鐮佽嚜韬搧绉嶄笌鍘嗗彶鎵规鍝佺
Map<Long, MesProBatchDO> batchMap = convertMap(
batchService.getBatchList(convertSet(list, MesProBagCodeDO::getBatchId)), MesProBatchDO::getId);
- Map<Long, MesMdmItemDO> itemMap = mdmItemService.getItemMap(
- convertSet(batchMap.values(), MesProBatchDO::getItemId));
+ Set<Long> itemIds = convertSet(list, MesProBagCodeDO::getItemId);
+ itemIds.addAll(convertSet(batchMap.values(), MesProBatchDO::getItemId));
+ Map<Long, MesMdmItemDO> itemMap = mdmItemService.getItemMap(itemIds);
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
convertSet(batchMap.values(), MesProBatchDO::getOwnerUserId));
// 2. 鏋勫缓鏍囩
--
Gitblit v1.9.3