From 60f73d545a3d97f34f7f8cc6de87dd83fe727585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Wed, 31 Dec 2025 15:31:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/erp/ErpMaterialController.java | 10 ++++++++++ .../erp/service/erp/ErpMaterialService.java | 3 +++ .../erp/service/erp/ErpMaterialServiceImpl.java | 16 ++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpMaterialController.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpMaterialController.java index 2c25b78a..31898868 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpMaterialController.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpMaterialController.java @@ -7,6 +7,7 @@ import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.framework.excel.core.util.ExcelUtils; +import com.zt.plat.module.base.api.materialinfomation.dto.MaterialInfomationPageReqDTO; import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialCorrSaveReqVO; import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialPageReqVO; import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialRespVO; @@ -151,4 +152,13 @@ public class ErpMaterialController { List erpMaterial = erpMaterialService.getErpMaterialByMainMaterial(mainMaterialId); return success(BeanUtils.toBean(erpMaterial, ErpMaterialRespVO.class)); } + + //查询物料 + @GetMapping("/api-erp-material") + @Operation(summary = "通过接口查询物料") + @PreAuthorize("@ss.hasPermission('sply:erp-material:query')") + public CommonResult> getErpMaterialByApi(@RequestBody MaterialInfomationPageReqDTO material) { + List erpMaterial = erpMaterialService.getErpMaterialByApi(material); + return success(BeanUtils.toBean(erpMaterial, ErpMaterialRespVO.class)); + } } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialService.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialService.java index ca0cbbf5..12b5b012 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialService.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialService.java @@ -2,6 +2,7 @@ package com.zt.plat.module.erp.service.erp; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; +import com.zt.plat.module.base.api.materialinfomation.dto.MaterialInfomationPageReqDTO; import com.zt.plat.module.erp.api.dto.ErpMaterialDTO; import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialCorrSaveReqVO; import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialPageReqVO; @@ -77,4 +78,6 @@ public interface ErpMaterialService { ErpMaterialDO getErpMaterialById(Long id); List getErpMaterialByMainMaterial(Long mainMaterialId); + + List getErpMaterialByApi( MaterialInfomationPageReqDTO material); } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java index 8316f464..f7e7fbde 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java @@ -12,6 +12,7 @@ import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.module.api.BaseApi; import com.zt.plat.module.api.dto.MaterialOtherDTO; import com.zt.plat.module.base.api.materialinfomation.MaterialInfomationApi; +import com.zt.plat.module.base.api.materialinfomation.dto.MaterialInfomationPageReqDTO; import com.zt.plat.module.base.api.materialinfomation.dto.MaterialInfomationRespDTO; import com.zt.plat.module.erp.api.dto.ErpMaterialDTO; import com.zt.plat.module.erp.controller.admin.erp.vo.*; @@ -276,6 +277,21 @@ public class ErpMaterialServiceImpl implements ErpMaterialService { return erpMaterialDOList; } + @Override + public List getErpMaterialByApi(MaterialInfomationPageReqDTO material) { + CommonResult> materialInfomationPage = materialInfomationApi.getMaterialInfomationPage(material); + List erpMaterialDOList = new ArrayList<>(); + if (materialInfomationPage.getData() != null && materialInfomationPage.getData().getList() != null && !materialInfomationPage.getData().getList().isEmpty()) { + materialInfomationPage.getData().getList().forEach( + materialInfomation -> { + ErpMaterialDO erpMaterialDO = buildErpMaterialDOData(CommonResult.success(materialInfomation)); + erpMaterialDOList.add(erpMaterialDO); + } + ); + } + return erpMaterialDOList; + } + @Override @Transactional @XxlJob("getErpMaterialTask")