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

Merge remote-tracking branch 'origin/dev' into test

Browse Source
This commit is contained in:
qianshijiang
2026-01-23 09:12:52 +08:00
parent 8216466ee7 ec2d913bbf
commit b934996b74
3 changed files with 44 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -162,6 +162,15 @@ public class ErpMaterialController implements BusinessControllerMarker {
return success(BeanUtils.toBean(erpMaterialByApi, ErpMaterialRespVO.class));
}
@PostMapping("/api-erp-prod-material")
@Operation(summary = "查询物料,产品专用")
@PreAuthorize("@ss.hasAnyPermissions({'sply:erp-material:query','basic:material-config:query'})")
public CommonResult<PageResult<ErpMaterialRespVO>> getErpProdMaterialByApi(@RequestBody MaterialInfomationApiVO vo) {
PageResult<ErpMaterialDO> erpMaterialByApi = erpMaterialService.getErpProdMaterialByApi(vo);
return success(BeanUtils.toBean(erpMaterialByApi, ErpMaterialRespVO.class));
}
//通过主物料查询子物料信息
@GetMapping("/erpMaterial-mainMaterial-code")
@Operation(summary = "通过主物料编号查询子物料信息")

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

@@ -82,4 +82,6 @@ public interface ErpMaterialService {
List<ErpMaterialDO> getErpMaterialByMainMaterialByCode(String code,String deptId);
List <ErpMaterialDO>getErpMaterialByApiByCode(String code,String deptId);
PageResult<ErpMaterialDO> getErpProdMaterialByApi(MaterialInfomationApiVO vo);
}

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

@@ -380,11 +380,6 @@ public class ErpMaterialServiceImpl implements ErpMaterialService {
});
departmentMaterialPage.setList(dtos);
departmentMaterialPage.setTotal((long) data.size());
//// departmentMaterialPageReqDTO.setDeptId(collect.iterator().next());
// PageResult<DepartmentMaterialRespDTO> departmentMaterialPage = departmentMaterialApi.getDepartmentMaterialPage(departmentMaterialPageReqDTO).getData();
// if (departmentMaterialPage == null || departmentMaterialPage.getList() == null || departmentMaterialPage.getList().isEmpty()) {
// return erpMaterialDOList;
// }
departmentMaterialPage.getList().forEach(item -> {
ErpMaterialDO erpMaterialDO = buildErpMaterialDOData(CommonResult.success(item));
erpMaterialDOList.add(erpMaterialDO);
@@ -392,6 +387,39 @@ public class ErpMaterialServiceImpl implements ErpMaterialService {
return erpMaterialDOList;
}
@Override
public PageResult<ErpMaterialDO> getErpProdMaterialByApi(MaterialInfomationApiVO vo) {
MaterialInfomationPageReqDTO materialInfomationPageReqDTO = new MaterialInfomationPageReqDTO();
materialInfomationPageReqDTO.setCode(vo.getMaterialNumber());
materialInfomationPageReqDTO.setName(vo.getMaterialName());
CommonResult<PageResult<MaterialInfomationRespDTO>> materialInfomationPage = materialInfomationApi.getMaterialInfomationPage(materialInfomationPageReqDTO);
PageResult<MaterialInfomationRespDTO> data = materialInfomationPage.getData();
if (data == null || data.getList() == null || data.getList().isEmpty()) {
return new PageResult<>();
}
PageResult<DepartmentMaterialRespDTO> departmentMaterialPage =new PageResult<>();
List<DepartmentMaterialRespDTO> dtos=new ArrayList<>();
data.getList().forEach(item -> {
DepartmentMaterialRespDTO departmentMaterialRespDTO = new DepartmentMaterialRespDTO();
departmentMaterialRespDTO.setId(item.getId());
departmentMaterialRespDTO.setMaterialNumber(item.getCode());
departmentMaterialRespDTO.setMaterialName(item.getName());
departmentMaterialRespDTO.setClassesId(item.getClassesId());
departmentMaterialRespDTO.setRemark(item.getRemark());
departmentMaterialRespDTO.setCreateTime(item.getCreateTime());
departmentMaterialRespDTO.setFlatAttributes(item.getFlatAttributes());
dtos.add(departmentMaterialRespDTO);
});
departmentMaterialPage.setList(dtos);
departmentMaterialPage.setTotal( materialInfomationPage.getData().getTotal());
List<ErpMaterialDO> erpMaterialDOList = new ArrayList<>();
departmentMaterialPage.getList().forEach(item -> {
ErpMaterialDO erpMaterialDO = buildErpMaterialDOData(CommonResult.success(item));
erpMaterialDOList.add(erpMaterialDO);
});
return new PageResult<>(erpMaterialDOList, departmentMaterialPage.getTotal());
}
@Override
@Transactional
@XxlJob("getErpMaterialTask")