From 4388492ba041389bc070907ea862caf25e54956e Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 8 Jun 2024 12:51:13 +0800
Subject: [PATCH] md

---
 .../java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java | 3 +++
 .../src/main/resources/mapper/EmisTmsSiteBatchMapper.xml  | 8 +++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java
index fbe7e1666..8b837531c 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java
@@ -73,6 +73,9 @@ public class EmisTmsSiteBatch extends BaseEntity
     private String clearanceResStatus;
     /* 报关资料状态 1-清关资料完整 2-清关资料异常 */
     private String declareResStatus;
+
+    /* 发出国家 */
+    private String sendCountry;
     /* 目的国家 */
     private String destCountry;
 
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
index 58b523b38..f50f9cda6 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
@@ -13,8 +13,9 @@
         <result property="productType"    column="product_type"    />
         <result property="batchType"    column="batch_type"    />
         <result property="transType"    column="trans_type"    />
-        <result property="startSiteCode"    column="start_site_code"    />
 
+
+        <result property="startSiteCode"    column="start_site_code"    />
         <result property="nextSiteCode"    column="next_site_code"    />
         <result property="airBilllNo"    column="air_billl_no"    />
         <result property="etd"    column="etd"    />
@@ -24,6 +25,8 @@
         <result property="shipNo"    column="ship_no"    />
         <result property="clearanceResStatus"    column="clearance_res_status"    />
         <result property="declareResStatus"    column="declare_res_status"    />
+
+        <result property="sendCountry"    column="send_country"    />
         <result property="destCountry"    column="dest_country"    />
 
         <result property="totalParcelQty"    column="total_parcel_qty"    />
@@ -36,8 +39,7 @@
         <association property="transLineTypeName"    column="trans_line_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectLineNameByCode"/>
 
         <!--   个性化查询     -->
-<!--        <result property="destCountryName"    column="dest_country_name"    />-->
-<!--        <result property="sendCountry"    column="send_country"    />-->
+
 
         <association property="sendCountryName"    column="trans_line_type" select="selectFromCountryNameByLineCode"/>
         <association property="destCountryName"    column="dest_country" select="selectCountryNameByCode"/>