feat(wms): 扩展钢卷绑定信息数据结构

- 在 WmsCoilBindInfoVo 中新增发货计划、发货单主表及明细相关字段
- 添加 Excel 导出注解支持并增加 BigDecimal 类型字段
- 更新 MyBatis 映射文件以包含新的关联查询字段
- 在 MaterialCoilService 实现中补充完整的绑定信息设置逻辑
- 扩展 WmsMaterialCoilVo 数据传输对象以支持更多业务字段
- 优化数据库查询 SQL 以获取完整的发货单关联信息
This commit is contained in:
2026-01-29 16:51:00 +08:00
parent 08a5f9bb13
commit 5868b63d81
4 changed files with 173 additions and 9 deletions

View File

@@ -1,9 +1,11 @@
package com.klp.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
@@ -16,16 +18,49 @@ public class WmsCoilBindInfoVo implements Serializable {
private static final long serialVersionUID = 1L;
/** 钢卷ID */
private Long coilId;
/** 发货单明细ID */
private Long detailId;
// -------------------- 发货计划plan --------------------
private Long planId;
private String planName;
private Date planDate;
// -------------------- 发货单主表waybill --------------------
private Long waybillId;
private String waybillNo;
private String waybillName;
private Long planId;
private String planName;
private Date planDate;
private String licensePlate;
private String consigneeUnit;
private String senderUnit;
private Date deliveryTime;
private String weighbridge;
private String salesPerson;
private String principal;
private String principalPhone;
private Long waybillStatus;
private String waybillRemark;
// -------------------- 发货单明细补充字段detail --------------------
private String detailSettlementType;
private BigDecimal detailUnitPrice;
}

View File

@@ -353,8 +353,69 @@ public class WmsMaterialCoilVo extends BaseEntity {
@JsonFormat(pattern = "yyyy-MM-dd")
private Date bindPlanDate;
// 父钢卷id
private String parentCoilId;
// ========== 补充的发货绑定信息字段 ==========
/**
* 车牌号
*/
private String bindLicensePlate;
/**
* 收货单位
*/
private String bindConsigneeUnit;
/**
* 发货单位
*/
private String bindSenderUnit;
/**
* 发货时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date bindDeliveryTime;
/**
* 地磅
*/
private String bindWeighbridge;
/**
* 销售人员
*/
private String bindSalesPerson;
/**
* 负责人
*/
private String bindPrincipal;
/**
* 负责人电话
*/
private String bindPrincipalPhone;
/**
* 运单状态
*/
private Long bindWaybillStatus;
/**
* 运单备注
*/
private String bindWaybillRemark;
/**
* 明细结算类型
*/
private String bindDetailSettlementType;
/**
* 明细单价
*/
private BigDecimal bindDetailUnitPrice;
}