rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: ebom和pbom正式表查询逻辑调整

This commit is contained in:
曹鹏飞 2024-06-28 09:01:11 +08:00
parent 23b55e23dd
commit 2eb5392a30
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java
View File

@ -80,7 +80,6 @@ public class EbomApi extends BaseApi {
@PostMapping("formalWorksheet") @PostMapping("formalWorksheet")
@ApiOperation("Ebom-正式工作表") @ApiOperation("Ebom-正式工作表")
@Deprecated
public ResultVO<Page<BomNewEbomParentVO>> formalWorksheet(@RequestBody BomNewEbomParentQuery query) { public ResultVO<Page<BomNewEbomParentVO>> formalWorksheet(@RequestBody BomNewEbomParentQuery query) {
return ResultVO.success(bomNewEbomParentService.formalWorksheet(query)); return ResultVO.success(bomNewEbomParentService.formalWorksheet(query));
} }

6
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java
View File

@ -58,5 +58,11 @@ public class BomNewEbomParentQuery extends BasePageQuery implements Serializabl
@ApiModelProperty(value = "通知单号") @ApiModelProperty(value = "通知单号")
private String noticeNo; private String noticeNo;
/**
* 只显示导入SAP出错的数据 1-导入SAP出错的数据；0-所有数据
*/
@ApiModelProperty(value = "只显示导入SAP出错的数据 1-导入SAP出错的数据；0-所有数据")
private Integer queryErrorList = 1;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }

6
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewPbomParentQuery.java
View File

@ -59,6 +59,12 @@ public class BomNewPbomParentQuery implements Serializable {
*/ */
@ApiModelProperty(value = "是否仅显示自己的数据：0=所有人的数据；1=仅自己的数据，默认为1") @ApiModelProperty(value = "是否仅显示自己的数据：0=所有人的数据；1=仅自己的数据，默认为1")
private Integer showMySelfOnly = 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; private static final long serialVersionUID = 1L;
} }

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
View File

@ -305,8 +305,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
* @return * @return
*/ */
public Page<BomNewEbomParentVO> formalWorksheet(BomNewEbomParentQuery query) { public Page<BomNewEbomParentVO> formalWorksheet(BomNewEbomParentQuery query) {
Page<BomNewEbomParentVO> result = new Page<>(); Page<BomNewEbomParentVO> 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()); result = this.getBaseMapper().getSapErrorWorksheet(new Page<>(query.getPage(), query.getPageSize()), SessionUtil.getUserCode());
} else { } else {
result = this.getBaseMapper().formalWorksheet(new Page<>(query.getPage(), query.getPageSize()), query, SessionUtil.getUserCode()); result = this.getBaseMapper().formalWorksheet(new Page<>(query.getPage(), query.getPageSize()), query, SessionUtil.getUserCode());

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
View File

@ -217,7 +217,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
*/ */
public IPage<BomNewPbomParentVO> releaseListByPage(BomNewPbomParentQuery query) { public IPage<BomNewPbomParentVO> releaseListByPage(BomNewPbomParentQuery query) {
Page<BomNewPbomParentVO> result; Page<BomNewPbomParentVO> 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()); result = this.getBaseMapper().getSapErrorWorksheet(new Page<>(query.getPage(), query.getPageSize()), SessionUtil.getUserCode());
} else { } else {
result = this.getBaseMapper().releaseListByPage(new Page<>(query.getPage(), query.getPageSize()), query); result = this.getBaseMapper().releaseListByPage(new Page<>(query.getPage(), query.getPageSize()), query);