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> 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 getMaterials(@Valid PackageMaterialSearchQO request) { @@ -663,4 +653,18 @@ public class StructuralPackageControllerService { log.info("批量从MPM系统同步钢构包数据完成"); } + + public List refreshItems(Long id) { + WmsStructuralPackage structuralPackage = packageService.getById(id); + List 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 materialList; -// public List getMaterialList() { -// if (StrUtil.isBlank(materials)) { -// return Collections.emptyList(); -// } -// return JSONUtil.toList(materials, PackageMaterialDTO.class); -// } + public List 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