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 d88a5778..10d1369c 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 @@ -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> getErpProdMaterialByApi(@RequestBody MaterialInfomationApiVO vo) { + PageResult erpMaterialByApi = erpMaterialService.getErpProdMaterialByApi(vo); + + return success(BeanUtils.toBean(erpMaterialByApi, ErpMaterialRespVO.class)); + } //通过主物料查询子物料信息 @GetMapping("/erpMaterial-mainMaterial-code") @Operation(summary = "通过主物料编号查询子物料信息") 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 3c9c117f..36bd39ea 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 @@ -82,4 +82,6 @@ public interface ErpMaterialService { List getErpMaterialByMainMaterialByCode(String code,String deptId); List getErpMaterialByApiByCode(String code,String deptId); + + PageResult getErpProdMaterialByApi(MaterialInfomationApiVO vo); } \ 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 cc50b45d..fad4ce37 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 @@ -380,11 +380,6 @@ public class ErpMaterialServiceImpl implements ErpMaterialService { }); departmentMaterialPage.setList(dtos); departmentMaterialPage.setTotal((long) data.size()); -//// departmentMaterialPageReqDTO.setDeptId(collect.iterator().next()); -// PageResult 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 getErpProdMaterialByApi(MaterialInfomationApiVO vo) { + MaterialInfomationPageReqDTO materialInfomationPageReqDTO = new MaterialInfomationPageReqDTO(); + materialInfomationPageReqDTO.setCode(vo.getMaterialNumber()); + materialInfomationPageReqDTO.setName(vo.getMaterialName()); + CommonResult> materialInfomationPage = materialInfomationApi.getMaterialInfomationPage(materialInfomationPageReqDTO); + PageResult data = materialInfomationPage.getData(); + if (data == null || data.getList() == null || data.getList().isEmpty()) { + return new PageResult<>(); + } + PageResult departmentMaterialPage =new PageResult<>(); + List 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 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")