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

@@ -861,8 +861,17 @@ public class Constant {
      */
     public enum docNameConstant {
         ROLE("角色"),
+        BRAND("品牌"),
+        SERIES("系列"),
+        CATEGORY("种类"),
+        UNIT("单位"),
+        WAREHOUSE("仓库档案"),
+        SALECHANNEL("销售渠道"),
         STAFF("员工档案"),
-        ORDER("销售订单")
+        CUSTOMER("客户档案"),
+        ORDER("销售订单"),
+        MONEYACCOUNT("资金账号"),
+        PURCHASE("采购订单"),
         ;
 
         private String name;
@@ -1141,9 +1150,9 @@ public class Constant {
      */
     public enum DocumentType {
         //采购订单
-        PUR_CHASE("采购订单"),
+        PUR_CHASE("订单类型-采购订单"),
         //销售订单
-        ORDER_CHASE("销售订单") ;
+        ORDER_CHASE("订单类型-采购订单") ;
 
         private String name;
 
@@ -1244,4 +1253,62 @@ public class Constant {
             this.code = code;
         }
     }
+
+    /**
+     * @desc   : 订单状态
+     * @author : 常皓宁
+     * @date   : 2024/3/2 9:05
+     */
+    public enum Status {
+        //成交
+        STATUS_DEAL("订单状态-成交"),
+        //销售订单
+        ORDER_STAGING("订单状态-暂存") ;
+
+        private String name;
+
+        // get set 方法
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        // 构造方法
+        Status(String name) {
+            this.name = name;
+        }
+    }
+
+    /**
+     * @desc   : 销售状态
+     * @author : 付斌
+     * @date   : 2024-03-02 17:12
+     */
+    public enum SaleStatus {
+        //公海
+        GONGHAI("销售状态-公海"),
+        //潜客
+        QIANKE("销售状态-潜客"),
+        //成交
+        CHENGJIAO("销售状态-成交") ;
+
+        private String name;
+
+        // get set 方法
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        // 构造方法
+        SaleStatus(String name) {
+            this.name = name;
+        }
+    }
 }

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

@@ -29,15 +29,19 @@ public enum ErrorCodeEnum {
 
     SYSTEM_NULL(2001, "系统不存在"),
     API_NOT_EXIST(3001, "接口未注册，不可访问"),
-
-
     FACTORY_CODE_EXISTS(4001, "工厂编码已存在"),
+
+    COMPANY_CODE_EXISTS(4000, "改公司名称已存在"),
     STAFF_CODE_EXISTS(4002, "员工编码已存在"),
 
     ORGANIZATION_CANNOT_BE_EMPTY(4003, "组织结构不能为空"),
     STAFF_CANNOT_BE_EMPTY(4004, "员工不能为空"),
     SUPLIER_CANNOT_BE_EMPTY(4005, "供应商不能为空"),
     PURCHASE_CANNOT_BE_EMPTY(4006, "当前采购订单不存在"),
+    ISEXISTS_CUSPHONE(4007, "当前客户电话已存在"),
+    NO_WAIT_INTO(4008, "非待入库单据不能删除"),
+    ITEMQTY_NO_LESS_INTOQTY(4009, "商品数量不能小于入库中数量"),
+    ITEMQTY_NO_LESS_OUTQTY(4010, "商品数量不能小于出库中数量"),
     ;
 
     private int code;

src/main/java/com/dk/common/model/response/sale/CustomerResponse.java

@@ -1,468 +0,0 @@
-package com.dk.common.model.response.sale;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.dk.common.infrastructure.handler.BigIntListTypeHandler;
-import com.dk.common.infrastructure.handler.JsonTypeHandler;
-import com.dk.common.infrastructure.handler.StringListTypeHandler;
-import com.dk.common.infrastructure.handler.TimestampTypeHandler;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * @desc   : 客户资料响应类
- * @author : 洪旭东
- * @date   : 2022-05-23 14:41
- */
-@Data
-public class CustomerResponse {
-
-    /**
-     * 客户ID
-     */
-    private Long customerId;
-
-
-    /**
-     * 客户代码 (电话号码-[截取ID后3位]:触发器)
-     */
-    @Excel(name = "客户代码 (电话号码-[截取ID后3位]:触发器)")
-    private String customerCode;
-
-
-    /**
-     * 客户名称
-     */
-    @Excel(name = "客户名称")
-    private String customerName;
-
-
-    /**
-     * 客户电话
-     */
-    @Excel(name = "客户电话")
-    private String customerPhone;
-
-    /**
-     * 联系人
-     */
-    @Excel(name = "联系人")
-    private String contactName;
-
-
-    /**
-     * 联系电话
-     */
-    @Excel(name = "联系电话")
-    @TableField(typeHandler = StringListTypeHandler.class)
-    private List<String> contactPhones;
-
-    /**
-     * 报备人
-     */
-    private Long reportUser;
-    /**
-     * 报备人名称
-     */
-    @Excel(name = "报备人名称")
-    @ApiModelProperty(value = "报备人名称")
-    private String reportUserName;
-
-    /**
-     * 行政区划 (省，市，区ID)
-     */
-    @Excel(name = "行政区划 (省，市，区ID)")
-    private JSONObject addressArea;
-
-    /**
-     * 详细地址
-     */
-    @Excel(name = "详细地址")
-    private String addressFull;
-
-    /**
-     * 门牌号
-     */
-    @Excel(name = "门牌号")
-    @ApiModelProperty(value = "门牌号")
-    private String addressNo;
-
-    /**
-     * 发票类型 (【系统字典】)
-     */
-    @Excel(name = "发票类型 (【系统字典】)")
-    private String invoiceType;
-
-    /**
-     * 税率
-     */
-    @Excel(name = "税率")
-    private BigDecimal taxRate;
-
-    /**
-     * 票头
-     */
-    @Excel(name = "票头")
-    private String invoiceHeader;
-
-    /**
-     * 税号
-     */
-    @Excel(name = "税号")
-    private String taxNo;
-    /**
-     * 开户银行
-     */
-    @Excel(name = "开户银行")
-    private String bankDeposit;
-
-
-    /**
-     * 开户账号
-     */
-    @Excel(name = "开户账号")
-    private String bankAccount;
-
-    /**
-     * 备注
-     */
-    @Excel(name = "备注")
-    private String remarks;
-
-    /**
-     * 客户标签 (【商户标签】)
-     */
-    private List<Long> customerTags;
-    @Excel(name = "客户标签 (【商户标签】)")
-    private String customerTagNames;
-
-    /**
-     * 成交状态
-     */
-    @ApiModelProperty(value = "成交状态")
-    private String saleStatus;
-    @Excel(name = "成交状态")
-    @ApiModelProperty(value = "成交状态")
-    private String saleStatusName;
-
-    /**
-     * 小区或POI
-     */
-    @Excel(name = "小区或POI")
-    @ApiModelProperty(value = "小区或POI")
-    private String addressName;
-
-    /**
-     * 销售渠道
-     */
-    @Excel(name = "销售渠道")
-    @ApiModelProperty(value = "销售渠道")
-    private Long salesChannel;
-
-    /**
-     * 客户来源
-     */
-    @Excel(name = "客户来源")
-    @ApiModelProperty(value = "客户来源")
-    private Long customerFrom;
-
-    /**
-     * 卫生间数
-     */
-    @Excel(name = "卫生间数")
-    @ApiModelProperty(value = "卫生间数")
-    private Long toiletCount;
-    private String toiletCountName;
-
-
-    /**
-     * 房屋类型 (【集团字典】)
-     */
-    @Excel(name = "房屋类型 (【集团字典】)")
-    @ApiModelProperty(value = "房屋类型 (【集团字典】)")
-    private Long houseType;
-
-    /**
-     * 装修类型 (【集团字典】)
-     */
-    @Excel(name = "装修类型 (【集团字典】)")
-    @ApiModelProperty(value = "装修类型 (【集团字典】)")
-    private Long fitupType;
-
-
-    /**
-     * 装修风格 (【集团字典】)
-     */
-    @Excel(name = "装修风格 (【集团字典】)")
-    @ApiModelProperty(value = "装修风格 (【集团字典】)")
-    private Long fitupStyle;
-
-
-    /**
-     * 年龄构成 (【集团字典】)
-     */
-    @Excel(name = "年龄构成 (【集团字典】)")
-    @ApiModelProperty(value = "年龄构成 (【集团字典】)")
-    private Long ageComposition;
-
-
-    /**
-     * 决策者 (【集团字典】)
-     */
-    @Excel(name = "决策者 (【集团字典】)")
-    @ApiModelProperty(value = "决策者 (【集团字典】)")
-    private Long decisionMaker;
-
-
-    /**
-     * 外部联系人的userid
-     */
-    @Excel(name = "外部联系人的userid")
-    @ApiModelProperty(value = "外部联系人的userid")
-    private String qvExternalUserid;
-
-    /**
-     * 房屋类型 (【集团字典】)
-     */
-    @Excel(name = "房屋类型 (【集团字典】)")
-    @ApiModelProperty(value = "房屋类型 (【集团字典】)")
-    private String houseTypeName;
-
-    /**
-     * 装修类型 (【集团字典】)
-     */
-    @Excel(name = "装修类型 (【集团字典】)")
-    @ApiModelProperty(value = "装修类型 (【集团字典】)")
-    private String fitupTypeName;
-
-
-    /**
-     * 装修风格 (【集团字典】)
-     */
-    @Excel(name = "装修风格 (【集团字典】)")
-    @ApiModelProperty(value = "装修风格 (【集团字典】)")
-    private String fitupStyleName;
-
-
-    /**
-     * 年龄构成 (【集团字典】)
-     */
-    @Excel(name = "年龄构成 (【集团字典】)")
-    @ApiModelProperty(value = "年龄构成 (【集团字典】)")
-    private String ageCompositionName;
-
-
-    /**
-     * 决策者 (【集团字典】)
-     */
-    @Excel(name = "决策者 (【集团字典】)")
-    @ApiModelProperty(value = "决策者 (【集团字典】)")
-    private String decisionMakerName;
-
-
-    /**
-     * 创建时间
-     */
-    @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 = "下次跟进时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime nextFollowTime;
-
-    /**
-     * 下次跟进计划
-     */
-    @Excel(name = "下次跟进计划")
-    @ApiModelProperty(value = "下次跟进计划")
-    private String nextFollowPlan;
-
-    /**
-     * 门店 部门中的门店类型
-     */
-    private Long orgId;
-    @Excel(name = "门店")
-    @ApiModelProperty(value = "门店")
-    private String orgName;
-
-    /**
-     * 跟进次数
-     */
-    @Excel(name = "跟进次数")
-    @ApiModelProperty(value = "跟进次数")
-    private Integer followCount;
-
-    /**
-     * 客户来源
-     */
-    @Excel(name = "客户来源")
-    @ApiModelProperty(value = "客户来源")
-    private String customerFromName;
-
-    /**
-     * 意向标签
-     */
-    @Excel(name = "意向标签")
-    @ApiModelProperty(value = "意向标签")
-    @TableField(typeHandler = StringListTypeHandler.class)
-    private List<String> intentionTags;
-    private String intentionTagsName;
-
-    /**
-     * 意向数量
-     */
-    @Excel(name = "意向数量")
-    @ApiModelProperty(value = "意向数量")
-    private Integer intentionQuantity;
-
-    /**
-     * 性别
-     */
-    @Excel(name = "性别")
-    @ApiModelProperty(value = "性别")
-    private String gender;
-
-    /**
-     * 最后跟进时间
-     */
-    @Excel(name = "最后跟进时间")
-    @ApiModelProperty(value = "最后跟进时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime lastFollowTime;
-
-    /**
-     * 跟进时间
-     */
-    @Excel(name = "跟进时间")
-    @ApiModelProperty(value = "跟进时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime followTime;
-
-    /**
-     * 跟进人
-     */
-    @ApiModelProperty(value = "跟进人")
-    private String followUserName;
-
-    /**
-     * 跟进内容
-     */
-    @Excel(name = "跟进内容")
-    @ApiModelProperty(value = "跟进内容")
-    private String followData;
-
-    /**
-     * 跟进ID
-     */
-    @ApiModelProperty(value = "跟进ID")
-    private Long followId;
-
-    /**
-     * 跟进状态 (【系统字典】接待、报备、跟进、邀约、报价、成交)
-     */
-    @Excel(name = "跟进状态 (【系统字典】接待、报备、跟进、邀约、报价、成交)")
-    @ApiModelProperty(value = "跟进状态 (【系统字典】接待、报备、跟进、邀约、报价、成交)")
-    private String followStatus;
-
-
-    /**
-     * 地址坐标(gcj02) (latitude：纬度的值 longitude：经度的值)
-     */
-    @Excel(name = "地址坐标(gcj02) (latitude：纬度的值 longitude：经度的值)")
-    @ApiModelProperty(value = "地址坐标(gcj02) (latitude：纬度的值 longitude：经度的值)")
-    @TableField(typeHandler = JsonTypeHandler.class)
-    private JSONObject addressGcj02;
-
-    /**
-     * 小区档案
-     */
-    private Long estateId;
-    private String estateName;
-
-    /**
-     * 附件数组[{usedLocation：使用位置 annexPaths：图片数组}]
-     */
-    @Excel(name = "量尺附件")
-    @ApiModelProperty(value = "量尺附件")
-    @TableField(typeHandler = JsonTypeHandler.class)
-    private JSONArray measureAnnex;
-
-
-    /**
-     * {annexPaths：图片数组}
-     */
-    @Excel(name = "跟进附件")
-    @ApiModelProperty(value = "跟进附件")
-    @TableField(typeHandler = JsonTypeHandler.class)
-    private JSONObject annexPaths;
-
-    /**
-     * 复尺标识
-     */
-    @Excel(name = "复尺标识")
-    @ApiModelProperty(value = "复尺标识")
-    private String flgAgainMeasure;
-
-    /**
-     * 量尺备注
-     */
-    @Excel(name = "量尺备注")
-    @ApiModelProperty(value = "量尺备注")
-    private String measureRemarks;
-
-    /**
-     * 量尺时间
-     */
-    @Excel(name = "量尺时间")
-    @ApiModelProperty(value = "量尺时间")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime measureTime;
-
-    @ApiModelProperty(value = "最后跟进人")
-    private String lastFollowUserName;
-
-    /**
-     * 当前跟进人
-     */
-    @ApiModelProperty(value = "当前跟进人")
-    private List<Long> followUsers;
-    private String followUserNames;
-
-    /**
-     * 跟进任务ID
-     */
-    private Long planId;
-
-    /**
-     * 流失原因
-     */
-    @ApiModelProperty(value = "流失原因")
-    private String loseReasonName;
-
-
-    @ApiModelProperty(value = "微信UnionID")
-    private String wxUnionid;
-
-    private Long customerClassified;
-
-    private String customerClassifiedName;
-
-}