diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java index 4e91295a..9920902d 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java @@ -223,6 +223,10 @@ public class EBomImportService { dto.setRowNum(rowNum.get()); + if (StrUtil.equals("ST", dto.getUnit(), true)) { + dto.setUnit("PC"); + } + if (StrUtil.equals(dto.getProjectType(), BomConstant.PROJECT_TYPE_TEMPORARY, true)) { String id = RandomUtil.randomNumbers(9); dto.setMaterialNo(BomConstant.PROJECT_TYPE_TEMPORARY + id); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/SapOpUtilService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/SapOpUtilService.java index 3d9811b0..cc4a830e 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/SapOpUtilService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/SapOpUtilService.java @@ -162,6 +162,10 @@ public class SapOpUtilService { if (StrUtil.equals(t.getPOSTP(), "Z", true)) { t.setPOSTP("L"); } + //如果单位是ST,则改为PC + if (StrUtil.equals("ST", t.getMEINS(), true)) { + t.setMEINS("PC"); + } childMapList.add(Convert.convert(new TypeReference>() { }, t)); });