Jenkins自动合并

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -174,6 +174,7 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 主表信息 单据类型
      */
@@ -1470,6 +1471,7 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
     /**
      * 库存移动单状态状态:10=新建,20=已处理,30=处理出错
      */
@@ -2936,64 +2938,56 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum IMPORT_ORDER_TYPE {
-        PO("PO", "要货计划"),
-        ASN("ASN", "ASN"),
-        INSTRUCTIONS("INSTRUCTIONS", "指令"),
-        SCATTERED_OUT("C00", "零星出库指令"),
-        SCATTERED_INT("C01", "零星入指令"),
-        NC_DISMANTLING_PICKING("C02", "NC拆解领料"),
-        NC_DISMANTLING_RETURN("C03", "NC拆解退料"),
-        NC_SCRAPPED("C04", "NC报废指令"),
-        NOT_JIS("NOTJIS", "非JIS指令"),
-        STOCK_DUMP("D00", "库存转储指令"),
-        NC_INSTOCK("D01", "NC入库指令"),
-        SMRR("B00", "SMRR退货"),
-        DMR("B01", "DMR退货"),
-        OUT_SOURCING("A00", "委外发料指令"),
-        OUT_REBACK("A01", "委外退料指令"),
-        OUT_RETURN_SOURCING("A02", "委外返工发料指令"),
-        OUT_RETURN_("A03", "委外返工退料指令"),
-        SALES_RETURN_REBACK("SALES_RETURN", "销售退货指令"),
-        CS("CS", "盘点指令"),
-        CS_ADUJUST("CS_ADUJUST", "盘点调差指令");
+        PO("1", "PO", "要货计划"),
+        ASN("2", "ASN", "ASN"),
+        INSTRUCTIONS("3", "INSTRUCTIONS", "指令"),
+        SCATTERED_OUT("C00", "C00", "零星出库指令"),
+        SCATTERED_INT("C01", "C01", "零星入指令"),
+        NC_DISMANTLING_PICKING("C02", "C02", "NC拆解领料"),
+        NC_DISMANTLING_RETURN("C03", "C03", "NC拆解退料"),
+        NC_SCRAPPED("C04", "C04", "NC报废指令"),
+        NOT_JIS("NOTJIS", "NOTJIS", "非JIS指令"),
+        STOCK_DUMP("D00", "D00", "库存转储指令"),
+        NC_INSTOCK("D01", "D01", "NC入库指令"),
+        SMRR("B00", "B00", "SMRR退货"),
+        DMR("B01", "B01", "DMR退货"),
+        OUT_SOURCING("A00", "A00", "委外发料指令"),
+        OUT_REBACK("A01", "A01", "委外退料指令"),
+        OUT_RETURN_SOURCING("A02", "A02", "委外返工发料指令"),
+        OUT_RETURN_("A03", "A03", "委外返工退料指令"),
+        SALES_RETURN_REBACK("SALES_RETURN", "SALES_RETURN", "销售退货指令"),
+        CS("CS", "CS", "盘点指令"),
+        CS_ADUJUST("CS_ADUJUST", "CS_ADUJUST", "盘点调差指令");
         private String value;
+        private String code;
         private String description;
 
-        IMPORT_ORDER_TYPE(String value, String description) {
+        IMPORT_ORDER_TYPE(String value, String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
-        public String getDescription() {
-            return description;
+        public String getValue() {
+            return value;
         }
 
         public String getCode() {
-            return value;
+            return code;
         }
 
-        public String getValue() {
-            return value;
+        public String getDescription() {
+            return description;
         }
 
-        public static IMPORT_ORDER_TYPE codeOf(String value) {
+        public static IMPORT_ORDER_TYPE codeOf(String code) {
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value.equals(value)) {
+                if (values()[i].code.equals(code)) {
                     return values()[i];
                 }
             }
             return null;
         }
-
-        public static String getDes(String val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
     }
 
     /**
@@ -3083,7 +3077,6 @@ public class WmsEnumUtil {
     }
 
 
-
     /**
      * 任务数据来源：检查子数据
      */

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.wms.bean.WmsConfig;
+import org.springframework.stereotype.Repository;
 
 /**
  * @Description : 系统配置
@@ -10,6 +11,7 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsConfig;
  * @CreateDate : 2019-03-07 10:00
  * @Modify:
  **/
+@Repository
 public interface WmsConfigRepository extends BaseRepository<WmsConfig, Long> {
 
     /**