diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysBillMaterialService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysBillMaterialService.java index ebde8e7..77cb6e3 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysBillMaterialService.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysBillMaterialService.java @@ -34,4 +34,6 @@ public interface YysBillMaterialService extends IService List getListByProductIds(List id); String syncMaterial(); + + List queryByPieceId(YysBillMaterialPagination yysBillMaterialPagination); } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysBillMaterialServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysBillMaterialServiceImpl.java index 45ada9a..c2981a6 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysBillMaterialServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysBillMaterialServiceImpl.java @@ -34,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional; import java.lang.reflect.Field; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -404,4 +405,14 @@ public class YysBillMaterialServiceImpl extends ServiceImpl queryByPieceId(YysBillMaterialPagination yysBillMaterialPagination) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(YysSubsetMaterialEntity::getPieceId, yysBillMaterialPagination.getPieceId()); + wrapper.isNull(YysSubsetMaterialEntity::getDeleteMark); + Page page = new Page<>(yysBillMaterialPagination.getCurrentPage(), yysBillMaterialPagination.getPageSize()); + IPage userIPage = yysSubsetMaterialService.page(page, wrapper); + return yysBillMaterialPagination.setData(userIPage.getRecords(), userIPage.getTotal()); + } } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysBillMaterialController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysBillMaterialController.java index e948e15..ec198db 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysBillMaterialController.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysBillMaterialController.java @@ -210,4 +210,15 @@ public class YysBillMaterialController { return ActionResult.fail(result); } + + @Operation(summary = "根据母件编码分页查询子集") + @PostMapping("/queryByPieceId") + public ActionResult queryByPieceId(@RequestBody YysBillMaterialPagination yysBillMaterialPagination) { + List list = yysBillMaterialService.queryByPieceId(yysBillMaterialPagination); + PageListVO vo = new PageListVO(); + vo.setList(list); + PaginationVO page = JsonUtil.getJsonToBean(yysBillMaterialPagination, PaginationVO.class); + vo.setPagination(page); + return ActionResult.success(vo); + } } diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysbillmaterial/form.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysbillmaterial/form.vue index 45c1836..238e570 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yysbillmaterial/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysbillmaterial/form.vue @@ -58,7 +58,7 @@ - +