Joshi
6835a35c02
- 将CrmOrder、CrmOrderItem及其相关BO、VO类中的orderId和itemId字段从String类型改为Long类型 - 修改selectOrderItemsByOrderIds方法参数类型为List<Long> - 在CrmOrderItemController中新增根据订单ID和合同ID查询配卷的接口 - 实现queryCoilsByOrderId和queryCoilsByContractId服务方法 - 移除WmsMaterialCoilServiceImpl中冗余的嵌套对象构建逻辑 - 更新销售报表中订单ID的类型转换和分组逻辑以适配Long类型
105 lines
1.9 KiB
Java
105 lines
1.9 KiB
Java
package com.klp.crm.domain;
|
||
|
||
import com.baomidou.mybatisplus.annotation.*;
|
||
import com.klp.common.core.domain.BaseEntity;
|
||
import lombok.Data;
|
||
import lombok.EqualsAndHashCode;
|
||
|
||
import java.math.BigDecimal;
|
||
import java.util.Date;
|
||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||
|
||
/**
|
||
* 正式订单主对象 crm_order
|
||
*
|
||
* @author klp
|
||
* @date 2025-12-15
|
||
*/
|
||
@Data
|
||
@EqualsAndHashCode(callSuper = true)
|
||
@TableName("crm_order")
|
||
public class CrmOrder extends BaseEntity {
|
||
|
||
private static final long serialVersionUID=1L;
|
||
|
||
/**
|
||
* 订单ID（主键）
|
||
*/
|
||
@TableId(value = "order_id")
|
||
private Long orderId;
|
||
/**
|
||
* 订单编号
|
||
*/
|
||
private String orderCode;
|
||
/**
|
||
* 订单类型：pre-预订单，formal-正式订单
|
||
*/
|
||
private Long orderType;
|
||
/**
|
||
* 关联客户ID
|
||
*/
|
||
private String customerId;
|
||
/**
|
||
* 订单总金额
|
||
*/
|
||
private BigDecimal orderAmount;
|
||
/**
|
||
* 销售员
|
||
*/
|
||
private String salesman;
|
||
/**
|
||
* 交货日期
|
||
*/
|
||
private Date deliveryDate;
|
||
/**
|
||
* 预订单状态
|
||
*/
|
||
private Long preOrderStatus;
|
||
/**
|
||
* 审核人
|
||
*/
|
||
private String auditUser;
|
||
/**
|
||
* 审核时间
|
||
*/
|
||
private Date auditTime;
|
||
/**
|
||
* 订单状态
|
||
*/
|
||
private Long orderStatus;
|
||
/**
|
||
* 财务状态
|
||
*/
|
||
private Long financeStatus;
|
||
/**
|
||
* 未结款数额
|
||
*/
|
||
private BigDecimal unpaidAmount;
|
||
/**
|
||
* 备注
|
||
*/
|
||
private String remark;
|
||
|
||
/**
|
||
* 合同号
|
||
*/
|
||
private String contractCode;
|
||
|
||
/**
|
||
* 关联合同ID（wms_contract.contract_id）
|
||
*/
|
||
private Long contractId;
|
||
|
||
/**
|
||
* 附件（多个文件URL用逗号分隔）
|
||
*/
|
||
private String annexFiles;
|
||
|
||
/**
|
||
* 删除标识 0正常 2删除
|
||
*/
|
||
@TableLogic
|
||
private Long delFlag;
|
||
|
||
}
|