feat(CrmOrderItem): 添加订单项产品规格字段
- 在CrmOrderItem实体类中新增表面处理、切边要求、包装要求、宽度、厚度、用途字段 - 在CrmOrderItemBo业务对象中同步添加对应字段定义 - 在CrmOrderItemVo视图对象中添加Excel导出注解配置 - 更新MyBatis映射文件中的结果映射和插入字段列表 - 在查询条件构建器中添加新字段的查询支持
This commit is contained in:
@@ -93,6 +93,30 @@ public class CrmOrderItem extends BaseEntity {
|
|||||||
* 排产批次
|
* 排产批次
|
||||||
*/
|
*/
|
||||||
private String productionBatch;
|
private String productionBatch;
|
||||||
|
/**
|
||||||
|
* 表面处理
|
||||||
|
*/
|
||||||
|
private String surfaceTreatment;
|
||||||
|
/**
|
||||||
|
* 切边要求
|
||||||
|
*/
|
||||||
|
private String edgeCuttingReq;
|
||||||
|
/**
|
||||||
|
* 包装要求
|
||||||
|
*/
|
||||||
|
private String packagingReq;
|
||||||
|
/**
|
||||||
|
* 宽度
|
||||||
|
*/
|
||||||
|
private BigDecimal width;
|
||||||
|
/**
|
||||||
|
* 厚度
|
||||||
|
*/
|
||||||
|
private BigDecimal thickness;
|
||||||
|
/**
|
||||||
|
* 用途
|
||||||
|
*/
|
||||||
|
private String purpose;
|
||||||
/**
|
/**
|
||||||
* 删除标识 0正常 2删除
|
* 删除标识 0正常 2删除
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -108,5 +108,34 @@ public class CrmOrderItemBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private String productionBatch;
|
private String productionBatch;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 表面处理
|
||||||
|
*/
|
||||||
|
private String surfaceTreatment;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 切边要求
|
||||||
|
*/
|
||||||
|
private String edgeCuttingReq;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 包装要求
|
||||||
|
*/
|
||||||
|
private String packagingReq;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 宽度
|
||||||
|
*/
|
||||||
|
private BigDecimal width;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 厚度
|
||||||
|
*/
|
||||||
|
private BigDecimal thickness;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 用途
|
||||||
|
*/
|
||||||
|
private String purpose;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -131,5 +131,40 @@ public class CrmOrderItemVo {
|
|||||||
@ExcelProperty(value = "排产批次")
|
@ExcelProperty(value = "排产批次")
|
||||||
private String productionBatch;
|
private String productionBatch;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 表面处理
|
||||||
|
*/
|
||||||
|
@ExcelProperty(value = "表面处理")
|
||||||
|
private String surfaceTreatment;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 切边要求
|
||||||
|
*/
|
||||||
|
@ExcelProperty(value = "切边要求")
|
||||||
|
private String edgeCuttingReq;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 包装要求
|
||||||
|
*/
|
||||||
|
@ExcelProperty(value = "包装要求")
|
||||||
|
private String packagingReq;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 宽度
|
||||||
|
*/
|
||||||
|
@ExcelProperty(value = "宽度")
|
||||||
|
private BigDecimal width;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 厚度
|
||||||
|
*/
|
||||||
|
@ExcelProperty(value = "厚度")
|
||||||
|
private BigDecimal thickness;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 用途
|
||||||
|
*/
|
||||||
|
@ExcelProperty(value = "用途")
|
||||||
|
private String purpose;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -101,6 +101,12 @@ public class CrmOrderItemServiceImpl implements ICrmOrderItemService {
|
|||||||
lqw.eq(StringUtils.isNotBlank(bo.getCustomizer()), CrmOrderItem::getCustomizer, bo.getCustomizer());
|
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.getShipper()), CrmOrderItem::getShipper, bo.getShipper());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getProductionBatch()), CrmOrderItem::getProductionBatch, bo.getProductionBatch());
|
lqw.eq(StringUtils.isNotBlank(bo.getProductionBatch()), CrmOrderItem::getProductionBatch, bo.getProductionBatch());
|
||||||
|
lqw.eq(StringUtils.isNotBlank(bo.getSurfaceTreatment()), CrmOrderItem::getSurfaceTreatment, bo.getSurfaceTreatment());
|
||||||
|
lqw.eq(StringUtils.isNotBlank(bo.getEdgeCuttingReq()), CrmOrderItem::getEdgeCuttingReq, bo.getEdgeCuttingReq());
|
||||||
|
lqw.eq(StringUtils.isNotBlank(bo.getPackagingReq()), CrmOrderItem::getPackagingReq, bo.getPackagingReq());
|
||||||
|
lqw.eq(bo.getWidth() != null, CrmOrderItem::getWidth, bo.getWidth());
|
||||||
|
lqw.eq(bo.getThickness() != null, CrmOrderItem::getThickness, bo.getThickness());
|
||||||
|
lqw.eq(StringUtils.isNotBlank(bo.getPurpose()), CrmOrderItem::getPurpose, bo.getPurpose());
|
||||||
return lqw;
|
return lqw;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,6 +23,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<result property="customizer" column="customizer"/>
|
<result property="customizer" column="customizer"/>
|
||||||
<result property="shipper" column="shipper"/>
|
<result property="shipper" column="shipper"/>
|
||||||
<result property="productionBatch" column="production_batch"/>
|
<result property="productionBatch" column="production_batch"/>
|
||||||
|
<result property="surfaceTreatment" column="surface_treatment"/>
|
||||||
|
<result property="edgeCuttingReq" column="edge_cutting_req"/>
|
||||||
|
<result property="packagingReq" column="packaging_req"/>
|
||||||
|
<result property="width" column="width"/>
|
||||||
|
<result property="thickness" column="thickness"/>
|
||||||
|
<result property="purpose" column="purpose"/>
|
||||||
<result property="createBy" column="create_by"/>
|
<result property="createBy" column="create_by"/>
|
||||||
<result property="createTime" column="create_time"/>
|
<result property="createTime" column="create_time"/>
|
||||||
<result property="updateBy" column="update_by"/>
|
<result property="updateBy" column="update_by"/>
|
||||||
@@ -50,6 +56,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
customizer,
|
customizer,
|
||||||
shipper,
|
shipper,
|
||||||
production_batch,
|
production_batch,
|
||||||
|
surface_treatment,
|
||||||
|
edge_cutting_req,
|
||||||
|
packaging_req,
|
||||||
|
width,
|
||||||
|
thickness,
|
||||||
|
purpose,
|
||||||
create_by,
|
create_by,
|
||||||
create_time,
|
create_time,
|
||||||
update_by,
|
update_by,
|
||||||
|
|||||||
Reference in New Issue
Block a user