Merge remote-tracking branch 'origin/dev' into dev

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderPrefix.java

@@ -18,62 +18,12 @@ public enum EOrderPrefix {
     /**
      * 销售订单
      */
-    ORDER_CODE("BFSO", "销售订单"),
-
-    /**
-     * 采购订单
-     */
-    PO_ORDER_CODE("PO", "采购订单"),
-
-    /**
-     * 采购入库
-     */
-    IC_PURCHASE_CODE("PI", "采购入库"),
-
-    /**
-     * 其他入库
-     */
-    IC_GENERAL_IN_CODE("OI", "其他入库"),
-
-    /**
-     * 其他出库
-     */
-    IC_GENERAL_OUT_CODE("OD", "其他出库"),
-
-    /**
-     * 销售出库
-     */
-    IC_SALE_OUT_CODE("SD", "销售出库"),
-
-    /**
-     * 调拨订单
-     */
-    TR_ORDER_CODE("TO", "调拨订单"),
-
-    /**
-     * 调拨入库
-     */
-    TR_TRANS_IN_CODE("TI", "调拨入库"),
-
-    /**
-     * 调拨出库
-     */
-    TR_TRANS_OUT_CODE("TD", "调拨出库"),
-
-    /**
-     * 盘点
-     */
-    INVENTORY_CODE("IO", "库存盘点"),
-
-    /**
-     * 采购订单
-     */
-    IO_ORDER_CODE("BO", "业务领用订单"),
+    ORDER_CODE("ZKSO", "销售订单"),
 
     /**
      * 发货单
      */
-    DELIVERY_CODE("BFSD", "发货单"),
+    DELIVERY_CODE("ZKSD", "发货单"),
 
     /**
      * 充值
@@ -174,20 +124,12 @@ public enum EOrderPrefix {
      */
     PRODUCT_CODE("PC", "产品编号"),
 
-    /**
-     * 供应商相关
-     */
-    SUPPLIER("SR", "供应商相关"),
-
     /**
      * K值风控
      */
-    RISK_CONTROL("KZ", "K值风控"),
+    RISK_CONTROL("KZ", "K值风控")
 
-    /**
-     * 产品相关
-     */
-    PRODUCT("CP", "产品相关");
+    ;
 
     /**
      * 实际值

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESystemType.java

@@ -16,7 +16,7 @@ public enum ESystemType {
     /**
      * 默认（新零售）
      */
-    DEFAULT(2, "新零售", 0),
+    DEFAULT(2, "众康", 0),
 
     /**
      * 全部
@@ -53,19 +53,4 @@ public enum ESystemType {
         return null;
     }
 
-    /**
-     * 获取有效系统类型
-     *
-     * @return
-     */
-    public static List<ESystemType> getEnableList() {
-        List<ESystemType> list = new ArrayList<>();
-        for (ESystemType enums : ESystemType.values()) {
-            if (EYesNo.YES.getIntValue() == enums.getEnable()) {
-                list.add(enums);
-            }
-        }
-        return list;
-    }
-
 }