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

@@ -1838,5 +1838,27 @@ public class Constant {
         }
     }
 
+    /**
+     * @author : 付斌
+     * @desc :资金流水类型
+     * @date : 2024-03-15 13:42
+     */
+    public enum FlowType {
+        SHOU_FU_KUAN("资金流水类型-收付款"),
+        ZHUAN_ZHANG("资金流水类型-转账");
 
+        private String name;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        FlowType(String name) {
+            this.name = name;
+        }
+    }
 }

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

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