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 b6e8bd44..3911e740 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 @@ -34,9 +34,9 @@ public class CrmOrderItem extends BaseEntity { */ private String productType; /** - * 规格要求 + * 原料规格 */ - private String specRequire; + private String rawMaterialSpec; /** * 产品数量 */ @@ -53,10 +53,42 @@ 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删除 */ @TableLogic private Long delFlag; -} +} \ No newline at end of file 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 b7e5fd91..ee08d021 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 @@ -34,9 +34,9 @@ public class CrmOrderItemBo extends BaseEntity { private String productType; /** - * 规格要求 + * 原料规格 */ - private String specRequire; + private String rawMaterialSpec; /** * 产品数量 @@ -57,6 +57,46 @@ 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; -} +} \ No newline at end of file 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 51b6870d..4efd8b12 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 @@ -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; + + +} \ No newline at end of file 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 3705995b..cee3853a 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 @@ -63,10 +63,18 @@ public class CrmOrderItemServiceImpl implements ICrmOrderItemService { LambdaQueryWrapper 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; } @@ -112,4 +120,4 @@ public class CrmOrderItemServiceImpl implements ICrmOrderItemService { } return baseMapper.deleteBatchIds(ids) > 0; } -} +} \ No newline at end of file diff --git a/klp-crm/src/main/resources/mapper/CrmOrderItemMapper.xml b/klp-crm/src/main/resources/mapper/CrmOrderItemMapper.xml index 8cceba99..cab90b42 100644 --- a/klp-crm/src/main/resources/mapper/CrmOrderItemMapper.xml +++ b/klp-crm/src/main/resources/mapper/CrmOrderItemMapper.xml @@ -8,11 +8,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + + + + + + @@ -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, @@ -45,4 +61,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + \ No newline at end of file