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

@@ -30,24 +30,60 @@
<resultMap type="com.klp.domain.vo.WmsCoilBindInfoVo" id="WmsCoilBindInfoResult">
<result property="coilId" column="coil_id"/>
<result property="detailId" column="detail_id"/>
<result property="waybillId" column="waybill_id"/>
<result property="waybillNo" column="waybill_no"/>
<result property="waybillName" column="waybill_name"/>
<!-- 发货计划 -->
<result property="planId" column="plan_id"/>
<result property="planName" column="plan_name"/>
<result property="planDate" column="plan_date"/>
<!-- 发货单主表 -->
<result property="waybillId" column="waybill_id"/>
<result property="waybillNo" column="waybill_no"/>
<result property="waybillName" column="waybill_name"/>
<result property="licensePlate" column="license_plate"/>
<result property="consigneeUnit" column="consignee_unit"/>
<result property="senderUnit" column="sender_unit"/>
<result property="deliveryTime" column="delivery_time"/>
<result property="weighbridge" column="weighbridge"/>
<result property="salesPerson" column="sales_person"/>
<result property="principal" column="principal"/>
<result property="principalPhone" column="principal_phone"/>
<result property="waybillStatus" column="status"/>
<result property="waybillRemark" column="remark"/>
<!-- 发货单明细补充字段 -->
<result property="detailSettlementType" column="settlement_type"/>
<result property="detailUnitPrice" column="unit_price"/>
</resultMap>
<select id="selectBindInfoByCoilIds" resultMap="WmsCoilBindInfoResult">
SELECT
d.coil_id,
d.detail_id,
-- 发货单主表
w.waybill_id,
w.waybill_no,
w.waybill_name,
w.license_plate,
w.consignee_unit,
w.sender_unit,
w.delivery_time,
w.weighbridge,
w.sales_person,
w.principal,
w.principal_phone,
w.status,
w.remark,
-- 发货计划
p.plan_id,
p.plan_name,
p.plan_date
p.plan_date,
-- 发货单明细补充字段
d.settlement_type,
d.unit_price
FROM wms_delivery_waybill_detail d
INNER JOIN wms_delivery_waybill w ON w.waybill_id = d.waybill_id AND w.del_flag = 0
INNER JOIN wms_delivery_plan p ON p.plan_id = w.plan_id AND p.del_flag = 0
@@ -62,12 +98,30 @@
SELECT
d.coil_id,
d.detail_id,
-- 发货单主表
w.waybill_id,
w.waybill_no,
w.waybill_name,
w.license_plate,
w.consignee_unit,
w.sender_unit,
w.delivery_time,
w.weighbridge,
w.sales_person,
w.principal,
w.principal_phone,
w.status,
w.remark,
-- 发货计划
p.plan_id,
p.plan_name,
p.plan_date
p.plan_date,
-- 发货单明细补充字段
d.settlement_type,
d.unit_price
FROM wms_delivery_waybill_detail d
INNER JOIN wms_delivery_waybill w ON w.waybill_id = d.waybill_id AND w.del_flag = 0
INNER JOIN wms_delivery_plan p ON p.plan_id = w.plan_id AND p.del_flag = 0