From 5868b63d81e47e5e8e4c3a9366e290754af86928 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Thu, 29 Jan 2026 16:51:00 +0800
Subject: [PATCH 1/5] =?UTF-8?q?feat(wms):=20=E6=89=A9=E5=B1=95=E9=92=A2?=
=?UTF-8?q?=E5=8D=B7=E7=BB=91=E5=AE=9A=E4=BF=A1=E6=81=AF=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在 WmsCoilBindInfoVo 中新增发货计划、发货单主表及明细相关字段
- 添加 Excel 导出注解支持并增加 BigDecimal 类型字段
- 更新 MyBatis 映射文件以包含新的关联查询字段
- 在 MaterialCoilService 实现中补充完整的绑定信息设置逻辑
- 扩展 WmsMaterialCoilVo 数据传输对象以支持更多业务字段
- 优化数据库查询 SQL 以获取完整的发货单关联信息
---
.../com/klp/domain/vo/WmsCoilBindInfoVo.java | 41 +++++++++++-
.../com/klp/domain/vo/WmsMaterialCoilVo.java | 63 +++++++++++++++++-
.../impl/WmsMaterialCoilServiceImpl.java | 14 ++++
.../klp/WmsDeliveryWaybillDetailMapper.xml | 64 +++++++++++++++++--
4 files changed, 173 insertions(+), 9 deletions(-)
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilBindInfoVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilBindInfoVo.java
index 78423ff9..11da55c8 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilBindInfoVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilBindInfoVo.java
@@ -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;
}
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java
index 4043e2dc..459e1bb6 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java
@@ -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;
}
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
index 26a4860d..2aee5870 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
@@ -338,6 +338,20 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
vo.setBindPlanId(bind.getPlanId());
vo.setBindPlanName(bind.getPlanName());
vo.setBindPlanDate(bind.getPlanDate());
+
+ // 补充设置更多的绑定信息字段
+ vo.setBindLicensePlate(bind.getLicensePlate());
+ vo.setBindConsigneeUnit(bind.getConsigneeUnit());
+ vo.setBindSenderUnit(bind.getSenderUnit());
+ vo.setBindDeliveryTime(bind.getDeliveryTime());
+ vo.setBindWeighbridge(bind.getWeighbridge());
+ vo.setBindSalesPerson(bind.getSalesPerson());
+ vo.setBindPrincipal(bind.getPrincipal());
+ vo.setBindPrincipalPhone(bind.getPrincipalPhone());
+ vo.setBindWaybillStatus(bind.getWaybillStatus());
+ vo.setBindWaybillRemark(bind.getWaybillRemark());
+ vo.setBindDetailSettlementType(bind.getDetailSettlementType());
+ vo.setBindDetailUnitPrice(bind.getDetailUnitPrice());
} else {
vo.setBound(Boolean.FALSE);
}
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillDetailMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillDetailMapper.xml
index ae6bb403..54421918 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillDetailMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillDetailMapper.xml
@@ -30,24 +30,60 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+