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 | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 511b68e..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,6 +17,7 @@
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;
@@ -31,6 +32,7 @@
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;
@@ -155,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));
}
--
Gitblit v1.9.3