diff --git a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/BaseApi.java b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/BaseApi.java index e43bc89..95f2e30 100644 --- a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/BaseApi.java +++ b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/BaseApi.java @@ -1,11 +1,10 @@ package com.zt.plat.module.api; -import com.zt.plat.framework.common.pojo.CommonResult; -import com.zt.plat.module.api.dto.AccountRespDto; +import com.zt.plat.module.api.dto.AccountDTO; +import com.zt.plat.module.api.dto.MaterialOtherDTO; import com.zt.plat.module.base.enums.ApiConstants; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; @@ -17,7 +16,11 @@ public interface BaseApi { String PREFIX = ApiConstants.PREFIX + "/base"; - @GetMapping(PREFIX + "/getNoPage") - @Operation(summary = "数据查询") - List getNoPage(@Valid AccountRespDto respVO); + @GetMapping(PREFIX + "/getAccountNoPage") + @Operation(summary = "账户条款数据不分页查询") + List getAccountNoPage(AccountDTO respVO); + + @GetMapping(PREFIX + "/getMaterialOtherNoPage") + @Operation(summary = "物料拓展关系数据不分页查询") + List getMaterialOtherNoPage(MaterialOtherDTO respVO); } diff --git a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/dto/AccountRespDto.java b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/dto/AccountDTO.java similarity index 94% rename from zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/dto/AccountRespDto.java rename to zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/dto/AccountDTO.java index 00c43af..b013489 100644 --- a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/dto/AccountRespDto.java +++ b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/dto/AccountDTO.java @@ -7,7 +7,7 @@ import java.time.LocalDateTime; @Schema(description = "RPC 服务 DTO") @Data -public class AccountRespDto { +public class AccountDTO { private Long id; private String type; diff --git a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/dto/MaterialOtherDTO.java b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/dto/MaterialOtherDTO.java new file mode 100644 index 0000000..6e7e024 --- /dev/null +++ b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/dto/MaterialOtherDTO.java @@ -0,0 +1,53 @@ +package com.zt.plat.module.api.dto; + +import com.zt.plat.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 物料拓展数据分页 Request VO") +@Data +public class MaterialOtherDTO extends PageParam { + + @Schema(description = "物料编码") + private String materialNumber; + + @Schema(description = "物料名称", example = "王五") + private String materialName; + + @Schema(description = "ERP物料编码") + private String erpMaterialNumber; + + @Schema(description = "ERP物料名称", example = "李四") + private String erpMaterialName; + + @Schema(description = "ERP物料计量单位") + private String unit; + + @Schema(description = "金属元素缩写") + private String abbreviation; + + @Schema(description = "金属元素名称", example = "赵六") + private String name; + + @Schema(description = "金属元素编码") + private String coding; + + @Schema(description = "品位单位") + private String gradeUnit; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "小数位数") + private Long decimalValue; + + @Schema(description = "是否启用") + private String isEnable; + +} \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/api/BaseApiImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/api/BaseApiImpl.java index b3cf9d8..62591c3 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/api/BaseApiImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/api/BaseApiImpl.java @@ -1,10 +1,10 @@ package com.zt.plat.module.base.api; -import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.module.api.BaseApi; -import com.zt.plat.module.api.dto.AccountRespDto; -import com.zt.plat.module.base.dal.dataobject.base.AccountDO; +import com.zt.plat.module.api.dto.AccountDTO; +import com.zt.plat.module.api.dto.MaterialOtherDTO; import com.zt.plat.module.base.service.base.AccountService; +import com.zt.plat.module.base.service.base.MaterialOtherService; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -24,8 +24,16 @@ public class BaseApiImpl implements BaseApi { @Resource private AccountService accountService; + @Resource + private MaterialOtherService materialOtherService; + @Override - public List getNoPage(AccountRespDto respVO) { + public List getAccountNoPage(AccountDTO respVO) { return accountService.getAccountNoPage(respVO); } + + @Override + public List getMaterialOtherNoPage(MaterialOtherDTO respVO) { + return materialOtherService.getMaterialOtherNoPage(respVO); + } } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java index 93a5de8..ec0d30b 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java @@ -3,9 +3,8 @@ package com.zt.plat.module.base.dal.mysql.base; 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.api.dto.AccountRespDto; +import com.zt.plat.module.api.dto.AccountDTO; import com.zt.plat.module.base.controller.admin.base.vo.AccountPageReqVO; -import com.zt.plat.module.base.controller.admin.base.vo.AccountRespVO; import com.zt.plat.module.base.dal.dataobject.base.AccountDO; import org.apache.ibatis.annotations.Mapper; @@ -35,18 +34,18 @@ public interface AccountMapper extends BaseMapperX { .orderByDesc(AccountDO::getId)); } - default List selectNoPage(AccountRespDto reqVO){ + default List selectNoPage(AccountDTO dto){ return selectList(new LambdaQueryWrapperX() - .eqIfPresent(AccountDO::getType, reqVO.getType()) - .likeIfPresent(AccountDO::getAccountName, reqVO.getAccountName()) - .likeIfPresent(AccountDO::getAddress, reqVO.getAddress()) - .likeIfPresent(AccountDO::getPhone, reqVO.getPhone()) - .eqIfPresent(AccountDO::getBankAccount, reqVO.getBankAccount()) - .eqIfPresent(AccountDO::getCustomerName, reqVO.getCustomerName()) - .eqIfPresent(AccountDO::getCustomerNumber, reqVO.getCustomerNumber()) - .eqIfPresent(AccountDO::getIsEnable, reqVO.getIsEnable()) - .eqIfPresent(AccountDO::getAccountNumber, reqVO.getAccountNumber()) - .eqIfPresent(AccountDO::getTaxNumber, reqVO.getTaxNumber()) + .eqIfPresent(AccountDO::getType, dto.getType()) + .likeIfPresent(AccountDO::getAccountName, dto.getAccountName()) + .likeIfPresent(AccountDO::getAddress, dto.getAddress()) + .likeIfPresent(AccountDO::getPhone, dto.getPhone()) + .eqIfPresent(AccountDO::getBankAccount, dto.getBankAccount()) + .eqIfPresent(AccountDO::getCustomerName, dto.getCustomerName()) + .eqIfPresent(AccountDO::getCustomerNumber, dto.getCustomerNumber()) + .eqIfPresent(AccountDO::getIsEnable, dto.getIsEnable()) + .eqIfPresent(AccountDO::getAccountNumber, dto.getAccountNumber()) + .eqIfPresent(AccountDO::getTaxNumber, dto.getTaxNumber()) .orderByDesc(AccountDO::getId)); } } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java index 3064d3e..f3ff895 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java @@ -3,10 +3,13 @@ package com.zt.plat.module.base.dal.mysql.base; 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.api.dto.MaterialOtherDTO; import com.zt.plat.module.base.controller.admin.base.vo.MaterialOtherPageReqVO; import com.zt.plat.module.base.dal.dataobject.base.MaterialOtherDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 物料拓展数据 Mapper * @@ -32,4 +35,20 @@ public interface MaterialOtherMapper extends BaseMapperX { .orderByDesc(MaterialOtherDO::getId)); } + default List selectList(MaterialOtherDTO dto) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(MaterialOtherDO::getMaterialNumber, dto.getMaterialNumber()) + .likeIfPresent(MaterialOtherDO::getMaterialName, dto.getMaterialName()) + .eqIfPresent(MaterialOtherDO::getErpMaterialNumber, dto.getErpMaterialNumber()) + .likeIfPresent(MaterialOtherDO::getErpMaterialName, dto.getErpMaterialName()) + .eqIfPresent(MaterialOtherDO::getUnit, dto.getUnit()) + .eqIfPresent(MaterialOtherDO::getAbbreviation, dto.getAbbreviation()) + .likeIfPresent(MaterialOtherDO::getName, dto.getName()) + .eqIfPresent(MaterialOtherDO::getCoding, dto.getCoding()) + .eqIfPresent(MaterialOtherDO::getGradeUnit, dto.getGradeUnit()) + .betweenIfPresent(MaterialOtherDO::getCreateTime, dto.getCreateTime()) + .eqIfPresent(MaterialOtherDO::getDecimalValue, dto.getDecimalValue()) + .eqIfPresent(MaterialOtherDO::getIsEnable, dto.getIsEnable()) + .orderByDesc(MaterialOtherDO::getId)); + } } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/AccountService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/AccountService.java index 2ab8b02..1df0c04 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/AccountService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/AccountService.java @@ -1,7 +1,7 @@ package com.zt.plat.module.base.service.base; import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.module.api.dto.AccountRespDto; +import com.zt.plat.module.api.dto.AccountDTO; import com.zt.plat.module.base.controller.admin.base.vo.AccountPageReqVO; import com.zt.plat.module.base.controller.admin.base.vo.AccountRespVO; import com.zt.plat.module.base.controller.admin.base.vo.AccountSaveReqVO; @@ -69,5 +69,5 @@ public interface AccountService { */ void enableAccountList(List saveReqVOS); - List getAccountNoPage(AccountRespDto respVO); + List getAccountNoPage(AccountDTO respVO); } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/AccountServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/AccountServiceImpl.java index 0860557..fb12f6b 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/AccountServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/AccountServiceImpl.java @@ -3,7 +3,7 @@ package com.zt.plat.module.base.service.base; import cn.hutool.core.collection.CollUtil; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.module.api.dto.AccountRespDto; +import com.zt.plat.module.api.dto.AccountDTO; import com.zt.plat.module.base.controller.admin.base.vo.AccountPageReqVO; import com.zt.plat.module.base.controller.admin.base.vo.AccountRespVO; import com.zt.plat.module.base.controller.admin.base.vo.AccountSaveReqVO; @@ -98,8 +98,8 @@ public class AccountServiceImpl implements AccountService { } @Override - public List getAccountNoPage(AccountRespDto respVO) { - List entityList = accountMapper.selectNoPage(respVO); - return BeanUtils.toBean(entityList, AccountRespDto.class); + public List getAccountNoPage(AccountDTO dto) { + List entityList = accountMapper.selectNoPage(dto); + return BeanUtils.toBean(entityList, AccountDTO.class); } } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialOtherService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialOtherService.java index e136bfb..90cb584 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialOtherService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialOtherService.java @@ -1,6 +1,7 @@ package com.zt.plat.module.base.service.base; import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.module.api.dto.MaterialOtherDTO; import com.zt.plat.module.base.controller.admin.base.vo.MaterialOtherPageReqVO; import com.zt.plat.module.base.controller.admin.base.vo.MaterialOtherRespVO; import com.zt.plat.module.base.controller.admin.base.vo.MaterialOtherSaveReqVO; @@ -62,4 +63,6 @@ public interface MaterialOtherService { PageResult getMaterialOtherPage(MaterialOtherPageReqVO pageReqVO); void enableMaterialOtherList(List saveReqVOS); + + List getMaterialOtherNoPage(MaterialOtherDTO respVO); } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialOtherServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialOtherServiceImpl.java index 91b6e82..919a79b 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialOtherServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialOtherServiceImpl.java @@ -3,6 +3,7 @@ package com.zt.plat.module.base.service.base; import cn.hutool.core.collection.CollUtil; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils; +import com.zt.plat.module.api.dto.MaterialOtherDTO; import com.zt.plat.module.base.controller.admin.base.vo.MaterialOtherPageReqVO; import com.zt.plat.module.base.controller.admin.base.vo.MaterialOtherRespVO; import com.zt.plat.module.base.controller.admin.base.vo.MaterialOtherSaveReqVO; @@ -96,4 +97,10 @@ public class MaterialOtherServiceImpl implements MaterialOtherService { } } + @Override + public List getMaterialOtherNoPage(MaterialOtherDTO dto) { + List list = materialOtherMapper.selectList(dto); + return BeanUtils.toBean(list, MaterialOtherDTO.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/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 f9d997f..aec8f3f 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 @@ -109,4 +109,12 @@ public class ErpMaterialController { return success(true); } + @GetMapping("/pageAndOther") + @Operation(summary = "获得ERP物料数据分页并关联拓展数据") + @PreAuthorize("@ss.hasPermission('sply:erp-material:query')") + public CommonResult> getErpMaterialPageAndOther(@Valid ErpMaterialPageReqVO pageReqVO) { + PageResult pageResult = erpMaterialService.getErpMaterialPageAndOther(pageReqVO); + return success(BeanUtils.toBean(pageResult, 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/controller/admin/erp/vo/ErpMaterialRespVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialRespVO.java index 449525b..0709c93 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialRespVO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialRespVO.java @@ -2,10 +2,12 @@ package com.zt.plat.module.erp.controller.admin.erp.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.zt.plat.module.api.dto.MaterialOtherDTO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.time.LocalDateTime; +import java.util.List; @Schema(description = "管理后台 - ERP物料数据 Response VO") @Data @@ -72,4 +74,6 @@ public class ErpMaterialRespVO { @ExcelProperty("类型") private String type; + private List materialOtherDTOS; + } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpMaterialDO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpMaterialDO.java index c3f35d7..00d0b39 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpMaterialDO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpMaterialDO.java @@ -5,6 +5,8 @@ import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; import lombok.*; import java.time.LocalDateTime; +import java.util.List; + /** * ERP物料数据 DO * diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCompanyServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCompanyServiceImpl.java index c01fb1c..ec5177d 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCompanyServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCompanyServiceImpl.java @@ -8,7 +8,7 @@ import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.module.api.BaseApi; -import com.zt.plat.module.api.dto.AccountRespDto; +import com.zt.plat.module.api.dto.AccountDTO; import com.zt.plat.module.erp.controller.admin.erp.vo.ErpCompanyPageReqVO; import com.zt.plat.module.erp.controller.admin.erp.vo.ErpCompanyRespVO; import com.zt.plat.module.erp.controller.admin.erp.vo.ErpCompanySaveReqVO; @@ -37,8 +37,6 @@ import java.util.stream.Collectors; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.zt.plat.module.erp.enums.ApiConstants.TABLE_FIELD_SPLY_ERP_CPN_NUM; import static com.zt.plat.module.erp.enums.ErrorCodeConstants.ERP_COMPANY_NOT_EXISTS; -import static com.zt.plat.module.erp.enums.ErrorCodeConstants.ERP_ERROR_EXISTS; -import static dm.jdbc.util.DriverUtil.log; /** * ERP公司 Service 实现类 @@ -296,9 +294,9 @@ public class ErpCompanyServiceImpl implements ErpCompanyService { @Override public String test2() { - AccountRespDto respVO = new AccountRespDto(); + AccountDTO respVO = new AccountDTO(); respVO.setCustomerNumber("50000760"); - List dtos = baseApi.getNoPage(respVO); + List dtos = baseApi.getAccountNoPage(respVO); return dtos.toString(); } } \ 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 976b0ca..fffbad3 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 @@ -62,4 +62,6 @@ public interface ErpMaterialService { PageResult getErpMaterialPage(ErpMaterialPageReqVO pageReqVO); void callErpRfcInterface(); + + PageResult getErpMaterialPageAndOther(ErpMaterialPageReqVO pageReqVO); } \ 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 7c6f4ff..3d4e209 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 @@ -7,6 +7,8 @@ import com.xxl.job.core.handler.annotation.XxlJob; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils; 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.erp.dal.dataobject.erp.ErpWarehouseDO; import com.zt.plat.module.erp.utils.ErpConfig; import com.zt.plat.module.erp.utils.MyRedisConfig; @@ -45,6 +47,8 @@ public class ErpMaterialServiceImpl implements ErpMaterialService { @Resource private ErpMaterialMapper erpMaterialMapper; @Resource + private BaseApi baseApi; + @Resource private MyRedisConfig myRedisConfig; @Resource private ErpConfig erpConfig; @@ -151,6 +155,25 @@ public class ErpMaterialServiceImpl implements ErpMaterialService { return erpMaterialMapper.selectPage(pageReqVO); } + @Override + public PageResult getErpMaterialPageAndOther(ErpMaterialPageReqVO pageReqVO) { + try { + PageResult pageResult = erpMaterialMapper.selectPage(pageReqVO); + PageResult pageResultRespVo = BeanUtils.toBean(pageResult, ErpMaterialRespVO.class); + for (ErpMaterialRespVO respVO : pageResultRespVo.getList()) { + MaterialOtherDTO dto = new MaterialOtherDTO(); + dto.setMaterialNumber(respVO.getDownCenterNumber()); + List dtos = baseApi.getMaterialOtherNoPage(dto); + if (dtos != null){ + respVO.setMaterialOtherDTOS(dtos); + } + } + return pageResultRespVo; + } catch (Exception e) { + throw exception(ERP_MATERIAL_NOT_EXISTS); + } + } + @Override @Transactional @XxlJob("getErpMaterialTask")