From 6c3ffb67419ca86788e15ff759592d0fc50ba6a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 30 May 2024 17:03:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20ebom=E5=8E=BB=E9=99=A4sap=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E5=AD=97=E7=AC=A6=E4=B8=B2=EF=BC=9Bpbom=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0sap=E6=8E=92=E5=BA=8F=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/pojo/vo/BomNewEbomChildVO.java | 6 ------ .../product/bomnew/pojo/vo/BomNewEbomParentVO.java | 6 ------ .../product/bomnew/pojo/vo/BomNewPbomChildVO.java | 13 +++++++++---- .../product/bomnew/pojo/vo/BomNewPbomParentVO.java | 6 ++++++ .../bomnew/service/BomNewEbomParentService.java | 2 -- .../bomnew/service/BomNewPbomParentService.java | 2 ++ 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomChildVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomChildVO.java index 5e68c638..9735d835 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomChildVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomChildVO.java @@ -124,11 +124,5 @@ public class BomNewEbomChildVO extends BaseMaterialVO implements Serializable { @ApiModelProperty(value = "备注") private String remark; - /** - * SAP排序字符串 - */ - @ApiModelProperty(value = "SAP排序字符串") - private String sapOrderNum; - private static final long serialVersionUID = 1L; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java index a0d160ee..9f4d0a78 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java @@ -341,12 +341,6 @@ public class BomNewEbomParentVO extends BaseMaterialVO implements Serializable { @ApiModelProperty(value = "导入SAP状态") private Integer sapState; - /** - * SAP排序字符串 - */ - @ApiModelProperty(value = "SAP排序字符串") - private String sapOrderNum = "0040"; - private List childNodes = Collections.emptyList(); private static final long serialVersionUID = 1L; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomChildVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomChildVO.java index 9e074a62..4ae71887 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomChildVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomChildVO.java @@ -1,14 +1,13 @@ package com.nflg.product.bomnew.pojo.vo; -import java.math.BigDecimal; -import java.time.LocalDateTime; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; import lombok.Data; import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; import java.time.LocalDateTime; -import java.time.LocalDate; /** * t_bom_new_pbom_child @@ -177,6 +176,12 @@ public class BomNewPbomChildVO implements Serializable { */ @ApiModelProperty(value = "来源行-父项物料编码") private String sourceParentMaterialNo; + + /** + * SAP排序字符串 + */ + @ApiModelProperty(value = "SAP排序字符串") + private String sapOrderNum; private static final long serialVersionUID = 1L; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomParentVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomParentVO.java index ed7fd4f7..3ef8b575 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomParentVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomParentVO.java @@ -267,6 +267,12 @@ public class BomNewPbomParentVO extends BaseMaterialVO implements Serializable { @ApiModelProperty(value = "导入SAP状态") private Integer sapState; + /** + * SAP排序字符串 + */ + @ApiModelProperty(value = "SAP排序字符串") + private String sapOrderNum = "0040"; + private String levelNo; 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 c680215a..cc5c6768 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 @@ -417,8 +417,6 @@ public class BomNewEbomParentService extends ServiceImpl