Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-dependency-common

src/main/java/com/dk/common/infrastructure/constant/Constant.java

@@ -875,6 +875,7 @@ public class Constant {
         CUSTOMERFOLLOW("客户跟进"),
         ORDER("销售订单"),
         CUSRECEIPT("客户收款单"),
+        RECEIVABLE("应收款单"),
         ORDEROUT("出库退货"),
         OUTBOUND("出库单"),
         MONEYACCOUNT("资金账号"),
@@ -1340,26 +1341,25 @@ public class Constant {
      */
     public enum DisplayNoTable {
         // 组织机构
-        ORG("dkic_b","t_mst_org"),
+        ORG("dkic_b", "t_mst_org"),
         // 资金账户
-        MONEYACCOUNT("dkic_b","t_mst_money_account"),
+        MONEYACCOUNT("dkic_b", "t_mst_money_account"),
         // 数据字典
-        DICTIONARYDATA("dkic_b","t_mst_dictionary_data"),
+        DICTIONARYDATA("dkic_b", "t_mst_dictionary_data"),
         //商品品牌
-        GOODSBRAND("dkic_b","t_mst_goods_brand"),
+        GOODSBRAND("dkic_b", "t_mst_goods_brand"),
         //商品种类
-        GOODSCATEGORY("dkic_b","t_mst_goods_category"),
+        GOODSCATEGORY("dkic_b", "t_mst_goods_category"),
         //商品系列
-        GOODSSERIES("dkic_b","t_mst_goods_series"),
+        GOODSSERIES("dkic_b", "t_mst_goods_series"),
         //计量单位
-        UNIT("dkic_b","t_mst_unit"),
+        UNIT("dkic_b", "t_mst_unit"),
         //仓库
-        WAREHOUSE("dkic_b","t_mst_warehouse"),
+        WAREHOUSE("dkic_b", "t_mst_warehouse"),
         //销售渠道
-        SALECHANNEL("dkic_b","t_mst_sale_channel"),
+        SALECHANNEL("dkic_b", "t_mst_sale_channel"),
         // 角色
-        ROLE("dkic_b","t_mst_role")
-        ;
+        ROLE("dkic_b", "t_mst_role");
 
         private String mode; // 模式名
         private String table;// 表名
@@ -1390,9 +1390,9 @@ public class Constant {
     }
 
     /**
-     * @desc   : 入库类型
      * @author : 付斌
-     * @date   : 2024-03-06 9:03
+     * @desc : 入库类型
+     * @date : 2024-03-06 9:03
      */
     public enum IntoType {
         //采购入库
@@ -1400,7 +1400,7 @@ public class Constant {
         //销退入库
         PURRETURN("入库类型-销退入库"),
         //其他入库
-        OTHER("入库类型-其他入库") ;
+        OTHER("入库类型-其他入库");
 
         private String name;
 
@@ -1420,9 +1420,9 @@ public class Constant {
     }
 
     /**
-     * @desc   : 出库类型
      * @author : 付斌
-     * @date   : 2024-03-06 9:03
+     * @desc : 出库类型
+     * @date : 2024-03-06 9:03
      */
     public enum OutType {
         //销售出库
@@ -1430,7 +1430,7 @@ public class Constant {
         //采退出库
         PURRETURN("出库类型-采退出库"),
         //其他出库
-        OTHER("出库类型-其他出库") ;
+        OTHER("出库类型-其他出库");
 
         private String name;
 
@@ -1534,8 +1534,7 @@ public class Constant {
      */
     public enum IntentionConstant {
         SEA("客户意向-放入公海"),
-        LOST("客户意向-已流失")
-        ;
+        LOST("客户意向-已流失");
 
         private String value;
 
@@ -1575,10 +1574,7 @@ public class Constant {
         CUSTOMER_INTENTION1("客意品类-智能"),
         CUSTOMER_INTENTION2("客意品类-定制"),
 
-        FOLLOW_INVITE_RESULT("邀约结果-接受")
-
-
-        ;
+        FOLLOW_INVITE_RESULT("邀约结果-接受");
 
         private String value;
 
@@ -1596,4 +1592,54 @@ public class Constant {
         }
     }
 
+    /**
+     * @author : 付斌
+     * @desc : 应收类型
+     * @date : 2024-03-15 13:35
+     */
+    public enum recType {
+        XIAO_SHOU("应收类型-销售"),
+        XIAO_TUI("应收类型-销退"),
+        SHOU_KUAN("应收类型-收款"),
+        TUI_KUAN("应收类型-退款");
+
+        private String name;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        recType(String name) {
+            this.name = name;
+        }
+    }
+
+    /**
+     * @author : 付斌
+     * @desc :应收状态
+     * @date : 2024-03-15 13:42
+     */
+    public enum recStatuse {
+        QUE_DING("应收状态-确定"),
+        BU_FEN("应收状态-部分"),
+        WAN_CHENG("应收状态-完成");
+
+        private String name;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        recStatuse(String name) {
+            this.name = name;
+        }
+    }
 }