From 79fa52f39cb9ca1b3b64c9d3973994b87cecf3ea Mon Sep 17 00:00:00 2001 From: liss <1780094091@qq.com> Date: Mon, 3 Nov 2025 16:30:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E-erp=E7=89=A9=E6=96=99?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3api=EF=BC=8Cpost=E6=94=B9ge?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zt/plat/module/erp/api/ErpExternalApi.java | 7 ++++--- .../com/zt/plat/module/erp/api/ErpExternalApiImpl.java | 6 +++--- .../plat/module/erp/dal/mysql/erp/ErpMaterialMapper.java | 7 +++---- .../plat/module/erp/service/erp/ErpMaterialService.java | 8 +------- .../module/erp/service/erp/ErpMaterialServiceImpl.java | 5 ++--- 5 files changed, 13 insertions(+), 20 deletions(-) diff --git a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpExternalApi.java b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpExternalApi.java index cd2b0f2..304b6d9 100644 --- a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpExternalApi.java +++ b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpExternalApi.java @@ -13,6 +13,7 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; import java.util.HashMap; import java.util.Map; @@ -35,7 +36,7 @@ public interface ErpExternalApi { @Operation(summary = "生产版本数据查询") CommonResult getErpProductiveVersionByFM(@Valid @RequestBody ErpProductiveVersionReqDTO reqDTO); - @PostMapping(PREFIX + "/queryMaterial") - @Operation(summary = "物料数据查询") - CommonResult getErpMaterial(@Valid @RequestBody ErpMaterialDTO reqDTO); + @GetMapping(PREFIX + "/getMaterialUnit") + @Operation(summary = "根据物料编码查询对应计量单位") + CommonResult getMaterialUnit(@RequestParam("downCenterNumber") String downCenterNumber); } diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpExternalApiImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpExternalApiImpl.java index 060aed2..fcf9617 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpExternalApiImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpExternalApiImpl.java @@ -60,8 +60,8 @@ public class ErpExternalApiImpl implements ErpExternalApi { } @Override - public CommonResult getErpMaterial(ErpMaterialDTO reqDTO) { - ErpMaterialDTO dto = erpMaterialService.getErpMaterial(reqDTO); - return success(dto); + public CommonResult getMaterialUnit(String materialNumber) { + String materialUnit = erpMaterialService.getMaterialUnit(materialNumber); + return success(materialUnit); } } diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpMaterialMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpMaterialMapper.java index 91d97c2..44d1a86 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpMaterialMapper.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpMaterialMapper.java @@ -3,7 +3,6 @@ package com.zt.plat.module.erp.dal.mysql.erp; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.zt.plat.module.erp.api.dto.ErpMaterialDTO; import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialPageReqVO; import com.zt.plat.module.erp.dal.dataobject.erp.ErpMaterialDO; import org.apache.ibatis.annotations.Mapper; @@ -43,9 +42,9 @@ public interface ErpMaterialMapper extends BaseMapperX { Integer countByErpMNumbers(List erpMNumber); - default ErpMaterialDO selectOne(ErpMaterialDTO dto) { + default String getMaterialUnit(String downCenterNumber) { return selectOne(new LambdaQueryWrapperX() - .eq(ErpMaterialDO::getDownCenterNumber, dto.getDownCenterNumber()) - .last("limit 1")); + .eq(ErpMaterialDO::getDownCenterNumber, downCenterNumber) + .last("limit 1")).getUnit(); } } \ 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 c54f5ff..7eaff0b 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 @@ -66,11 +66,5 @@ public interface ErpMaterialService { PageResult getErpMaterialPageAndOther(ErpMaterialPageReqVO pageReqVO); - /** - * 获得ERP物料数据 - * - * @param DTO - * @return ERP物料数据 - */ - ErpMaterialDTO getErpMaterial(ErpMaterialDTO DTO); + String getMaterialUnit(String materialNumber); } \ 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 dc22166..94d9c20 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 @@ -177,9 +177,8 @@ public class ErpMaterialServiceImpl implements ErpMaterialService { } @Override - public ErpMaterialDTO getErpMaterial(ErpMaterialDTO DTO) { - ErpMaterialDO erpMaterialDO = erpMaterialMapper.selectOne(DTO); - return BeanUtils.toBean(erpMaterialDO, ErpMaterialDTO.class); + public String getMaterialUnit(String materialNumber) { + return erpMaterialMapper.getMaterialUnit(materialNumber); } @Override