From 511f8c2a3ab47db6eb50336d3ffc33593237a1ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 7 Jun 2024 15:26:48 +0800 Subject: [PATCH] =?UTF-8?q?feat(pbom):=20=E6=B7=BB=E5=8A=A0=E5=AF=BC?= =?UTF-8?q?=E5=85=A5SAP=E5=A4=B1=E8=B4=A5=E7=9A=84=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=92=8C=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/mapper/master/BomNewPbomParentMapper.java | 4 ++++ .../product/bomnew/pojo/entity/BomNewPbomParentEntity.java | 5 +++-- .../product/bomnew/service/BomNewPbomParentService.java | 7 ++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomParentMapper.java index 14467ac6..fdc82130 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomParentMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomParentMapper.java @@ -67,4 +67,8 @@ public interface BomNewPbomParentMapper extends BaseMapper getLatestParents(Set materialNos, String facCode); + + Page getSapErrorWorksheet(Page page, String userCode); + + Integer getSapErrorNum(String userCode); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomParentEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomParentEntity.java index 2c595ceb..d8335599 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomParentEntity.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomParentEntity.java @@ -342,10 +342,11 @@ public class BomNewPbomParentEntity implements Serializable { private LocalDateTime modifyTime; /** - * 导入SAP状态，1-未导入；3-已导入 + * 导入SAP状态，1-未导入；2-导入中；3-全部导入成功；4-部分导入失败；5全部导入失败 + * @see com.nflg.product.bomnew.constant.SapStatusEnum */ @TableField(value = "sap_state") - @ApiModelProperty(value = "导入SAP状态，1-未导入；3-已导入") + @ApiModelProperty(value = "导入SAP状态，1-未导入；2-导入中；3-全部导入成功；4-部分导入失败；5全部导入失败") private Integer sapState; /** 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 48f7a9d0..50442d7a 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 @@ -216,7 +216,12 @@ public class BomNewPbomParentService extends ServiceImpl releaseListByPage(BomNewPbomParentQuery query) { - Page result = this.getBaseMapper().releaseListByPage(new Page<>(query.getPage(), query.getPageSize()), query); + Page result; + if (StrUtil.equals(query.getMaterialNo(), "0")) { + result = this.getBaseMapper().getSapErrorWorksheet(new Page<>(query.getPage(), query.getPageSize()), SessionUtil.getUserCode()); + } else { + result = this.getBaseMapper().releaseListByPage(new Page<>(query.getPage(), query.getPageSize()), query); + } materialMainService.intiMaterialInfo(result.getRecords(), EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT); return result; }