维多利亚

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/quality/QualityInfo.java

@@ -41,7 +41,7 @@ public class QualityInfo extends BaseEntity {
     private Integer status;
 
     /**
-     * 质检结果 1合格 2不合格
+     * 质检结果 1合格 0不合格
      */
     private Integer resultType;
 

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/enums/apply/ApplyPurchaseStatusEnum.java

@@ -35,7 +35,6 @@ public enum ApplyPurchaseStatusEnum {
         this.value = value;
     }
 
-
     static {
         for (ApplyPurchaseStatusEnum value : ApplyPurchaseStatusEnum.values()) {
             classMap.put(value.getKey(), value);

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/enums/classify/ClassifyTypeEnum.java

@@ -1,5 +1,6 @@
 package com.fjhx.enums.classify;
 
+import lombok.Getter;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
 
@@ -10,16 +11,17 @@ import java.util.Map;
 /**
  * 分类类型枚举
  */
+@Getter
 public enum ClassifyTypeEnum {
     CLASSIFY_TYPE_1(1, "产品分类"),
     CLASSIFY_TYPE_2(2, "物料分类"),
     ;
 
-    private int key;
+    private final int key;
 
-    private String value;
+    private final String value;
 
-    private static Map<Integer, String> map = new LinkedHashMap<>();
+    private static final Map<Integer, String> map = new LinkedHashMap<>();
 
     private static final HashMap<Integer, ClassifyTypeEnum> classMap = new HashMap<>();
 
@@ -28,7 +30,6 @@ public enum ClassifyTypeEnum {
         this.value = value;
     }
 
-
     static {
         for (ClassifyTypeEnum value : ClassifyTypeEnum.values()) {
             classMap.put(value.getKey(), value);
@@ -44,8 +45,6 @@ public enum ClassifyTypeEnum {
 
     /**
      * 获取枚举map
-     *
-     * @return
      */
     public static Map<Integer, String> getMap() {
         if (Func.isNotEmpty(map)) {
@@ -59,9 +58,6 @@ public enum ClassifyTypeEnum {
 
     /**
      * 通过key获取名称
-     *
-     * @param key
-     * @return
      */
     public static String getNameByKey(Integer key) {
         if (key == null || key < 0) {
@@ -71,12 +67,4 @@ public enum ClassifyTypeEnum {
         return map.getOrDefault(key, StringPool.EMPTY);
     }
 
-    public int getKey() {
-        return key;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
 }

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/enums/flow/FlowCodeEnum.java

@@ -1,5 +1,6 @@
 package com.fjhx.enums.flow;
 
+import lombok.Getter;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
 
@@ -10,15 +11,18 @@ import java.util.Map;
 /**
  * 流程类型枚举
  */
+@Getter
 public enum FlowCodeEnum {
+
     PURCHASE(1, "PURCHASE"), //采购审批
+
     ;
 
-    private int key;
+    private final int key;
 
-    private String value;
+    private final String value;
 
-    private static Map<Integer, String> map = new LinkedHashMap<>();
+    private static final Map<Integer, String> map = new LinkedHashMap<>();
 
     private static final HashMap<Integer, FlowCodeEnum> classMap = new HashMap<>();
 
@@ -27,7 +31,6 @@ public enum FlowCodeEnum {
         this.value = value;
     }
 
-
     static {
         for (FlowCodeEnum value : FlowCodeEnum.values()) {
             classMap.put(value.getKey(), value);
@@ -43,8 +46,6 @@ public enum FlowCodeEnum {
 
     /**
      * 获取枚举map
-     *
-     * @return
      */
     public static Map<Integer, String> getMap() {
         if (Func.isNotEmpty(map)) {
@@ -58,9 +59,6 @@ public enum FlowCodeEnum {
 
     /**
      * 通过key获取名称
-     *
-     * @param key
-     * @return
      */
     public static String getNameByKey(Integer key) {
         if (key == null || key < 0) {
@@ -70,12 +68,4 @@ public enum FlowCodeEnum {
         return map.getOrDefault(key, StringPool.EMPTY);
     }
 
-    public int getKey() {
-        return key;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-}
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/enums/material/MaterialTypeEnum.java

@@ -1,5 +1,6 @@
 package com.fjhx.enums.material;
 
+import lombok.Getter;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
 
@@ -10,6 +11,7 @@ import java.util.Map;
 /**
  * 物料类型枚举
  */
+@Getter
 public enum MaterialTypeEnum {
     MATERIAL_TYPE_1(1, "原料"),
     MATERIAL_TYPE_2(2, "辅料"),
@@ -17,11 +19,11 @@ public enum MaterialTypeEnum {
     MATERIAL_TYPE_99(99, "其他"),
     ;
 
-    private int key;
+    private final int key;
 
-    private String value;
+    private final String value;
 
-    private static Map<Integer, String> map = new LinkedHashMap<>();
+    private static final Map<Integer, String> map = new LinkedHashMap<>();
 
     private static final HashMap<Integer, MaterialTypeEnum> classMap = new HashMap<>();
 
@@ -46,8 +48,6 @@ public enum MaterialTypeEnum {
 
     /**
      * 获取枚举map
-     *
-     * @return
      */
     public static Map<Integer, String> getMap() {
         if (Func.isNotEmpty(map)) {
@@ -61,9 +61,6 @@ public enum MaterialTypeEnum {
 
     /**
      * 通过key获取名称
-     *
-     * @param key
-     * @return
      */
     public static String getNameByKey(Integer key) {
         if (key == null || key < 0) {
@@ -73,12 +70,4 @@ public enum MaterialTypeEnum {
         return map.getOrDefault(key, StringPool.EMPTY);
     }
 
-    public int getKey() {
-        return key;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
 }

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/enums/purchase/PurchaseStatusEnum.java

@@ -34,7 +34,6 @@ public enum PurchaseStatusEnum {
         this.value = value;
     }
 
-
     static {
         for (PurchaseStatusEnum value : PurchaseStatusEnum.values()) {
             classMap.put(value.getKey(), value);

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/enums/stock/QualityStatusEnum.java

@@ -12,10 +12,9 @@ import java.util.Map;
  */
 @Getter
 public enum QualityStatusEnum {
-    STATUS_10(10, "未质检"),
-    STATUS_20(20, "部分质检"),
-    STATUS_30(30, "已质检"),
-
+    STATUS_1(1, "未质检"),
+    STATUS_2(2, "部分质检"),
+    STATUS_3(3, "已质检"),
     ;
 
     private final int key;

hx-service/victoriatourist/src/main/java/com/fjhx/service/logistics/impl/LogisticsInfoServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.base.BaseIdEntity;
+import com.fjhx.constants.StatusConstant;
 import com.fjhx.constants.logistics.LogisticsConstant;
 import com.fjhx.entity.apply.ApplyPurchase;
 import com.fjhx.entity.logistics.LogisticsDetails;
@@ -16,6 +17,7 @@ import com.fjhx.entity.quality.QualityInfo;
 import com.fjhx.entity.stock.StockJournal;
 import com.fjhx.enums.purchase.PurchaseStatusEnum;
 import com.fjhx.enums.stock.InTypeEnum;
+import com.fjhx.enums.stock.QualityStatusEnum;
 import com.fjhx.mapper.logistics.LogisticsInfoMapper;
 import com.fjhx.params.logistics.DeliverDetailsVo;
 import com.fjhx.params.logistics.LogisticsInfoVo;
@@ -384,8 +386,8 @@ public class LogisticsInfoServiceImpl extends ServiceImpl<LogisticsInfoMapper, L
         qualityInfo.setCode(CodeEnum.QUALITY.getCode());
         qualityInfo.setLogisticsInfoId(logisticsInfoId);
         qualityInfo.setLogisticsInfoCode(logisticsInfo.getCode());
-        qualityInfo.setStatus(1);
-        qualityInfo.setResultType(1);
+        qualityInfo.setStatus(QualityStatusEnum.STATUS_1.getKey());
+        qualityInfo.setResultType(StatusConstant.YES);
         qualityInfoService.save(qualityInfo);
 
         // 添加质检明细

hx-service/victoriatourist/src/main/java/com/fjhx/service/quality/impl/QualityDetailsServiceImpl.java

@@ -4,10 +4,12 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.base.BaseIdEntity;
+import com.fjhx.constants.StatusConstant;
 import com.fjhx.entity.quality.QualityDetails;
 import com.fjhx.entity.quality.QualityInfo;
 import com.fjhx.entity.stock.Stock;
 import com.fjhx.enums.stock.OutTypeEnum;
+import com.fjhx.enums.stock.QualityStatusEnum;
 import com.fjhx.mapper.quality.QualityDetailsMapper;
 import com.fjhx.params.quality.QualityDetailsVo;
 import com.fjhx.params.stock.InStockAdd;
@@ -118,8 +120,8 @@ public class QualityDetailsServiceImpl extends ServiceImpl<QualityDetailsMapper,
         // 修改质检未完成状态
         QualityInfo qualityInfo = new QualityInfo();
         qualityInfo.setId(qualityInfoId);
-        qualityInfo.setStatus(qualityFlag ? 3 : 2);
-        qualityInfo.setResultType(resultTypeFlag ? 1 : 2);
+        qualityInfo.setStatus(qualityFlag ? QualityStatusEnum.STATUS_3.getKey() : QualityStatusEnum.STATUS_2.getKey());
+        qualityInfo.setResultType(resultTypeFlag ? StatusConstant.YES : StatusConstant.NO);
         qualityInfoService.updateById(qualityInfo);
 
         // 质检不合格数量走出库,减少锁定库存