diff --git a/klp-crm/src/main/java/com/klp/crm/domain/CrmOrderItem.java b/klp-crm/src/main/java/com/klp/crm/domain/CrmOrderItem.java index 132a83dd..886336f4 100644 --- a/klp-crm/src/main/java/com/klp/crm/domain/CrmOrderItem.java +++ b/klp-crm/src/main/java/com/klp/crm/domain/CrmOrderItem.java @@ -93,6 +93,30 @@ public class CrmOrderItem extends BaseEntity { * 排产批次 */ private String productionBatch; + /** + * 表面处理 + */ + private String surfaceTreatment; + /** + * 切边要求 + */ + private String edgeCuttingReq; + /** + * 包装要求 + */ + private String packagingReq; + /** + * 宽度 + */ + private BigDecimal width; + /** + * 厚度 + */ + private BigDecimal thickness; + /** + * 用途 + */ + private String purpose; /** * 删除标识 0正常 2删除 */ diff --git a/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderItemBo.java b/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderItemBo.java index 49896a75..1aabe0a8 100644 --- a/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderItemBo.java +++ b/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderItemBo.java @@ -108,5 +108,34 @@ public class CrmOrderItemBo extends BaseEntity { */ private String productionBatch; + /** + * 表面处理 + */ + private String surfaceTreatment; + + /** + * 切边要求 + */ + private String edgeCuttingReq; + + /** + * 包装要求 + */ + private String packagingReq; + + /** + * 宽度 + */ + private BigDecimal width; + + /** + * 厚度 + */ + private BigDecimal thickness; + + /** + * 用途 + */ + private String purpose; } diff --git a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderItemVo.java b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderItemVo.java index 07b05e32..5692b149 100644 --- a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderItemVo.java +++ b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderItemVo.java @@ -131,5 +131,40 @@ public class CrmOrderItemVo { @ExcelProperty(value = "排产批次") 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; } diff --git a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java index 24121b16..95fee509 100644 --- a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java +++ b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java @@ -101,6 +101,12 @@ public class CrmOrderItemServiceImpl implements ICrmOrderItemService { 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()); + 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; } diff --git a/klp-crm/src/main/resources/mapper/CrmOrderItemMapper.xml b/klp-crm/src/main/resources/mapper/CrmOrderItemMapper.xml index dfeb51b2..5cbed499 100644 --- a/klp-crm/src/main/resources/mapper/CrmOrderItemMapper.xml +++ b/klp-crm/src/main/resources/mapper/CrmOrderItemMapper.xml @@ -23,6 +23,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + @@ -50,6 +56,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" customizer, shipper, production_batch, + surface_treatment, + edge_cutting_req, + packaging_req, + width, + thickness, + purpose, create_by, create_time, update_by,