Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改配件列表为全部返回

Browse Source
This commit is contained in:
liuzhaotian
2024-07-23 14:30:03 +08:00
parent 9db35ced9e
commit 2eb3ca69b4
9 changed files with 67 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+4 -2
View File
@@ -1,5 +1,7 @@
sonarqube-check: sonarqube-check:
image: maven:3.6.3-jdk-11 image:
name: sonarsource/sonar-scanner-cli:latest
entrypoint: [""]
variables: variables:
SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar" # Defines the location of the analysis task cache 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 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: paths:
- .sonar/cache - .sonar/cache
script: script:
- mvn verify sonar:sonar -Dsonar.projectKey=cf_devdept2_cf_imes_server_AZDYSrQIp5bxkoEt_F_Z - sonar-scanner
allow_failure: true allow_failure: true
only: only:
- master # or the name of your main branch - master # or the name of your main branch
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java
+13 -13
View File
@@ -102,18 +102,18 @@ public class PackController {
@GetMapping("/export") // @GetMapping("/export")
@Operation(summary = "导出缺板") // @Operation(summary = "导出缺板")
@PreAuthorize("@ss.hasPermission('manage:pack:export')") // @PreAuthorize("@ss.hasPermission('manage:pack:export')")
@OperateLog(type = EXPORT) // @OperateLog(type = EXPORT)
public void exportPlateExcel(@Valid OrderPartsReqVO pageReqVO, // public void exportPlateExcel(@Valid OrderPartsReqVO pageReqVO,
HttpServletResponse response) throws IOException { // HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); // pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<PlateDetailsRespVO> list = productionStatusService.getMissingBoard(pageReqVO).getList(); // List<PlateDetailsRespVO> list = productionStatusService.getMissingBoard(pageReqVO).getList();
// 导出 Excel // // 导出 Excel
ExcelUtils.write(response, "缺板信息表.xlsx", "数据", PlateDetailsRespVO.class, list); // ExcelUtils.write(response, "缺板信息表.xlsx", "数据", PlateDetailsRespVO.class, list);
//
} // }
@@ -122,7 +122,7 @@ public class PackController {
@GetMapping("/getParts") @GetMapping("/getParts")
@Operation(summary = "查看配件列表") @Operation(summary = "查看配件列表")
@PreAuthorize("@ss.hasPermission('manage:pack-parts:query')") @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)); return success(packService.getPartsList(reqVO));
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OrderPartsReqVO.java
+2 -2
View File
@@ -11,9 +11,9 @@ import java.util.List;
@Schema(description = "管理后台 - 生产单模块表 Request VO") @Schema(description = "管理后台 - 生产单模块表 Request VO")
@Data @Data
@EqualsAndHashCode(callSuper = true) //@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true) @ToString(callSuper = true)
public class OrderPartsReqVO extends PageParam { public class OrderPartsReqVO /*extends PageParam*/ {
@Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED)
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/ProductionStatusController.java
+12 -12
View File
@@ -177,18 +177,18 @@ public class ProductionStatusController {
@GetMapping("/export") // @GetMapping("/export")
@Operation(summary = "导出缺板") // @Operation(summary = "导出缺板")
@PreAuthorize("@ss.hasPermission('manage:query:export')") // @PreAuthorize("@ss.hasPermission('manage:query:export')")
@OperateLog(type = EXPORT) // @OperateLog(type = EXPORT)
public void exportPlateExcel(@Valid OrderPartsReqVO pageReqVO, // public void exportPlateExcel(@Valid OrderPartsReqVO pageReqVO,
HttpServletResponse response) throws IOException { // HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); // pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<PlateDetailsRespVO> list = productionStatusService.getMissingBoard(pageReqVO).getList(); // List<PlateDetailsRespVO> list = productionStatusService.getMissingBoard(pageReqVO).getList();
// 导出 Excel // // 导出 Excel
ExcelUtils.write(response, "缺板信息表.xls", "数据", PlateDetailsRespVO.class, list); // ExcelUtils.write(response, "缺板信息表.xls", "数据", PlateDetailsRespVO.class, list);
//
} // }
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderPartsMapper.java
+1 -1
View File
@@ -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<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);
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackService.java
+1 -1
View File
@@ -34,7 +34,7 @@ public interface PackService {
// 查看配件列表分页 // 查看配件列表分页
PageResult<OrderPartsRespVO> getPartsList(OrderPartsReqVO reqVO); List<OrderPartsRespVO> getPartsList(OrderPartsReqVO reqVO);
OrderPackRespVO updateParts(OrderPartsReqVO reqVO); OrderPackRespVO updateParts(OrderPartsReqVO reqVO);
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java
+14 -7
View File
@@ -227,17 +227,24 @@ public class PackServiceImpl implements PackService {
// 查看配件列表分页 // 查看配件列表分页
@Override @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())) { List<OrderPartsRespVO> orderPartsRespVOS = orderPartsMapper.selectPartsList(reqVO.getOrderId(),getUserOrganId());
return new PageResult<>();
}
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());
} }
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusService.java
+2 -2
View File
@@ -59,6 +59,6 @@ public interface ProductionStatusService {
// 导出缺板 // // 导出缺板
PageResult<PlateDetailsRespVO> getMissingBoard(OrderPartsReqVO pageReqVO); // PageResult<PlateDetailsRespVO> getMissingBoard(OrderPartsReqVO pageReqVO);
} }
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusServiceImpl.java
+18 -18
View File
@@ -242,24 +242,24 @@ public class ProductionStatusServiceImpl implements ProductionStatusService {
// 导出缺板 // // 导出缺板
@Override // @Override
public PageResult<PlateDetailsRespVO> getMissingBoard(OrderPartsReqVO pageReqVO) { // public PageResult<PlateDetailsRespVO> getMissingBoard(OrderPartsReqVO pageReqVO) {
//
//
PageDTO<PlateDetailsRespVO> page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); // PageDTO<PlateDetailsRespVO> page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
//
IPage<PlateDetailsRespVO> plateDetailsRespVOS = orderPackageMapper.selectMissingBoard(page,pageReqVO.getOrderId(),getUserOrganId()); // IPage<PlateDetailsRespVO> plateDetailsRespVOS = orderPackageMapper.selectMissingBoard(page,pageReqVO.getOrderId(),getUserOrganId());
//
if (CollectionUtil.isEmpty(plateDetailsRespVOS.getRecords())) { // if (CollectionUtil.isEmpty(plateDetailsRespVOS.getRecords())) {
return new PageResult<>(); // return new PageResult<>();
} // }
//
//
return new PageResult<>(plateDetailsRespVOS.getRecords(), plateDetailsRespVOS.getTotal()); // return new PageResult<>(plateDetailsRespVOS.getRecords(), plateDetailsRespVOS.getTotal());
//
//
} // }