枚举工具类移入common

ruoyi-common/src/main/java/com/ruoyi/common/constant/WareWmsEnums.java

@@ -0,0 +1,40 @@
+package com.ruoyi.common.constant;
+
+
+import com.ruoyi.common.constant.base.BizEnum;
+
+public class WareWmsEnums {
+
+    public enum BaseSkuCategories implements BizEnum {
+        TANK_01("1", "Na2CO3"),
+        TANK_02("2", "C5H10OS2"),
+        TANK_03("3", "(NaPO3)6"),
+        TANK_04("4", "(NH4)2SO4"),
+        TANK_05("5", "CH3CH2OCS2Na");
+
+        private String skuCode;
+
+        private String sku;
+
+        BaseSkuCategories(String skuCode, String sku) {
+            this.skuCode = skuCode;
+            this.sku = sku;
+        }
+
+
+        public String getSkuCode() {
+            return skuCode;
+        }
+
+        public String getSku() {
+            return sku;
+        }
+
+        @Override
+        public String getCode() {
+            return getSkuCode();
+        }
+
+    }
+
+}

warewms-ams/src/main/java/com/ruoyi/ams/order/constant/base/BizEnum.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ams.order.constant.base;
+package com.ruoyi.common.constant.base;
 
 public interface BizEnum{
 

warewms-ams/src/main/java/com/ruoyi/ams/order/constant/base/EnumUtils.java

@@ -1,10 +1,12 @@
-package com.ruoyi.ams.order.constant.base;
+package com.ruoyi.common.constant.base;
 
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.Arrays;
+
+
 /**
  * @see BizEnum 该类中的枚举都可以使用改工具类，即继承自BizEnum即可
  * @description 通过code来获取枚举对象方法，根据Code找不到对应枚举会返回Null，调用者请避免NPE
@@ -23,6 +25,6 @@ public class EnumUtils {
 			return null;
 		}
 		//筛选
-		return Lists.newArrayList(enumConstants).stream().filter(item -> ObjectUtil.equal(code, item.getCode())).findFirst().orElse(null);
+		return Arrays.stream(enumConstants).filter(item -> ObjectUtil.equal(code, item.getCode())).findFirst().orElse(null);
 	}
 }

warewms-ams/src/main/java/com/ruoyi/ams/order/constant/SatsukiEnums.java

@@ -1,43 +0,0 @@
-package com.ruoyi.ams.order.constant;
-
-
-import com.ruoyi.ams.order.constant.base.BizEnum;
-
-public class SatsukiEnums {
-
-    public enum BaseSkuCategories implements BizEnum {
-        TANK_01("1", "Na2CO3"),
-        TANK_02("2", "C5H10OS2"),
-        TANK_03("3", "(NaPO3)6"),
-        TANK_04("4", "(NH4)2SO4"),
-        TANK_05("5", "CH3CH2OCS2Na");
-        /**
-         * 支付渠道类别
-         */
-        private String channelCode;
-
-        private String channelDesc;
-
-        BaseSkuCategories(String channelCode, String channelDesc) {
-            this.channelCode = channelCode;
-            this.channelDesc = channelDesc;
-        }
-
-
-        public String getChannelCode() {
-            return channelCode;
-        }
-
-        public String getChannelDesc() {
-            return channelDesc;
-        }
-
-        @Override
-        public String getCode() {
-            return getChannelCode();
-        }
-
-
-    }
-
-}

warewms-ams/src/main/java/com/ruoyi/ams/order/service/impl/WmsDocOrderHeaderServiceImpl.java

@@ -1,8 +1,5 @@
 package com.ruoyi.ams.order.service.impl;
 
-import java.math.BigDecimal;
-import java.util.*;
-
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.ams.box.domain.WmsBoxInfo;
 import com.ruoyi.ams.box.mapper.WmsBoxInfoMapper;
@@ -22,12 +19,13 @@ import com.ruoyi.ams.inv.service.IActTransactionLogService;
 import com.ruoyi.ams.inv.service.IInvLotLocIdService;
 import com.ruoyi.ams.order.domain.ActAllocationDetails;
 import com.ruoyi.ams.order.domain.WmsDocOrderDetails;
-import com.ruoyi.ams.order.constant.SatsukiEnums;
-import com.ruoyi.ams.order.constant.base.EnumUtils;
+import com.ruoyi.ams.order.domain.WmsDocOrderHeader;
 import com.ruoyi.ams.order.form.*;
 import com.ruoyi.ams.order.mapper.WmsDocOrderDetailsMapper;
+import com.ruoyi.ams.order.mapper.WmsDocOrderHeaderMapper;
 import com.ruoyi.ams.order.service.IActAllocationDetailsService;
 import com.ruoyi.ams.order.service.IWmsDocOrderDetailsService;
+import com.ruoyi.ams.order.service.IWmsDocOrderHeaderService;
 import com.ruoyi.ams.order.vo.CheckOutVO;
 import com.ruoyi.ams.order.vo.PickingListVO;
 import com.ruoyi.ams.order.vo.StockOrderVO;
@@ -37,6 +35,8 @@ import com.ruoyi.base.domain.vo.CodeSkuRelationshipVO;
 import com.ruoyi.base.service.IBaseLocationInfoService;
 import com.ruoyi.base.service.ICodeSkuRelationshipService;
 import com.ruoyi.base.utils.IdSequenceUtils;
+import com.ruoyi.common.constant.WareWmsEnums;
+import com.ruoyi.common.constant.base.EnumUtils;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.exception.ServiceException;
@@ -45,11 +45,11 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.uuid.SnowflakeIdWorker;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.ams.order.mapper.WmsDocOrderHeaderMapper;
-import com.ruoyi.ams.order.domain.WmsDocOrderHeader;
-import com.ruoyi.ams.order.service.IWmsDocOrderHeaderService;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
+import java.util.*;
+
 /**
  * 出库单头Service业务层处理
  *
@@ -151,8 +151,8 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
     public AjaxResult insertWmsDocOrderHeader(WmsDocOrderHeader wmsDocOrderHeader) {
         List<WmsDocOrderDetails> wmsDocOrderDetails = wmsDocOrderDetailsService.selectWmsDocOrderDetailsByOrderNo(wmsDocOrderHeader.getOrderNo());
         String soReference3 = wmsDocOrderHeader.getSoReference3();
-        SatsukiEnums.BaseSkuCategories baseSkuCategory = EnumUtils.getEnumByCode(soReference3, SatsukiEnums.BaseSkuCategories.class);
-        String finalSku = baseSkuCategory == null ? "未知物质" : baseSkuCategory.getChannelDesc();
+        WareWmsEnums.BaseSkuCategories baseSkuCategory = EnumUtils.getEnumByCode(soReference3, WareWmsEnums.BaseSkuCategories.class);
+        String finalSku = baseSkuCategory == null ? "未知物质" : baseSkuCategory.getSku();
         wmsDocOrderDetails.forEach(item ->{
             if(!finalSku.equals(item.getSku())){
                 throw new RuntimeException("物料不符！");