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

@@ -1208,7 +1208,8 @@ public class Constant {
     public enum IntoStatus {
         DAIRUKU("入库状态-待入库"),
         RUKUZHONG("入库状态-入库中"),
-        YIRUKU("入库状态-已入库");
+        YIRUKU("入库状态-已入库"),
+        ZUOFEI("入库状态-作废");
 
         private String name;
 
@@ -1366,7 +1367,11 @@ public class Constant {
         //销售渠道
         SALECHANNEL("dkic_b", "t_mst_sale_channel"),
         // 角色
-        ROLE("dkic_b", "t_mst_role");
+        ROLE("dkic_b", "t_mst_role"),
+        // 组织仓库
+        ORGWH("dkic_b", "t_mst_org_wh"),
+        // 组织资金账户
+        ORGMAC("dkic_b", "t_mst_org_mac");
 
         private String mode; // 模式名
         private String table;// 表名
@@ -1408,8 +1413,6 @@ public class Constant {
         PURRETURN_RETURN("入库类型-采退入库"),
         //盘盈入库
         PROFIT("入库类型-盘盈入库"),
-        //销退入库
-        PURRETURN("入库类型-销退入库"),
         //其他入库
         OTHER("入库类型-其他入库");
 
@@ -1440,8 +1443,6 @@ public class Constant {
         SALE("出库类型-销售出库"),
         //销售退货出库
         SALE_RETURN("出库类型-销退出库"),
-        //采退出库
-        PURRETURN("出库类型-采退出库"),
         //盘亏入库
         INVENTORY_LOSS("出库类型-盘亏出库"),
         //其他出库
@@ -1794,30 +1795,22 @@ public class Constant {
      * @date : 2024/3/21 9:04
      */
     public enum InventoryDocCode {
-        OUTBOUND("出库", "t_psi_outbound", "", "", ""),
-        INTOBOUND("入库", "t_psi_inbound", "", "", "");
-        //region todo 看后续是否需要
-//        OTHER_OUTBOUND("其他出库", "t_psi_outbound", "", "", ""),
-//        SALE_ORDER("销售出库", "t_psi_outbound", "", "", ""),
-//        SALE_RETURN("销退出库", "t_psi_outbound", "", "", ""),
-//        INVENTORY_LOSS("盘亏出库", "t_psi_outbound", "", "", ""),
-//        OTHER_INBOUND("其他入库", "t_psi_inbound", "", "", ""),
-//        PURCHASE_ORDER("采购入库", "t_psi_inbound", "", "", ""),
-//        PURCHASE_RETURN("采退入库", "t_psi_inbound", "", "", ""),
-//        INVENTORY_PROFIT("盘盈入库", "t_psi_inbound", "", "", ""),
-//        MOVE("库位移动", "t_psi_transfer", "", "", "");
+        OUTBOUND("出库", "t_psi_outbound"),
+        INTOBOUND("入库", "t_psi_inbound"),
+        OTHER_OUTBOUND("其他出库", "t_psi_outbound"),
+        SALE_ORDER("销售出库", "t_psi_outbound" ),
+        SALE_RETURN("销退出库", "t_psi_outbound" ),
+        INVENTORY_LOSS("盘亏出库", "t_psi_outbound" ),
+        OTHER_INBOUND("其他入库", "t_psi_inbound" ),
+        PURCHASE_ORDER("采购入库", "t_psi_inbound" ),
+        PURCHASE_RETURN("采退入库", "t_psi_inbound" ),
+        INVENTORY_PROFIT("盘盈入库", "t_psi_inbound" ),
+        MOVE("库位移动", "t_psi_transfer" );
         //endregion
         //单据类型名称
         private String value;
         //表名
         private String tableName;
-        //主键
-        private String primaryKey;
-        //有后续业务流程的才需要以下2个属性
-        //feign接口类路径
-        private String feignPath;
-        //feign接口方法名
-        private String methodName;
 
         public String getValue() {
             return value;
@@ -1827,24 +1820,9 @@ public class Constant {
             return tableName;
         }
 
-        public String getPrimaryKey() {
-            return primaryKey;
-        }
-
-        public String getFeignPath() {
-            return feignPath;
-        }
-
-        public String getMethodName() {
-            return methodName;
-        }
-
-        InventoryDocCode(String value, String tableName, String primaryKey, String feignPath, String methodName) {
+        InventoryDocCode(String value, String tableName) {
             this.value = value;
             this.tableName = tableName;
-            this.primaryKey = primaryKey;
-            this.feignPath = feignPath;
-            this.methodName = methodName;
         }
 
         //获取指定的枚举
@@ -1858,5 +1836,95 @@ 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;
+        }
+    }
+
+
+    /**
+     * @author : 寇珊珊
+     * @desc : 库存接收类型
+     * @date : 2024/3/21 9:35
+     */
+    public enum FlgAutoHandle {
+        TRUE(true),
+        FALSE(false);
+        private Boolean flag;
+
+        public Boolean getValue() {
+            return flag;
+        }
+
+        public void setValue(Boolean flag) {
+            this.flag = flag;
+        }
+
+        FlgAutoHandle(Boolean flag) {
+            this.flag = flag;
+        }
+    }
+    /**
+     * @author : 寇珊珊
+     * @desc : 库存接收类型系统参数
+     * @date : 2024/3/21 9:35
+     */
+    public enum FlgAutoHandleStringType {
+        ONE("1"),
+        ZERO("0");
+        private String flag;
+
+        public String getValue() {
+            return flag;
+        }
+
+        public void setValue(String flag) {
+            this.flag = flag;
+        }
+
+        FlgAutoHandleStringType(String flag) {
+            this.flag = flag;
+        }
+    }
+    /**
+     * @author : 寇珊珊
+     * @desc : 自动办理参数
+     * @date : 2024/3/21 9:35
+     */
+    public enum FlgHandleSetting {
+        TRUE(true),
+        FALSE(false);
+        private Boolean flag;
+
+        public Boolean getValue() {
+            return flag;
+        }
+
+        public void setValue(Boolean flag) {
+            this.flag = flag;
+        }
+
+        FlgHandleSetting(Boolean flag) {
+            this.flag = flag;
+        }
+    }
 }

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

@@ -45,7 +45,7 @@ public enum ErrorCodeEnum {
     INBOUND_CANNOT_BE_EMPTY(4006, "当前入库单不存在"),
     ISEXISTS_CUSPHONE(4007, "当前客户电话已存在"),
     NO_WAIT_INTO(4008, "非待入库单据不能删除"),
-    ITEMQTY_NO_LESS_INTOQTY(4009, "商品数量不能小于入库中数量"),
+    ITEMQTY_NO_LESS_INTOQTY(4009, "商品数量不能小于可转入库数量"),
     ITEMQTY_NO_LESS_OUTQTY(4010, "商品数量不能小于出库中数量"),
     OUTINGQTY_NO_LESS_OUTQTY(4011, "出库中数量不能小于出库数量"),
     INTOINGQTY_NO_LESS_INTOQTY(4012, "入库中数量不能小于入库数量"),
@@ -54,7 +54,13 @@ 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, "资金账户余额不足"),
+    AMT_HANDLE_NO_LESS_AMT_SHOULD(4019, "核销金额超出应收金额"),
+    CURRENT_INVOICE_ISACC(4020, "当前单据已记账"),
+    ACC_DATE_ISNULL(4020, "账务日期不能为空"),
+    CURRENT_INVOICE_ISREVERSE(4020, "当前单据已经反记账"),
+    CURRENT_INVOICE_ISHANDLE(4020, "当前单据已核销"),
     PURCHASE_RETURN_DETAIL_NOT_EXIST(11080,"采购退货明细不可为空，请重新操作"),
     INBOUND_ITEM_NOT_EXIST(11081,"入库明细不可为空，请重新操作"),
     ORIGINAL_DOCUMENT_ABSENT(11082,"单据所对应的原始单据不存在,不允许该操作！"),
@@ -74,10 +80,14 @@ public enum ErrorCodeEnum {
     QTY_IS_NULL(11095,"当前数据中数量为空！"),
     AMT_IS_NULL(11096,"当前数据中金额为空！"),
     COST_PRICE_IS_NULL(11097,"当前数据中成本单价为空！"),
-    DETAIL_LIST_IS_NUL(11098,"当前数据明细数据为空！"),
+    DETAIL_LIST_IS_NUL(11098,"明细数据为空！"),
     DETAIL_ITEM_ID_IS_NULL(11099,"当前数据中存在明细id为空的数据！"),
     INVENTORY_QUANTITY_HAS_EXCEEDED(11100,"库存数量已超出！"),
+    SKU_IS_NOT_IN_INVENTORY(11101,"当前出库商品中在库存中不存在！"),
+    CAN_OUTBOUND_QUANTITY_INSUFFICIENT(11102,"可出库数量不足！"),
 
+    NO_WAIT_INTO_RETURN(11104, "非出库中单据不能编辑"),
+    NO_WAIT_INTO_RETURN_CANCEL(11105, "已出库单据不能作废"),
 
     CUSTOMER_FOLLOW_MEASURE_STATUS_DONE(8007, "当前预约量尺已填写回执"),
     ;

src/main/java/com/dk/common/model/response/mst/OrgResponse.java

@@ -1,6 +1,7 @@
 package com.dk.common.model.response.mst;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
@@ -87,7 +88,7 @@ public class OrgResponse extends PageInfo<OrgResponse> implements Serializable {
     @Excel(name = "上层ID")
     @ApiModelProperty(value = "上层ID")
     @TableField(typeHandler = UuidListTypeHandler.class)
-    private String levelUpper;
+    private List<String> levelUpper;
 
 
     /**
@@ -96,7 +97,7 @@ public class OrgResponse extends PageInfo<OrgResponse> implements Serializable {
     @Excel(name = "下层ID")
     @ApiModelProperty(value = "下层ID")
     @TableField(typeHandler = UuidListTypeHandler.class)
-    private String levelLower;
+    private List<String> levelLower;
 
 
     /**
@@ -152,6 +153,7 @@ public class OrgResponse extends PageInfo<OrgResponse> implements Serializable {
      */
     @Excel(name = "企业ID")
     @ApiModelProperty(value = "企业ID")
+    @TableField(fill = FieldFill.INSERT)
     private Integer cpId;
 
 
@@ -219,12 +221,28 @@ public class OrgResponse extends PageInfo<OrgResponse> implements Serializable {
     private String opDbUser;
 
 
+    /**
+     * 组织资金账户
+     */
+    @Excel(name = "组织资金账户")
+    @ApiModelProperty(value = "组织资金账户")
+    private String orgMac;
+
+    /**
+     * 组织仓库
+     */
+    @Excel(name = "组织仓库")
+    @ApiModelProperty(value = "组织仓库")
+    private String whName;
+
     @ApiModelProperty(value = "")
     private String orgCode;
 
     @TableField(exist = false)
     private List<OrgResponse> itemData;
 
+
+
     /*
      * 相关属性
      * @TableField(exist = false)

src/main/java/com/dk/common/model/vo/mst/OrgVO.java

@@ -1,13 +1,15 @@
 package com.dk.common.model.vo.mst;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.TimestampTypeHandler;
+import com.dk.common.infrastructure.handler.UuidListTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -17,18 +19,20 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
 
 /**
- *  组织部门
+ *  组织机构
  */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@ExportTitle("组织部门")
-@TableName(value = "t_mst_org",schema ="dkic_b", autoResultMap = true)
+@ExportTitle("组织机构")
+@TableName(value = "t_mst_org", autoResultMap = true, schema =  "dkic_b")
 @ApiModel(value="实体类：组织机构", description="表名：t_mst_org")
 public class OrgVO extends PageInfo<OrgVO> implements Serializable {
 
@@ -39,21 +43,13 @@ public class OrgVO extends PageInfo<OrgVO> implements Serializable {
     /**
      * 组织ID
      */
-    @TableId(value = "org_id", type = IdType.AUTO)
+//    @TableId(value = "org_id", type = IdType.AUTO)
     @ApiModelProperty(value = "组织ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String orgId;
 
 
     /**
-     * 组织代码
-     */
-    @Excel(name = "组织代码")
-    @ApiModelProperty(value = "组织代码")
-    private String orgCode;
-
-
-    /**
      * 组织名称
      */
     @Excel(name = "组织名称")
@@ -69,19 +65,15 @@ public class OrgVO extends PageInfo<OrgVO> implements Serializable {
     @TableField(typeHandler = UuidTypeHandler.class)
     private String parentId;
 
-    /**
-     * 工厂ID
-     */
-    @ApiModelProperty(value = "工厂ID")
-    private Integer cpId;
 
     /**
-     * 显示顺序
+     * 显示顺序 (【1 ～ 46655】)
      */
-    @Excel(name = "显示顺序")
-    @ApiModelProperty(value = "显示顺序")
+    @Excel(name = "显示顺序 (【1 ～ 46655】)")
+    @ApiModelProperty(value = "显示顺序 (【1 ～ 46655】)")
     private Integer displayNo;
 
+
     /**
      * 顶层ID
      */
@@ -90,6 +82,170 @@ public class OrgVO extends PageInfo<OrgVO> implements Serializable {
     @TableField(typeHandler = UuidTypeHandler.class)
     private String topId;
 
+
+    /**
+     * 上层ID
+     */
+    @Excel(name = "上层ID")
+    @ApiModelProperty(value = "上层ID")
+    @TableField(typeHandler = UuidListTypeHandler.class)
+    private List<String> levelUpper;
+
+
+    /**
+     * 下层ID
+     */
+    @Excel(name = "下层ID")
+    @ApiModelProperty(value = "下层ID")
+    @TableField(typeHandler = UuidListTypeHandler.class)
+    private List<String> levelLower;
+
+
+    /**
+     * 末级标识
+     */
+    @Excel(name = "末级标识")
+    @ApiModelProperty(value = "末级标识")
+    private Boolean levelLeaf;
+
+
+    /**
+     * 层级序号
+     */
+    @Excel(name = "层级序号")
+    @ApiModelProperty(value = "层级序号")
+    private Integer levelNo;
+
+
+    /**
+     * 层级代码
+     */
+    @Excel(name = "层级代码")
+    @ApiModelProperty(value = "层级代码")
+    private String levelCode;
+
+
+    /**
+     * 层级全称 (【 / 】)
+     */
+    @Excel(name = "层级全称 (【 / 】)")
+    @ApiModelProperty(value = "层级全称 (【 / 】)")
+    private String levelName;
+
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+
+    /**
+     * 有效标识 (1：正常 0：停用)
+     */
+    @Excel(name = "有效标识 (1：正常 0：停用)")
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private Boolean flgValid;
+
+
+    /**
+     * 企业ID
+     */
+    @Excel(name = "企业ID")
+    @ApiModelProperty(value = "企业ID")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer cpId;
+
+
+    /**
+     * 创建时间 (触发器自动处理)
+     */
+    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
+    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime opCreateTime;
+
+
+    /**
+     * 创建用户 (触发器自动处理)
+     */
+    @Excel(name = "创建用户 (触发器自动处理)")
+    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String opCreateUserId;
+
+
+    /**
+     * 修改时间 (触发器自动处理)
+     */
+    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
+    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime opUpdateTime;
+
+
+    /**
+     * 修改用户 (触发器自动处理)
+     */
+    @Excel(name = "修改用户 (触发器自动处理)")
+    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String opUpdateUserId;
+
+
+    /**
+     * 数据操作应用 (触发器自动处理)
+     */
+    @Excel(name = "数据操作应用 (触发器自动处理)")
+    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
+    private String opAppCode;
+
+
+    /**
+     * 数据时间戳 (触发器自动处理)
+     */
+    @Excel(name = "数据时间戳 (触发器自动处理)")
+    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime opTimestamp;
+
+
+    /**
+     * 数据操作数据库用户 (触发器自动处理)
+     */
+    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
+    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
+    private String opDbUser;
+
+    @ApiModelProperty(value = "仓库明细")
+    private List<Map<String, Object>> warehouseList;
+
+    @ApiModelProperty(value = "资金账户明细")
+    private List<Map<String, Object>> macList;
+
+    @ApiModelProperty(value = "")
+    private String orgCode;
+
+    @TableField(exist = false)
+    private List<OrgVO> itemData;
+
+
+
+    /*
+     * 相关属性
+     * @TableField(exist = false)
+     */
+
+    /*
+     * 关联属性 + 查询条件
+     * @TableField(exist = false)
+     */
+
+
     private static final long serialVersionUID = 1L;
 
 }