diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/OptionalBomConstant.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/OptionalBomConstant.java index fda616a3..98dc306d 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/OptionalBomConstant.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/OptionalBomConstant.java @@ -133,6 +133,18 @@ public class OptionalBomConstant { } + @AllArgsConstructor + @Getter + public enum UploadSapStatusEnum { + //是否导入sap(0 :否 1: 是) + SAP_0(0, "未导入"), + SAP_1(1, "已导入"), + SAP_2(2, "导入中"), + SAP_3(3, "部分导入失败"), + SAP_4(4, "全部导入失败"); + private final Integer value; + private final String description; + } } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java index d5bb1778..de2d248e 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java @@ -18,7 +18,6 @@ import com.nflg.product.base.core.conmon.util.SessionUtil; import com.nflg.product.base.core.exception.NflgBusinessException; import com.nflg.product.bomnew.constant.BomConstant; import com.nflg.product.bomnew.constant.OptionalBomConstant; -import com.nflg.product.bomnew.constant.SapStatusEnum; import com.nflg.product.bomnew.mapper.master.OptionalMbomMaterialMapper; import com.nflg.product.bomnew.pojo.dto.OptionalMbomMaterialAddDTO; import com.nflg.product.bomnew.pojo.dto.sap.impart2.ImportSapParamDTO; @@ -164,15 +163,15 @@ public class OptionalMbomMaterialService extends ServiceImpl liErrMsg = null; try { - updateSapState(entity.getRootRowId(), SapStatusEnum.PUB_RUNNING); + updateSapState(entity.getRootRowId(), OptionalBomConstant.UploadSapStatusEnum.SAP_2); liErrMsg = SpringUtil.getBean(SapOpUtilService.class).importToSapV2(result, null); if (CollUtil.isEmpty(liErrMsg)) { - state = SapStatusEnum.PUB_SUCCESS; + state = OptionalBomConstant.UploadSapStatusEnum.SAP_1; } else if (result.getT1().size() != liErrMsg.size()) { - state = SapStatusEnum.PUB_ERROR; + state = OptionalBomConstant.UploadSapStatusEnum.SAP_3; } } finally { updateSapState(entity.getRootRowId(), state); @@ -180,7 +179,7 @@ public class OptionalMbomMaterialService extends ServiceImpl