From 465961a6117283e73f3cb162274497ebc0a48b81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E4=B9=BE=E7=BF=94?= Date: Wed, 22 Apr 2026 15:03:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E8=B4=A7=E7=8A=B6=E6=80=81=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=9C=AA=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/pojo/entity/Oem.java | 51 +++++++++++++++++++ .../springblade/desk/basic/pojo/vo/OemVO.java | 7 ++- .../basic/service/impl/OemServiceImpl.java | 2 +- 3 files changed, 57 insertions(+), 3 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java index 0862884c..25b273ab 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java @@ -12,7 +12,9 @@ import org.springblade.core.mp.base.BaseEntity; import org.springblade.scheduling.pojo.entity.CraftAbilityEntity; import java.io.Serial; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * [外协厂家] 实体类 @@ -173,4 +175,53 @@ public class Oem extends BaseEntity { */ @TableField(exist = false) private Boolean partCodeYesOrNo = false; + + + public static Map curStatusMap = new HashMap(); + public static Map qualificationMap = new HashMap(); + /** + * 民品&普军 + */ + public static Short QUALIFICATION_0 = 0; + /** + * 军标线 + */ + public static Short QUALIFICATION_1 = 1; + /** + * 民品&普军&航军 + */ + public static Short QUALIFICATION_2 = 2; + /** + * 民品&普军&军标线 + */ + public static Short QUALIFICATION_3 = 3; + /** + * 民品&普军&航军&军标线 + */ + public static Short QUALIFICATION_4 = 4; + + /** + * 正常供货 + */ + public static Short CURTAINS_OK = 0; + /** + * 暂停供货 + */ + public static Short CURTAINS_STOP = 1; + /** + * 暂停新物料采购 + */ + public static Short CURTAINS_STOP_NEW_MAT = 2; + static { + curStatusMap.put(CURTAINS_OK, "正常供货"); + curStatusMap.put(CURTAINS_STOP, "暂停供货"); + curStatusMap.put(CURTAINS_STOP_NEW_MAT, "暂停新物料采购"); + + qualificationMap.put(QUALIFICATION_0, "民品&普军"); + qualificationMap.put(QUALIFICATION_1, "军标线"); + qualificationMap.put(QUALIFICATION_2, "民品&普军&航军"); + qualificationMap.put(QUALIFICATION_3, "民品&普军&军标线"); + qualificationMap.put(QUALIFICATION_4, "民品&普军&航军&军标线"); + } + } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java index b3c1408f..d18c9c97 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java @@ -8,6 +8,8 @@ import lombok.EqualsAndHashCode; import org.springblade.desk.basic.pojo.entity.Oem; import java.io.Serial; +import java.util.HashMap; +import java.util.Map; /** * [外协厂家] 视图实体类 @@ -18,7 +20,8 @@ import java.io.Serial; @Data @EqualsAndHashCode(callSuper = true) public class OemVO extends Oem { - @Serial - private static final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; + private String curStatusText; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java index 3ea66f1a..8e1c28fa 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java @@ -74,7 +74,7 @@ public class OemServiceImpl extends BaseServiceImpl implements I @Override public void setVOValue(OemVO vo) { - + vo.setCurStatusText(Oem.curStatusMap.getOrDefault(Short.valueOf(vo.getStatus().toString()), Oem.CURTAINS_OK.toString())); } @Override