From 1cec213f66c794a86c36a11f58809ff955ceebf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 5 Jul 2024 10:50:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20SAP=E6=8E=92=E5=BA=8F=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2=E5=90=8D=E7=A7=B0SORT=E6=94=B9=E4=B8=BAZSORT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/product/bomnew/pojo/dto/sap/impart2/T1DTO.java | 2 +- .../com/nflg/product/bomnew/pojo/dto/sap/impart2/T1ExtDTO.java | 2 +- .../nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/sap/impart2/T1DTO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/sap/impart2/T1DTO.java index 61325790..76e67185 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/sap/impart2/T1DTO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/sap/impart2/T1DTO.java @@ -47,7 +47,7 @@ public class T1DTO { protected String POTX1 = ""; @ApiModelProperty("排序字符串") - protected String SORT = ""; + protected String ZSORT = ""; // @ApiModelProperty("是否发货") // private String SFFH=""; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/sap/impart2/T1ExtDTO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/sap/impart2/T1ExtDTO.java index d42152ff..4de92909 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/sap/impart2/T1ExtDTO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/sap/impart2/T1ExtDTO.java @@ -35,7 +35,7 @@ public class T1ExtDTO { protected String POTX1 = ""; @ApiModelProperty("排序字符串") - protected String SORT = ""; + protected String ZSORT = ""; private boolean ignore = false; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java index 604f5f68..ebe33c9f 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java @@ -187,7 +187,7 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP { t.setDATUM(dateYMD); t.setMEINS(child.getMaterialUnit()); t.setIDNRK(child.getMaterialNo()); - t.setSORT(BomUtil.generateSapOrderNum(child.getProjectType(), child.getMaterialCategoryCode() + t.setZSORT(BomUtil.generateSapOrderNum(child.getProjectType(), child.getMaterialCategoryCode() , child.getFacCode(), child.getMaterialNo(), Objects.isNull(parent) ? 0 : parent.getBomExist())); t.setIgnore(ignore); if (BomConstant.PROJECT_TYPE_TEMPORARY.equals(child.getProjectType())) {