From 2eb5392a307310c284879a803ba0b393e82c0908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 28 Jun 2024 09:01:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20ebom=E5=92=8Cpbom=E6=AD=A3=E5=BC=8F?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/nflg/product/bomnew/api/user/EbomApi.java | 1 - .../product/bomnew/pojo/query/BomNewEbomParentQuery.java | 6 ++++++ .../product/bomnew/pojo/query/BomNewPbomParentQuery.java | 6 ++++++ .../product/bomnew/service/BomNewEbomParentService.java | 4 ++-- .../product/bomnew/service/BomNewPbomParentService.java | 2 +- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java index f1ff639a..b70ca385 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java @@ -80,7 +80,6 @@ public class EbomApi extends BaseApi { @PostMapping("formalWorksheet") @ApiOperation("Ebom-正式工作表") - @Deprecated public ResultVO> formalWorksheet(@RequestBody BomNewEbomParentQuery query) { return ResultVO.success(bomNewEbomParentService.formalWorksheet(query)); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java index db9d4b5b..9c04c6a3 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java @@ -58,5 +58,11 @@ public class BomNewEbomParentQuery extends BasePageQuery implements Serializabl @ApiModelProperty(value = "通知单号") private String noticeNo; + /** + * 只显示导入SAP出错的数据 1-导入SAP出错的数据；0-所有数据 + */ + @ApiModelProperty(value = "只显示导入SAP出错的数据 1-导入SAP出错的数据；0-所有数据") + private Integer queryErrorList = 1; + private static final long serialVersionUID = 1L; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewPbomParentQuery.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewPbomParentQuery.java index e5878066..5de40e59 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewPbomParentQuery.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewPbomParentQuery.java @@ -59,6 +59,12 @@ public class BomNewPbomParentQuery implements Serializable { */ @ApiModelProperty(value = "是否仅显示自己的数据：0=所有人的数据；1=仅自己的数据，默认为1") private Integer showMySelfOnly = 1; + + /** + * 只显示导入SAP出错的数据 1-导入SAP出错的数据；0-所有数据 + */ + @ApiModelProperty(value = "只显示导入SAP出错的数据 1-导入SAP出错的数据；0-所有数据") + private Integer queryErrorList = 1; private static final long serialVersionUID = 1L; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index 6d899d2d..98a70cec 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -305,8 +305,8 @@ public class BomNewEbomParentService extends ServiceImpl formalWorksheet(BomNewEbomParentQuery query) { - Page result = new Page<>(); - if (StrUtil.equals(query.getMaterialNo(), "0")) { + Page result; + if (Objects.equals(query.getQueryErrorList(), 1)) { result = this.getBaseMapper().getSapErrorWorksheet(new Page<>(query.getPage(), query.getPageSize()), SessionUtil.getUserCode()); } else { result = this.getBaseMapper().formalWorksheet(new Page<>(query.getPage(), query.getPageSize()), query, SessionUtil.getUserCode()); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java index d2a6733f..57c647a4 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java @@ -217,7 +217,7 @@ public class BomNewPbomParentService extends ServiceImpl releaseListByPage(BomNewPbomParentQuery query) { Page result; - if (StrUtil.equals(query.getMaterialNo(), "0")) { + if (Objects.equals(query.getQueryErrorList(), 1)) { result = this.getBaseMapper().getSapErrorWorksheet(new Page<>(query.getPage(), query.getPageSize()), SessionUtil.getUserCode()); } else { result = this.getBaseMapper().releaseListByPage(new Page<>(query.getPage(), query.getPageSize()), query);