feat(crm): 添加合同号字段并优化发货单联查
- 在CrmOrder实体类中新增contractCode字段用于存储合同号 - 在CrmOrderBo业务对象中添加contractCode字段支持 - 在CrmOrderMapper中增加按合同号查询的方法 - 更新CrmOrderMapper.xml映射文件以支持合同号字段映射 - 实现CrmOrderServiceImpl中合同号条件查询功能 - 在CrmOrderVo视图对象中添加合同号字段并支持Excel导出 - 为WmsDeliveryWaybill添加关联订单ID字段建立与CRM订单关联 - 在WMS模块中实现发货单与CRM订单的关联查询功能 - 重构WmsDeliveryWaybillServiceImpl中的查询方法以支持多表关联查询 - 完善WMS发货单查询界面以支持按关联订单筛选功能
This commit is contained in:
@@ -79,6 +79,12 @@ public class CrmOrder extends BaseEntity {
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 合同号
|
||||
*/
|
||||
private String contractCode;
|
||||
|
||||
/**
|
||||
* 删除标识 0正常 2删除
|
||||
*/
|
||||
|
||||
@@ -90,5 +90,10 @@ public class CrmOrderBo extends BaseEntity {
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 合同号
|
||||
*/
|
||||
private String contractCode;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -108,6 +108,12 @@ public class CrmOrderVo extends BaseEntity {
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 合同号
|
||||
*/
|
||||
@ExcelProperty(value = "合同号")
|
||||
private String contractCode;
|
||||
|
||||
|
||||
// @ExcelProperty(value = "客户编号")
|
||||
private String customerCode;
|
||||
|
||||
@@ -16,4 +16,6 @@ import org.apache.ibatis.annotations.Param;
|
||||
public interface CrmOrderMapper extends BaseMapperPlus<CrmOrderMapper, CrmOrder, CrmOrderVo> {
|
||||
|
||||
Page<CrmOrderVo> selectVoPagePlus(Page<Object> build,@Param("ew") QueryWrapper<CrmOrder> lqw);
|
||||
|
||||
CrmOrderVo selectVoById(@Param("orderId") String orderId);
|
||||
}
|
||||
|
||||
@@ -94,6 +94,7 @@ public class CrmOrderServiceImpl implements ICrmOrderService {
|
||||
qw.eq(bo.getOrderStatus() != null, "co.order_status", bo.getOrderStatus());
|
||||
qw.eq(bo.getFinanceStatus() != null, "co.finance_status", bo.getFinanceStatus());
|
||||
qw.eq(bo.getUnpaidAmount() != null, "co.unpaid_amount", bo.getUnpaidAmount());
|
||||
qw.like(StringUtils.isNotBlank(bo.getContractCode()), "co.contract_code", bo.getContractCode());
|
||||
//逻辑删除
|
||||
qw.eq("co.del_flag", 0);
|
||||
//根据orderType排序预订单是0 正是订单是1 0排在前面 1排在后面 升序
|
||||
@@ -126,6 +127,7 @@ public class CrmOrderServiceImpl implements ICrmOrderService {
|
||||
lqw.eq(bo.getOrderStatus() != null, CrmOrder::getOrderStatus, bo.getOrderStatus());
|
||||
lqw.eq(bo.getFinanceStatus() != null, CrmOrder::getFinanceStatus, bo.getFinanceStatus());
|
||||
lqw.eq(bo.getUnpaidAmount() != null, CrmOrder::getUnpaidAmount, bo.getUnpaidAmount());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getContractCode()), CrmOrder::getContractCode, bo.getContractCode());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user