From d5b366967dec5e341376937b290dcd423f1c8d26 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 3 Jun 2024 11:29:23 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/emis/domain/EmisTmsPackDtl.java  |  6 ++++++
 .../main/resources/mapper/EmisTmsPackDtlMapper.xml  | 13 ++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPackDtl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPackDtl.java
index 2ae7f485d..d2fbd94be 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPackDtl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPackDtl.java
@@ -49,4 +49,10 @@ public class EmisTmsPackDtl extends BaseEntity
     /* 扫描员 */
     private String scanMan;
 
+
+
+    //   扩展参数
+    private EmisWaybill waybillDetail;
+
+
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsPackDtlMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsPackDtlMapper.xml
index 517234375..39feeb7ff 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsPackDtlMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsPackDtlMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisTmsPackDtlMapper">
 
-    <resultMap type="EmisTmsPackDtl" id="EmisTmsPackDtlResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisTmsPackDtl" id="BaseEmisTmsPackDtlResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="packNo"    column="pack_no"    />
         <result property="billCode"    column="bill_code"    />
@@ -13,6 +13,17 @@
         <result property="packStatus"    column="pack_status"    />
         <result property="scanMan"    column="scan_man"    />
 
+
+
+    </resultMap>
+
+    <resultMap id="EmisTmsPackDtlResult" type="EmisTmsPackDtl" extends="BaseEmisTmsPackDtlResult"  >
+        <association property="waybillDetail"
+                     column="bill_code"
+                     select="com.xdadan.erp.emis.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"
+                     fetchType="lazy"
+        />
+
     </resultMap>
 
     <sql id="selectEmisTmsPackDtlVo">