feat(order): 订单项目实体增加原料规格等新字段

- 将 specRequire 字段重命名为 rawMaterialSpec(原料规格)
- 新增 finishedProductSpec 字段(成品规格)
- 新增 material 字段(材质)
- 新增 grade 字段(等级)
- 新增 weight 字段(重量)
- 新增 contractPrice 字段(合同定价)
- 新增 customizer 字段(定制人)
- 新增 shipper 字段(发货人)
- 新增 productionBatch 字段(排产批次)
- 更新数据库映射配置以支持新字段
- 更新查询条件构造逻辑以包含新字段过滤
- 更新 VO 对象以支持 Excel 导出新字段
This commit is contained in:
2026-02-02 09:55:17 +08:00
parent b04360b770
commit 84f141896c
5 changed files with 159 additions and 15 deletions

View File

@@ -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;
}
@@ -112,4 +120,4 @@ public class CrmOrderItemServiceImpl implements ICrmOrderItemService {
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}
}