zgty/zt-base
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

物料查询关联拓展关系

Browse Source
This commit is contained in:
liss
2025-10-17 11:46:08 +08:00
parent f7155565d4
commit d8c795742e
16 changed files with 164 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpMaterialController.java
View File

@@ -109,4 +109,12 @@ public class ErpMaterialController {
return success(true);
}
@GetMapping("/pageAndOther")
@Operation(summary = "获得ERP物料数据分页并关联拓展数据")
@PreAuthorize("@ss.hasPermission('sply:erp-material:query')")
public CommonResult<PageResult<ErpMaterialRespVO>> getErpMaterialPageAndOther(@Valid ErpMaterialPageReqVO pageReqVO) {
PageResult<ErpMaterialRespVO> pageResult = erpMaterialService.getErpMaterialPageAndOther(pageReqVO);
return success(BeanUtils.toBean(pageResult, ErpMaterialRespVO.class));
}
}

4
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialRespVO.java
View File

@@ -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<MaterialOtherDTO> materialOtherDTOS;
}

2
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpMaterialDO.java
View File

@@ -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
*

8
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCompanyServiceImpl.java
View File

@@ -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<AccountRespDto> dtos = baseApi.getNoPage(respVO);
List<AccountDTO> dtos = baseApi.getAccountNoPage(respVO);
return dtos.toString();
}
}

2
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialService.java
View File

@@ -62,4 +62,6 @@ public interface ErpMaterialService {
PageResult<ErpMaterialDO> getErpMaterialPage(ErpMaterialPageReqVO pageReqVO);
void callErpRfcInterface();
PageResult<ErpMaterialRespVO> getErpMaterialPageAndOther(ErpMaterialPageReqVO pageReqVO);
}

23
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java
View File

@@ -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<ErpMaterialRespVO> getErpMaterialPageAndOther(ErpMaterialPageReqVO pageReqVO) {
try {
PageResult<ErpMaterialDO> pageResult = erpMaterialMapper.selectPage(pageReqVO);
PageResult<ErpMaterialRespVO> pageResultRespVo = BeanUtils.toBean(pageResult, ErpMaterialRespVO.class);
for (ErpMaterialRespVO respVO : pageResultRespVo.getList()) {
MaterialOtherDTO dto = new MaterialOtherDTO();
dto.setMaterialNumber(respVO.getDownCenterNumber());
List<MaterialOtherDTO> 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")