feat(order): 订单项目实体增加原料规格等新字段
- 将 specRequire 字段重命名为 rawMaterialSpec（原料规格） - 新增 finishedProductSpec 字段（成品规格） - 新增 material 字段（材质） - 新增 grade 字段（等级） - 新增 weight 字段（重量） - 新增 contractPrice 字段（合同定价） - 新增 customizer 字段（定制人） - 新增 shipper 字段（发货人） - 新增 productionBatch 字段（排产批次） - 更新数据库映射配置以支持新字段 - 更新查询条件构造逻辑以包含新字段过滤 - 更新 VO 对象以支持 Excel 导出新字段
This commit is contained in:
@@ -34,9 +34,9 @@ public class CrmOrderItem extends BaseEntity {
|
||||
*/
|
||||
private String productType;
|
||||
/**
|
||||
* 规格要求
|
||||
* 原料规格
|
||||
*/
|
||||
private String specRequire;
|
||||
private String rawMaterialSpec;
|
||||
/**
|
||||
* 产品数量
|
||||
*/
|
||||
@@ -53,6 +53,38 @@ public class CrmOrderItem extends BaseEntity {
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 成品规格
|
||||
*/
|
||||
private String finishedProductSpec;
|
||||
/**
|
||||
* 材质
|
||||
*/
|
||||
private String material;
|
||||
/**
|
||||
* 等级
|
||||
*/
|
||||
private String grade;
|
||||
/**
|
||||
* 重量
|
||||
*/
|
||||
private BigDecimal weight;
|
||||
/**
|
||||
* 合同定价
|
||||
*/
|
||||
private BigDecimal contractPrice;
|
||||
/**
|
||||
* 定制人
|
||||
*/
|
||||
private String customizer;
|
||||
/**
|
||||
* 发货人
|
||||
*/
|
||||
private String shipper;
|
||||
/**
|
||||
* 排产批次
|
||||
*/
|
||||
private String productionBatch;
|
||||
/**
|
||||
* 删除标识 0正常 2删除
|
||||
*/
|
||||
|
||||
@@ -34,9 +34,9 @@ public class CrmOrderItemBo extends BaseEntity {
|
||||
private String productType;
|
||||
|
||||
/**
|
||||
* 规格要求
|
||||
* 原料规格
|
||||
*/
|
||||
private String specRequire;
|
||||
private String rawMaterialSpec;
|
||||
|
||||
/**
|
||||
* 产品数量
|
||||
@@ -58,5 +58,45 @@ public class CrmOrderItemBo extends BaseEntity {
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 成品规格
|
||||
*/
|
||||
private String finishedProductSpec;
|
||||
|
||||
/**
|
||||
* 材质
|
||||
*/
|
||||
private String material;
|
||||
|
||||
/**
|
||||
* 等级
|
||||
*/
|
||||
private String grade;
|
||||
|
||||
/**
|
||||
* 重量
|
||||
*/
|
||||
private BigDecimal weight;
|
||||
|
||||
/**
|
||||
* 合同定价
|
||||
*/
|
||||
private BigDecimal contractPrice;
|
||||
|
||||
/**
|
||||
* 定制人
|
||||
*/
|
||||
private String customizer;
|
||||
|
||||
/**
|
||||
* 发货人
|
||||
*/
|
||||
private String shipper;
|
||||
|
||||
/**
|
||||
* 排产批次
|
||||
*/
|
||||
private String productionBatch;
|
||||
|
||||
|
||||
}
|
||||
@@ -41,10 +41,10 @@ public class CrmOrderItemVo {
|
||||
private String productType;
|
||||
|
||||
/**
|
||||
* 规格要求
|
||||
* 原料规格
|
||||
*/
|
||||
@ExcelProperty(value = "规格要求")
|
||||
private String specRequire;
|
||||
@ExcelProperty(value = "原料规格")
|
||||
private String rawMaterialSpec;
|
||||
|
||||
/**
|
||||
* 产品数量
|
||||
@@ -71,5 +71,53 @@ public class CrmOrderItemVo {
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 成品规格
|
||||
*/
|
||||
@ExcelProperty(value = "成品规格")
|
||||
private String finishedProductSpec;
|
||||
|
||||
/**
|
||||
* 材质
|
||||
*/
|
||||
@ExcelProperty(value = "材质")
|
||||
private String material;
|
||||
|
||||
/**
|
||||
* 等级
|
||||
*/
|
||||
@ExcelProperty(value = "等级")
|
||||
private String grade;
|
||||
|
||||
/**
|
||||
* 重量
|
||||
*/
|
||||
@ExcelProperty(value = "重量")
|
||||
private BigDecimal weight;
|
||||
|
||||
/**
|
||||
* 合同定价
|
||||
*/
|
||||
@ExcelProperty(value = "合同定价")
|
||||
private BigDecimal contractPrice;
|
||||
|
||||
/**
|
||||
* 定制人
|
||||
*/
|
||||
@ExcelProperty(value = "定制人")
|
||||
private String customizer;
|
||||
|
||||
/**
|
||||
* 发货人
|
||||
*/
|
||||
@ExcelProperty(value = "发货人")
|
||||
private String shipper;
|
||||
|
||||
/**
|
||||
* 排产批次
|
||||
*/
|
||||
@ExcelProperty(value = "排产批次")
|
||||
private String productionBatch;
|
||||
|
||||
|
||||
}
|
||||
@@ -63,10 +63,18 @@ public class CrmOrderItemServiceImpl implements ICrmOrderItemService {
|
||||
LambdaQueryWrapper<CrmOrderItem> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getOrderId()), CrmOrderItem::getOrderId, bo.getOrderId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getProductType()), CrmOrderItem::getProductType, bo.getProductType());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSpecRequire()), CrmOrderItem::getSpecRequire, bo.getSpecRequire());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getRawMaterialSpec()), CrmOrderItem::getRawMaterialSpec, bo.getRawMaterialSpec());
|
||||
lqw.eq(bo.getProductNum() != null, CrmOrderItem::getProductNum, bo.getProductNum());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSpecialRequire()), CrmOrderItem::getSpecialRequire, bo.getSpecialRequire());
|
||||
lqw.eq(bo.getItemAmount() != null, CrmOrderItem::getItemAmount, bo.getItemAmount());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getFinishedProductSpec()), CrmOrderItem::getFinishedProductSpec, bo.getFinishedProductSpec());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getMaterial()), CrmOrderItem::getMaterial, bo.getMaterial());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getGrade()), CrmOrderItem::getGrade, bo.getGrade());
|
||||
lqw.eq(bo.getWeight() != null, CrmOrderItem::getWeight, bo.getWeight());
|
||||
lqw.eq(bo.getContractPrice() != null, CrmOrderItem::getContractPrice, bo.getContractPrice());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getCustomizer()), CrmOrderItem::getCustomizer, bo.getCustomizer());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getShipper()), CrmOrderItem::getShipper, bo.getShipper());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getProductionBatch()), CrmOrderItem::getProductionBatch, bo.getProductionBatch());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
|
||||
@@ -8,11 +8,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="itemId" column="item_id"/>
|
||||
<result property="orderId" column="order_id"/>
|
||||
<result property="productType" column="product_type"/>
|
||||
<result property="specRequire" column="spec_require"/>
|
||||
<result property="rawMaterialSpec" column="raw_material_spec"/>
|
||||
<result property="productNum" column="product_num"/>
|
||||
<result property="specialRequire" column="special_require"/>
|
||||
<result property="itemAmount" column="item_amount"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="finishedProductSpec" column="finished_product_spec"/>
|
||||
<result property="material" column="material"/>
|
||||
<result property="grade" column="grade"/>
|
||||
<result property="weight" column="weight"/>
|
||||
<result property="contractPrice" column="contract_price"/>
|
||||
<result property="customizer" column="customizer"/>
|
||||
<result property="shipper" column="shipper"/>
|
||||
<result property="productionBatch" column="production_batch"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
@@ -25,11 +33,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
item_id,
|
||||
order_id,
|
||||
product_type,
|
||||
spec_require,
|
||||
raw_material_spec,
|
||||
product_num,
|
||||
special_require,
|
||||
item_amount,
|
||||
remark,
|
||||
finished_product_spec,
|
||||
material,
|
||||
grade,
|
||||
weight,
|
||||
contract_price,
|
||||
customizer,
|
||||
shipper,
|
||||
production_batch,
|
||||
create_by,
|
||||
create_time,
|
||||
update_by,
|
||||
|
||||
Reference in New Issue
Block a user