From 251be431ad12399fe4ebce599c353d05dcec7888 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 29 十月 2026 12:28:34 +0800
Subject: [PATCH] feat(mes): 支持追溯二维码解析功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/pallet/MesProPalletController.java | 63 +++++++++++++------------------
1 files changed, 27 insertions(+), 36 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/pallet/MesProPalletController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/pallet/MesProPalletController.java
index 3892fab..698fd59 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/pallet/MesProPalletController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/pallet/MesProPalletController.java
@@ -17,21 +17,22 @@
import cn.iocoder.yudao.module.mes.controller.admin.pro.pallet.vo.MesProPalletPreGenerateRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.pallet.vo.MesProPalletRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.pallet.vo.MesProPalletTraceRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.pallet.vo.MesProPalletUnboundPageReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.bagcode.MesProBagCodeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.batch.MesProBatchDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.pallet.MesProPalletDO;
-import cn.iocoder.yudao.module.mes.framework.qrcode.MesProQrLabelBuilder;
import cn.iocoder.yudao.module.mes.framework.qrcode.QrCodeImageUtils;
-import cn.iocoder.yudao.module.mes.framework.qrcode.QrLabelInfo;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.pro.bagcode.MesProBagCodeService;
import cn.iocoder.yudao.module.mes.service.pro.batch.MesProBatchService;
import cn.iocoder.yudao.module.mes.service.pro.pallet.MesProPalletService;
+import cn.iocoder.yudao.module.mes.service.pro.qrexport.MesProQrLabelAssembler;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
@@ -41,7 +42,6 @@
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -53,7 +53,6 @@
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PRO_PALLET_NOT_EXISTS;
-import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PRO_QR_EXPORT_TOO_MANY;
@Tag(name = "绠＄悊鍚庡彴 - MES 鎵樼洏鐮�")
@RestController
@@ -71,6 +70,8 @@
private MesMdmItemService mdmItemService;
@Resource
private AdminUserApi adminUserApi;
+ @Resource
+ private MesProQrLabelAssembler labelAssembler;
@PostMapping("/batch-create")
@Operation(summary = "鎵归噺鐢熸垚鎵樼洏鐮侊紙涓�娆″綍鍏ユ壒娆＄敓鎴愭寮忔墭鐩樼爜锛�")
@@ -106,10 +107,7 @@
if (CollUtil.isEmpty(list)) {
throw exception(PRO_PALLET_NOT_EXISTS);
}
- if (list.size() > QrCodeImageUtils.MAX_QR_EXPORT) {
- throw exception(PRO_QR_EXPORT_TOO_MANY);
- }
- QrCodeImageUtils.writeZip(response, "鎵樼洏鐮佷簩缁寸爜", buildPalletQrLabels(list));
+ QrCodeImageUtils.writeZip(response, "鎵樼洏鐮佷簩缁寸爜", labelAssembler.buildPalletLabels(list));
}
@DeleteMapping("/delete")
@@ -159,11 +157,26 @@
return success(buildPalletRespVOList(list));
}
- @GetMapping("/unbound-list")
- @Operation(summary = "鑾峰緱鏈粦瀹氭壒娆＄殑涓存椂鎵樼洏鍒楄〃锛堜緵鎵规鏂板/琛ュ綍缁戝畾鎵樼洏涓嬫媺浣跨敤锛�")
+ @GetMapping("/unbound-page")
+ @Operation(summary = "鍒嗛〉鑾峰緱鏈粦瀹氭壒娆＄殑涓存椂鎵樼洏锛堜緵鎵规鏂板/琛ュ綍缁戝畾鎵樼洏涓嬫媺浣跨敤锛�")
+ @Parameters({
+ @Parameter(name = "pageNo", description = "椤电爜锛屼粠 1 寮�濮�", example = "1"),
+ @Parameter(name = "pageSize", description = "姣忛〉鏉℃暟", example = "50"),
+ @Parameter(name = "keyword", description = "鍏抽敭瀛楋細涓存椂鎵樼洏鐮併�佸搧绉嶇紪鐮佹垨鍝佺鍚嶇О", example = "PL-00000001")
+ })
@PreAuthorize("@ss.hasPermission('mes:pro-pallet:query')")
- public CommonResult<List<MesProPalletRespVO>> getUnboundPalletList() {
- List<MesProPalletDO> list = palletService.getUnboundPalletList();
+ public CommonResult<PageResult<MesProPalletRespVO>> getUnboundPalletPage(@Valid MesProPalletUnboundPageReqVO reqVO) {
+ PageResult<MesProPalletDO> pageResult = palletService.getUnboundPalletPage(reqVO);
+ return success(new PageResult<>(buildPalletRespVOList(pageResult.getList()), pageResult.getTotal()));
+ }
+
+ @GetMapping("/bindable-list")
+ @Operation(summary = "鑾峰緱琚嬬爜缁戝畾鎵樼洏鏃跺彲閫夌殑鐩爣鎵樼洏鍒楄〃锛堜复鏃舵墭鐩� + 姝ｅ紡鎵樼洏锛屾帓闄ゅ凡浣滃簾锛�")
+ @Parameter(name = "itemId", description = "琚嬬爜鍝佺缂栧彿锛堝彲閫夛紝鐢ㄤ簬杩囨护闈炲悓鍝佺鎵樼洏锛�", example = "1024")
+ @PreAuthorize("@ss.hasPermission('mes:pro-pallet:query')")
+ public CommonResult<List<MesProPalletRespVO>> getBindablePalletList(
+ @RequestParam(value = "itemId", required = false) Long itemId) {
+ List<MesProPalletDO> list = palletService.getBindablePalletList(itemId);
return success(buildPalletRespVOList(list));
}
@@ -190,10 +203,7 @@
if (CollUtil.isEmpty(list)) {
throw exception(PRO_PALLET_NOT_EXISTS);
}
- if (list.size() > QrCodeImageUtils.MAX_QR_EXPORT) {
- throw exception(PRO_QR_EXPORT_TOO_MANY);
- }
- QrCodeImageUtils.writeZip(response, "鎵樼洏鐮佷簩缁寸爜-" + batchId, buildPalletQrLabels(list));
+ QrCodeImageUtils.writeZip(response, "鎵樼洏鐮佷簩缁寸爜-" + batchId, labelAssembler.buildPalletLabels(list));
}
// ==================== 鎷兼帴 VO ====================
@@ -215,9 +225,7 @@
List<MesProPalletDO> list = palletService.getPalletListByIds(reqVO.getIds()).stream()
.filter(record -> !cn.iocoder.yudao.module.mes.enums.pro.MesProPalletStatusEnum.CANCELED.getStatus().equals(record.getStatus())).toList();
if (CollUtil.isEmpty(list)) throw exception(PRO_PALLET_NOT_EXISTS);
- if (list.size() > QrCodeImageUtils.MAX_QR_EXPORT) throw exception(PRO_QR_EXPORT_TOO_MANY);
- QrCodeImageUtils.writeZip(response, "鎵樼洏涓氬姟浜岀淮鐮�", list.stream()
- .map(MesProQrLabelBuilder::buildPalletBusinessCodeLabel).toList());
+ QrCodeImageUtils.writeZip(response, "鎵樼洏涓氬姟浜岀淮鐮�", labelAssembler.buildPalletBusinessLabels(list));
}
private List<MesProPalletRespVO> buildPalletRespVOList(List<MesProPalletDO> list) {
@@ -275,23 +283,6 @@
return BeanUtils.toBean(list, MesProBagCodeRespVO.class, vo ->
MapUtils.findAndThen(batchMap, vo.getBatchId(), batch ->
vo.setLineCode(batch.getLineCode()).setLineName(batch.getLineName())));
- }
-
- private List<QrLabelInfo> buildPalletQrLabels(List<MesProPalletDO> list) {
- // 鑾峰緱鍏宠仈鏁版嵁锛堟壒娆°�佸搧绉嶃�佽矗浠讳汉锛�
- Map<Long, MesProBatchDO> batchMap = convertMap(
- batchService.getBatchList(convertSet(list, MesProPalletDO::getBatchId)), MesProBatchDO::getId);
- Map<Long, MesMdmItemDO> itemMap = mdmItemService.getItemMap(
- convertSet(batchMap.values(), MesProBatchDO::getItemId));
- Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
- convertSet(batchMap.values(), MesProBatchDO::getOwnerUserId));
- // 鏋勫缓鏍囩
- List<QrLabelInfo> labels = new ArrayList<>(list.size());
- for (MesProPalletDO pallet : list) {
- labels.add(MesProQrLabelBuilder.buildPalletLabel(
- pallet, batchMap.get(pallet.getBatchId()), itemMap, userMap));
- }
- return labels;
}
}
--
Gitblit v1.9.3