Joshi
6835a35c02
- 将CrmOrder、CrmOrderItem及其相关BO、VO类中的orderId和itemId字段从String类型改为Long类型 - 修改selectOrderItemsByOrderIds方法参数类型为List<Long> - 在CrmOrderItemController中新增根据订单ID和合同ID查询配卷的接口 - 实现queryCoilsByOrderId和queryCoilsByContractId服务方法 - 移除WmsMaterialCoilServiceImpl中冗余的嵌套对象构建逻辑 - 更新销售报表中订单ID的类型转换和分组逻辑以适配Long类型
103 lines
1.8 KiB
Java
103 lines
1.8 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;
|
||
|
||
/**
|
||
* 正式订单明细对象 crm_order_item
|
||
*
|
||
* @author klp
|
||
* @date 2025-12-15
|
||
*/
|
||
@Data
|
||
@EqualsAndHashCode(callSuper = true)
|
||
@TableName("crm_order_item")
|
||
public class CrmOrderItem extends BaseEntity {
|
||
|
||
private static final long serialVersionUID=1L;
|
||
|
||
/**
|
||
* 正式订单明细ID（主键）
|
||
*/
|
||
@TableId(value = "item_id")
|
||
private Long itemId;
|
||
/**
|
||
* 关联正式订单ID（外键）
|
||
*/
|
||
private Long orderId;
|
||
/**
|
||
* 产品类型
|
||
*/
|
||
private String productType;
|
||
/**
|
||
* 原料规格
|
||
*/
|
||
private String rawMaterialSpec;
|
||
/**
|
||
* 产品数量
|
||
*/
|
||
private Long productNum;
|
||
/**
|
||
* 特殊要求
|
||
*/
|
||
private String specialRequire;
|
||
/**
|
||
* 明细金额（单商品金额）
|
||
*/
|
||
private BigDecimal itemAmount;
|
||
/**
|
||
* 备注
|
||
*/
|
||
private String remark;
|
||
/**
|
||
* 成品规格
|
||
*/
|
||
private String finishedProductSpec;
|
||
/**
|
||
* 材质
|
||
*/
|
||
private String material;
|
||
/**
|
||
* 等级
|
||
*/
|
||
private String grade;
|
||
/**
|
||
* 重量
|
||
*/
|
||
private BigDecimal weight;
|
||
/**
|
||
* 宽度公差
|
||
*/
|
||
private BigDecimal widthTolerance;
|
||
/**
|
||
* 厚度公差
|
||
*/
|
||
private BigDecimal thicknessTolerance;
|
||
/**
|
||
* 合同定价
|
||
*/
|
||
private BigDecimal contractPrice;
|
||
/**
|
||
* 定制人
|
||
*/
|
||
private String customizer;
|
||
/**
|
||
* 发货人
|
||
*/
|
||
private String shipper;
|
||
/**
|
||
* 排产批次
|
||
*/
|
||
private String productionBatch;
|
||
/**
|
||
* 删除标识 0正常 2删除
|
||
*/
|
||
@TableLogic
|
||
private Long delFlag;
|
||
|
||
}
|