diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 56fa2e8ff..eefe2da63 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,7 @@
 sonarqube-check:
-  image: maven:3.6.3-jdk-11
+  image: 
+    name: sonarsource/sonar-scanner-cli:latest
+    entrypoint: [""]
   variables:
     SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar"  # Defines the location of the analysis task cache
     GIT_DEPTH: "0"  # Tells git to fetch all the branches of the project, required by the analysis task
@@ -8,7 +10,7 @@ sonarqube-check:
     paths:
       - .sonar/cache
   script: 
-    - mvn verify sonar:sonar -Dsonar.projectKey=cf_devdept2_cf_imes_server_AZDYSrQIp5bxkoEt_F_Z
+    - sonar-scanner
   allow_failure: true
   only:
     - master # or the name of your main branch
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java
index 75953b3e0..bb4df493b 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java
@@ -102,18 +102,18 @@ public class PackController {
 
 
 
-    @GetMapping("/export")
-    @Operation(summary = "导出缺板")
-    @PreAuthorize("@ss.hasPermission('manage:pack:export')")
-    @OperateLog(type = EXPORT)
-    public void exportPlateExcel(@Valid OrderPartsReqVO pageReqVO,
-                                 HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<PlateDetailsRespVO> list = productionStatusService.getMissingBoard(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "缺板信息表.xlsx", "数据", PlateDetailsRespVO.class, list);
-
-    }
+//    @GetMapping("/export")
+//    @Operation(summary = "导出缺板")
+//    @PreAuthorize("@ss.hasPermission('manage:pack:export')")
+//    @OperateLog(type = EXPORT)
+//    public void exportPlateExcel(@Valid OrderPartsReqVO pageReqVO,
+//                                 HttpServletResponse response) throws IOException {
+//        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+//        List<PlateDetailsRespVO> list = productionStatusService.getMissingBoard(pageReqVO).getList();
+//        // 导出 Excel
+//        ExcelUtils.write(response, "缺板信息表.xlsx", "数据", PlateDetailsRespVO.class, list);
+//
+//    }
 
 
 
@@ -122,7 +122,7 @@ public class PackController {
     @GetMapping("/getParts")
     @Operation(summary = "查看配件列表")
     @PreAuthorize("@ss.hasPermission('manage:pack-parts:query')")
-    public CommonResult<PageResult<OrderPartsRespVO>> getParts(@Valid OrderPartsReqVO reqVO) {
+    public CommonResult<List<OrderPartsRespVO>> getParts(@Valid OrderPartsReqVO reqVO) {
 
         return success(packService.getPartsList(reqVO));
 
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OrderPartsReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OrderPartsReqVO.java
index 678529d5e..6d593d951 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OrderPartsReqVO.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OrderPartsReqVO.java
@@ -11,9 +11,9 @@ import java.util.List;
 
 @Schema(description = "管理后台 - 生产单模块表  Request VO")
 @Data
-@EqualsAndHashCode(callSuper = true)
+//@EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class OrderPartsReqVO extends PageParam {
+public class OrderPartsReqVO /*extends PageParam*/ {
 
 
     @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED)
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/ProductionStatusController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/ProductionStatusController.java
index 3eeabfd63..996779155 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/ProductionStatusController.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/ProductionStatusController.java
@@ -177,18 +177,18 @@ public class ProductionStatusController {
 
 
 
-    @GetMapping("/export")
-    @Operation(summary = "导出缺板")
-    @PreAuthorize("@ss.hasPermission('manage:query:export')")
-    @OperateLog(type = EXPORT)
-    public void exportPlateExcel(@Valid OrderPartsReqVO pageReqVO,
-                                 HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<PlateDetailsRespVO> list = productionStatusService.getMissingBoard(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "缺板信息表.xls", "数据", PlateDetailsRespVO.class, list);
-
-    }
+//    @GetMapping("/export")
+//    @Operation(summary = "导出缺板")
+//    @PreAuthorize("@ss.hasPermission('manage:query:export')")
+//    @OperateLog(type = EXPORT)
+//    public void exportPlateExcel(@Valid OrderPartsReqVO pageReqVO,
+//                                 HttpServletResponse response) throws IOException {
+//        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+//        List<PlateDetailsRespVO> list = productionStatusService.getMissingBoard(pageReqVO).getList();
+//        // 导出 Excel
+//        ExcelUtils.write(response, "缺板信息表.xls", "数据", PlateDetailsRespVO.class, list);
+//
+//    }
 
 
 
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderPartsMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderPartsMapper.java
index b60fcd85a..6475c5e13 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderPartsMapper.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderPartsMapper.java
@@ -22,7 +22,7 @@ public interface OrderPartsMapper extends BaseMapperX<OrderPartsNDO> {
     IPage<PackageDetailsRespVO> selectParts(@Param("page") IPage page, @Param("packageId")  Long packageId, @Param("organId")  Long organId);
 
 
-    IPage<OrderPartsRespVO> selectPartsList(@Param("page") IPage page, @Param("orderId") Long orderId , @Param("organId")  Long organId);
+    List<OrderPartsRespVO> selectPartsList( @Param("orderId") Long orderId , @Param("organId")  Long organId);
 
 
 
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackService.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackService.java
index 07ad0685e..8e304307d 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackService.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackService.java
@@ -34,7 +34,7 @@ public interface PackService {
 
 
     // 查看配件列表分页
-    PageResult<OrderPartsRespVO> getPartsList(OrderPartsReqVO reqVO);
+    List<OrderPartsRespVO> getPartsList(OrderPartsReqVO reqVO);
 
     OrderPackRespVO updateParts(OrderPartsReqVO reqVO);
 
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java
index 56d73adcb..aa6339cb4 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java
@@ -227,17 +227,24 @@ public class PackServiceImpl implements PackService {
 
     // 查看配件列表分页
     @Override
-    public PageResult<OrderPartsRespVO> getPartsList(OrderPartsReqVO reqVO) {
+    public List<OrderPartsRespVO> getPartsList(OrderPartsReqVO reqVO) {
 
-        PageDTO<OrderPartsRespVO> page = new PageDTO<>(reqVO.getPageNo(), reqVO.getPageSize());
 
-        IPage<OrderPartsRespVO> orderPartsRespVOS = orderPartsMapper.selectPartsList(page,reqVO.getOrderId(),getUserOrganId());
 
-        if (CollectionUtil.isEmpty(orderPartsRespVOS.getRecords())) {
-            return new PageResult<>();
-        }
+        List<OrderPartsRespVO> orderPartsRespVOS = orderPartsMapper.selectPartsList(reqVO.getOrderId(),getUserOrganId());
 
-        return new PageResult<>(orderPartsRespVOS.getRecords(), orderPartsRespVOS.getTotal());
+
+        return orderPartsRespVOS;
+
+//        PageDTO<OrderPartsRespVO> page = new PageDTO<>(reqVO.getPageNo(), reqVO.getPageSize());
+//
+//        IPage<OrderPartsRespVO> orderPartsRespVOS = orderPartsMapper.selectPartsList(page,reqVO.getOrderId(),getUserOrganId());
+//
+//        if (CollectionUtil.isEmpty(orderPartsRespVOS.getRecords())) {
+//            return new PageResult<>();
+//        }
+//
+//        return new PageResult<>(orderPartsRespVOS.getRecords(), orderPartsRespVOS.getTotal());
 
     }
 
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusService.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusService.java
index 911e9fab3..e0eb6214c 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusService.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusService.java
@@ -59,6 +59,6 @@ public interface ProductionStatusService {
 
 
 
-    // 导出缺板
-    PageResult<PlateDetailsRespVO> getMissingBoard(OrderPartsReqVO pageReqVO);
+//    // 导出缺板
+//    PageResult<PlateDetailsRespVO> getMissingBoard(OrderPartsReqVO pageReqVO);
 }
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusServiceImpl.java
index fb0090df7..527c3ba4b 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusServiceImpl.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusServiceImpl.java
@@ -242,24 +242,24 @@ public class ProductionStatusServiceImpl implements ProductionStatusService {
 
 
 
-    // 导出缺板
-    @Override
-    public PageResult<PlateDetailsRespVO> getMissingBoard(OrderPartsReqVO pageReqVO) {
-
-
-        PageDTO<PlateDetailsRespVO> page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
-
-        IPage<PlateDetailsRespVO> plateDetailsRespVOS = orderPackageMapper.selectMissingBoard(page,pageReqVO.getOrderId(),getUserOrganId());
-
-        if (CollectionUtil.isEmpty(plateDetailsRespVOS.getRecords())) {
-            return new PageResult<>();
-        }
-
-
-        return new PageResult<>(plateDetailsRespVOS.getRecords(), plateDetailsRespVOS.getTotal());
-
-
-    }
+//    // 导出缺板
+//    @Override
+//    public PageResult<PlateDetailsRespVO> getMissingBoard(OrderPartsReqVO pageReqVO) {
+//
+//
+//        PageDTO<PlateDetailsRespVO> page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
+//
+//        IPage<PlateDetailsRespVO> plateDetailsRespVOS = orderPackageMapper.selectMissingBoard(page,pageReqVO.getOrderId(),getUserOrganId());
+//
+//        if (CollectionUtil.isEmpty(plateDetailsRespVOS.getRecords())) {
+//            return new PageResult<>();
+//        }
+//
+//
+//        return new PageResult<>(plateDetailsRespVOS.getRecords(), plateDetailsRespVOS.getTotal());
+//
+//
+//    }