From b1724a2dd2bb0ade0ae709a2841f64d40b109141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Sat, 30 May 2026 14:39:35 +0800
Subject: [PATCH] =?UTF-8?q?feat(package):=20=E6=96=B0=E5=A2=9E=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E9=9B=B6=E4=BB=B6=E7=89=88=E6=9C=AC=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=8F=8A=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 结构包控制器添加 refreshItems 接口，支持根据包ID刷新零件版本
- 结构包服务实现中新增 refreshItems 方法，更新零件信息（版本、名称、图号、图片、重量）
- 结构包控制器服务中简化 getInfo 方法，取消材料信息解码和赋值逻辑
- 结构包服务接口 getInfo 返回值取消材料解码，由调用方处理
- PackageVO 类中取消重复定义的 getMaterialList 方法，改用正式实现版本
---
 .../StructuralPackageController.java          |  9 +++++++
 .../StructuralPackageControllerService.java   | 26 +++++++++++--------
 .../nflg/wms/common/pojo/vo/PackageVO.java    | 12 ++++-----
 .../impl/WmsStructuralPackageServiceImpl.java |  4 +--
 4 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageController.java
index 332d52ce..d016f1e9 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageController.java
@@ -88,6 +88,15 @@ public class StructuralPackageController extends BaseController {
         return ApiResult.success(packageControllerService.getInfo(id));
     }
 
+    /**
+     * 刷新零件版本
+     * @param id 包ID
+     */
+    @GetMapping("/refreshItems")
+    public ApiResult<List<PackageMaterialDTO>> refreshItems(@Valid @RequestParam @NotNull Long id){
+        return ApiResult.success(packageControllerService.refreshItems(id));
+    }
+
     /**
      * 获取老鼠图
      * @param request 搜索参数
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java
index 60187304..2feaa229 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java
@@ -173,17 +173,7 @@ public class StructuralPackageControllerService {
     }
 
     public PackageVO getInfo(@Valid @NotNull Long id) {
-        PackageVO vo = packageService.getInfo(id);
-        vo.setMaterialList(JSONUtil.toList(vo.getMaterials(), PackageMaterialDTO.class));
-        vo.getMaterialList().forEach(it -> {
-            WmsMaterial material = materialService.getCurrent(it.getNo());
-            it.setVersion(material.getVersion());
-            it.setName(material.getDescribe());
-            it.setDrawingNo(material.getDrawingNo());
-            it.setImage(material.getImage());
-            it.setWeight(material.getWeight());
-        });
-        return vo;
+        return packageService.getInfo(id);
     }
 
     public PageData<PackageMaterialDTO> getMaterials(@Valid PackageMaterialSearchQO request) {
@@ -663,4 +653,18 @@ public class StructuralPackageControllerService {
 
         log.info("批量从MPM系统同步钢构包数据完成");
     }
+
+    public List<PackageMaterialDTO> refreshItems(Long id) {
+        WmsStructuralPackage structuralPackage = packageService.getById(id);
+        List<PackageMaterialDTO> items = JSONUtil.toList(structuralPackage.getMaterials(), PackageMaterialDTO.class);
+        items.forEach(it -> {
+            WmsMaterial material = materialService.getCurrent(it.getNo());
+            it.setVersion(material.getVersion());
+            it.setName(material.getDescribe());
+            it.setDrawingNo(material.getDrawingNo());
+            it.setImage(material.getImage());
+            it.setWeight(material.getWeight());
+        });
+        return items;
+    }
 }
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PackageVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PackageVO.java
index 671ff58d..68f2bb20 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PackageVO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PackageVO.java
@@ -124,12 +124,12 @@ public class PackageVO {
      */
     private List<PackageMaterialDTO> materialList;
 
-//    public List<PackageMaterialDTO> getMaterialList() {
-//        if (StrUtil.isBlank(materials)) {
-//            return Collections.emptyList();
-//        }
-//        return JSONUtil.toList(materials, PackageMaterialDTO.class);
-//    }
+    public List<PackageMaterialDTO> getMaterialList() {
+        if (StrUtil.isBlank(materials)) {
+            return Collections.emptyList();
+        }
+        return JSONUtil.toList(materials, PackageMaterialDTO.class);
+    }
 
     /**
      * 供应商名称
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageServiceImpl.java
index 2934a054..cb4b1a38 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageServiceImpl.java
@@ -97,9 +97,7 @@ public class WmsStructuralPackageServiceImpl extends ServiceImpl<WmsStructuralPa
 
     @Override
     public PackageVO getInfo(Long id) {
-        PackageVO vo = baseMapper.getInfo(id);
-        vo.setMaterialList(JSONUtil.toList(vo.getMaterials(), PackageMaterialDTO.class));
-        return vo;
+        return baseMapper.getInfo(id);
     }
 
     @Override