feat(crm): 订单ID数据类型优化及配卷查询功能扩展

- 将CrmOrder、CrmOrderItem及其相关BO、VO类中的orderId和itemId字段从String类型改为Long类型
- 修改selectOrderItemsByOrderIds方法参数类型为List<Long>
- 在CrmOrderItemController中新增根据订单ID和合同ID查询配卷的接口
- 实现queryCoilsByOrderId和queryCoilsByContractId服务方法
- 移除WmsMaterialCoilServiceImpl中冗余的嵌套对象构建逻辑
- 更新销售报表中订单ID的类型转换和分组逻辑以适配Long类型
This commit is contained in:
2026-03-30 14:33:06 +08:00
parent 02469383f4
commit 6835a35c02
13 changed files with 140 additions and 43 deletions

View File

@@ -964,12 +964,6 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
public List<WmsMaterialCoilVo> queryList(WmsMaterialCoilBo bo) {
QueryWrapper<WmsMaterialCoil> lqw = buildQueryWrapperPlus(bo);
List<WmsMaterialCoilVo> list = baseMapper.selectVoListWithDynamicJoin(lqw);
// 从联查结果中构建产品和原材料对象(避免单独查询)
for (WmsMaterialCoilVo vo : list) {
buildItemObjectFromJoin(vo);
}
return list;
}
@@ -989,13 +983,6 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
return one == null ? null : one.getQualityStatus();
}
/**
* 联查场景下数据已经是扁平字段,无需再构建 rawMaterial/product 嵌套对象。
*/
private void buildItemObjectFromJoin(WmsMaterialCoilVo vo) {
// no-op
}
/**
* 新增钢卷物料表
*/