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

@@ -26,7 +26,7 @@ public class CrmOrder extends BaseEntity {
* 订单ID主键
*/
@TableId(value = "order_id")
private String orderId;
private Long orderId;
/**
* 订单编号
*/

View File

@@ -24,11 +24,11 @@ public class CrmOrderItem extends BaseEntity {
* 正式订单明细ID主键
*/
@TableId(value = "item_id")
private String itemId;
private Long itemId;
/**
* 关联正式订单ID外键
*/
private String orderId;
private Long orderId;
/**
* 产品类型
*/
@@ -99,4 +99,4 @@ public class CrmOrderItem extends BaseEntity {
@TableLogic
private Long delFlag;
}
}

View File

@@ -23,7 +23,7 @@ public class CrmOrderBo extends BaseEntity {
/**
* 订单ID主键
*/
private String orderId;
private Long orderId;
/**
* 订单编号

View File

@@ -21,12 +21,12 @@ public class CrmOrderItemBo extends BaseEntity {
/**
* 正式订单明细ID主键
*/
private String itemId;
private Long itemId;
/**
* 关联正式订单ID外键
*/
private String orderId;
private Long orderId;
/**
* 产品类型
@@ -57,7 +57,7 @@ public class CrmOrderItemBo extends BaseEntity {
* 备注
*/
private String remark;
/**
* 成品规格
*/
@@ -109,4 +109,4 @@ public class CrmOrderItemBo extends BaseEntity {
private String productionBatch;
}
}

View File

@@ -25,14 +25,14 @@ public class CrmOrderItemVo {
*/
@ExcelProperty(value = "正式订单明细ID", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "主=键")
private String itemId;
private Long itemId;
/**
* 关联正式订单ID外键
*/
@ExcelProperty(value = "关联正式订单ID", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "外=键")
private String orderId;
private Long orderId;
/**
* 产品类型
@@ -132,4 +132,4 @@ public class CrmOrderItemVo {
private String productionBatch;
}
}

View File

@@ -28,7 +28,7 @@ public class CrmOrderVo extends BaseEntity {
*/
@ExcelProperty(value = "订单ID", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "主=键")
private String orderId;
private Long orderId;
/**
* 订单编号

View File

@@ -98,7 +98,7 @@ public class CrmSalesReportVo {
/**
* 订单ID
*/
private String orderId;
private Long orderId;
/**
* 订单编号