From d7435367def72350a410f1eb6fcb445e2cf1e925 Mon Sep 17 00:00:00 2001
From: jiyufei <67400194@qq.com>
Date: Thu, 22 Aug 2024 11:26:26 +0800
Subject: [PATCH] =?UTF-8?q?feat():=E6=A0=B9=E6=8D=AE=E6=AF=8D=E4=BB=B6?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E5=AD=90?=
 =?UTF-8?q?=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/jnpf/service/YysBillMaterialService.java     |  2 ++
 .../jnpf/service/impl/YysBillMaterialServiceImpl.java | 11 +++++++++++
 .../jnpf/controller/YysBillMaterialController.java    | 11 +++++++++++
 .../jnpf-web/src/views/yys/yysbillmaterial/form.vue   |  4 ++--
 4 files changed, 26 insertions(+), 2 deletions(-)

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<YysBillMaterialEntity>
     List<YysBillMaterialEntity> getListByProductIds(List<String> id);
 
     String syncMaterial();
+
+    List<YysSubsetMaterialEntity> 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<YysBillMaterialMappe
         }
         return "同步失败";
     }
+
+    @Override
+    public List<YysSubsetMaterialEntity> queryByPieceId(YysBillMaterialPagination yysBillMaterialPagination) {
+        LambdaQueryWrapper<YysSubsetMaterialEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(YysSubsetMaterialEntity::getPieceId, yysBillMaterialPagination.getPieceId());
+        wrapper.isNull(YysSubsetMaterialEntity::getDeleteMark);
+        Page<YysSubsetMaterialEntity> page = new Page<>(yysBillMaterialPagination.getCurrentPage(), yysBillMaterialPagination.getPageSize());
+        IPage<YysSubsetMaterialEntity> 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<YysSubsetMaterialEntity> 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 @@
                         </jnpf-form-tip-item>
                     </el-col>
 
-                    <el-col :span="24">
+                    <!-- <el-col :span="24">
                         <jnpf-form-tip-item label="创建时间" prop="creatorTime">
                             <JnpfDatePicker v-model="dataForm.creatorTime" @change="changeData('creatorTime', -1)"
                                 :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
@@ -66,7 +66,7 @@
                                 format="yyyy-MM-dd HH:mm:ss">
                             </JnpfDatePicker>
                         </jnpf-form-tip-item>
-                    </el-col>
+                    </el-col> -->
                     <el-col :span="24">
                         <jnpf-form-tip-item label="单据状态" prop="documentStatus">
                             <JnpfSelect v-model="dataForm.documentStatus" @change="changeData('documentStatus', -1)"