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

# Conflicts:
#	src/main/java/com/dk/common/infrastructure/constant/Constant.java

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

@@ -877,6 +877,7 @@ public class Constant {
         RECPAY("收付款单"),
         RECEIVABLE("应收款单"),
         ORDEROUT("出库退货"),
+        PURCHASEOUT("采购退货"),
         OUTBOUND("出库单"),
         MONEYACCOUNT("资金账号"),
         PURCHASE("采购订单"),
@@ -1638,14 +1639,14 @@ public class Constant {
 
     /**
      * @author : 付斌
-     * @desc : 应收类型
+     * @desc : 账款类型
      * @date : 2024-03-15 13:35
      */
-    public enum recType {
-        XIAO_SHOU("应收类型-销售"),
-        XIAO_TUI("应收类型-销退"),
-        SHOU_KUAN("应收类型-收款"),
-        TUI_KUAN("应收类型-退款");
+    public enum accItemType {
+        YING_SHOU("账款类型-应收"),
+        YING_FU("账款类型-应付"),
+        SHOU_KUAN("账款类型-收款"),
+        FU_KUAN("账款类型-付款");
 
         private String name;
 
@@ -1657,7 +1658,7 @@ public class Constant {
             this.name = name;
         }
 
-        recType(String name) {
+        accItemType(String name) {
             this.name = name;
         }
     }
@@ -1668,9 +1669,9 @@ public class Constant {
      * @date : 2024-03-15 13:42
      */
     public enum recStatuse {
-        QUE_DING("应收状态-确定"),
-        BU_FEN("应收状态-部分"),
-        WAN_CHENG("应收状态-完成");
+        QUE_DING("账务状态-确定"),
+        BU_FEN("账务状态-部分"),
+        WAN_CHENG("账务状态-完成");
 
         private String name;
 
@@ -1688,15 +1689,66 @@ public class Constant {
     }
 
     /**
-     * @desc   : 库存接收类型
-     * @date   : 2024/3/21 9:35
+     * @author : 付斌
+     * @desc :账务对象类型
+     * @date : 2024-03-15 13:42
+     */
+    public enum OwnerType {
+        Z_ORG("归属类型-主部门"),
+        C_ORG("归属类型-从部门"),
+        Z_STAFF("归属类型-主员工"),
+        C_STAFF("归属类型-从员工");
+
+        private String name;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        OwnerType(String name) {
+            this.name = name;
+        }
+    }
+
+    /**
+     * @author : 付斌
+     * @desc :账务对象类型
+     * @date : 2024-03-15 13:42
+     */
+    public enum ObjectType {
+        CUS("对象类型-客户"),
+        SUP("对象类型-供应商"),
+        ORG("对象类型-部门"),
+        STAFF("对象类型-人员");
+
+        private String name;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        ObjectType(String name) {
+            this.name = name;
+        }
+    }
+
+    /**
      * @author : 寇珊珊
+     * @desc : 库存接收类型
+     * @date : 2024/3/21 9:35
      */
-    public enum  InventoryType{
+    public enum InventoryType {
         OUTBOUND("出库"),
         INBOUND("入库"),
         MOVE("库位移动");
-
         private String name;
 
         public String getName() {
@@ -1713,9 +1765,9 @@ public class Constant {
     }
 
     /**
-     * @desc   : 库存接收类型对应的数据库
-     * @date   : 2024/3/21 9:04
      * @author : 寇珊珊
+     * @desc : 库存接收类型对应的数据库
+     * @date : 2024/3/21 9:04
      */
     public enum InventoryDocCode {
         OUTBOUND("出库", "t_psi_outbound", "", "", ""),
@@ -1770,10 +1822,11 @@ public class Constant {
             this.feignPath = feignPath;
             this.methodName = methodName;
         }
+
         //获取指定的枚举
         public static InventoryDocCode getByValue(String value) {
             for (InventoryDocCode doc : values()) {
-                if (doc.getValue().equals(value) ) {
+                if (doc.getValue().equals(value)) {
                     return doc;
                 }
             }
@@ -1782,6 +1835,4 @@ public class Constant {
     }
 
 
-
-
 }

src/main/java/com/dk/common/infrastructure/enums/ErrorCodeEnum.java

@@ -54,6 +54,7 @@ public enum ErrorCodeEnum {
     ISFLGVALID_FALSE(4015, "当前单据已经作废，不能重复操作"),
     RETURNQTY_NO_LESS_INTOINGQTY(4016, "退货数量不能小于入库中数量"),
     FREEZEQTY_NO_LESS_USABLEQTY(4017, "冻结数量不能小于库存可售数量"),
+    RESIDUE_NO_LESS(4018, "账户可用余额不足，不能退款"),
     PURCHASE_RETURN_DETAIL_NOT_EXIST(11080,"采购退货明细不可为空，请重新操作"),
     INBOUND_ITEM_NOT_EXIST(11081,"入库明细不可为空，请重新操作"),
     ORIGINAL_DOCUMENT_ABSENT(11082,"单据所对应的原始单据不存在,不允许该操作！"),