- 移除 WmsMaterialCoilVo 中的嵌套对象结构(rawMaterial、product、bomItemList) - 新增 WmsMaterialCoilBindVo 视图对象专门处理发货绑定信息 - 添加 queryPageListWithBindInfo 方法支持发货绑定增强字段查询 - 将联查字段改为扁平化结构,直接填充基础物料属性 - 优化分页查询逻辑,分离通用查询和绑定信息查询流程 - 移除 BOM 项批量查询功能,简化服务依赖关系
103 lines
1.9 KiB
Java
103 lines
1.9 KiB
Java
package com.klp.domain.vo;
|
||
|
||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||
import lombok.Data;
|
||
import lombok.EqualsAndHashCode;
|
||
|
||
import java.math.BigDecimal;
|
||
import java.util.Date;
|
||
|
||
|
||
/**
|
||
* 钢卷物料表视图对象(包含发货绑定信息) wms_material_coil
|
||
*
|
||
* @author Joshi
|
||
* @date 2025-07-18
|
||
*/
|
||
@Data
|
||
@EqualsAndHashCode(callSuper = true)
|
||
public class WmsMaterialCoilBindVo extends WmsMaterialCoilVo {
|
||
|
||
private static final long serialVersionUID = 1L;
|
||
|
||
// ========== 发货绑定信息(由发货单明细占用) ==========
|
||
|
||
/**
|
||
* 是否已被发货单明细绑定(true=不可再次绑定)
|
||
*/
|
||
private Boolean bound;
|
||
|
||
private Long bindDetailId;
|
||
|
||
private Long bindWaybillId;
|
||
private String bindWaybillNo;
|
||
private String bindWaybillName;
|
||
|
||
private Long bindPlanId;
|
||
private String bindPlanName;
|
||
|
||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||
private Date bindPlanDate;
|
||
|
||
// ========== 补充的发货绑定信息字段 ==========
|
||
/**
|
||
* 车牌号
|
||
*/
|
||
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;
|
||
} |