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);