From 7b4108101d03e54ee28eabb6de289f5958870d7c Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 3 Jun 2024 18:52:25 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/emis/domain/EmisWaybillTransfer.java   |  3 +++
 .../resources/mapper/EmisWaybillTransferMapper.xml    | 11 ++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillTransfer.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillTransfer.java
index 816471302..5a571346a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillTransfer.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillTransfer.java
@@ -61,4 +61,7 @@ public class EmisWaybillTransfer extends BaseEntity
     /* 数据来源 */
     private String dataFrom;
 
+    //   扩展参数
+    private EmisWaybill waybillDetail;
+
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml
index e55128b70..f6ef3e010 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisWaybillTransferMapper">
     
-    <resultMap type="EmisWaybillTransfer" id="EmisWaybillTransferResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisWaybillTransfer" id="BaseEmisWaybillTransferResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="billCode"    column="bill_code"    />
         <result property="transferBillCode"    column="transfer_bill_code"    />
@@ -21,6 +21,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </resultMap>
 
+    <resultMap id="EmisWaybillTransferResult" type="EmisWaybillTransfer" extends="BaseEmisWaybillTransferResult"  >
+        <association property="waybillDetail"
+                     column="bill_code"
+                     select="com.xdadan.erp.emis.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"
+                     fetchType="lazy"
+        />
+
+    </resultMap>
+
     <sql id="selectEmisWaybillTransferVo">
         select id, bill_code, transfer_bill_code, transfer_date, transfer_express, link_man, link_phone, transfer_fee, transfer_weight, transfer_volume, transfer_resean, transfer_city, data_from, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_waybill_transfer
     </sql>