From ae0cb7c722b6a1136a9bfd9cfa55239c8aaa3766 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 1 Jul 2024 22:53:31 +0800
Subject: [PATCH] md

---
 .../emis/mapper/EmisDestinationMapper.java    |  3 +++
 .../emis/mapper/EmisTransProductMapper.java   |  2 ++
 .../erp/emis/service/EmisBaseService.java     | 20 ++-----------------
 .../mapper/EmisDestinationMapper.xml          |  6 ++++++
 .../mapper/EmisTransProductMapper.xml         |  6 ++++++
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisDestinationMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisDestinationMapper.java
index bd129fd2a..f3a2ae355 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisDestinationMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisDestinationMapper.java
@@ -67,4 +67,7 @@ public interface EmisDestinationMapper extends BaseMapper<EmisDestination>
      * @return 结果
      */
     public int deleteEmisDestinationByIds(Long[] ids);
+
+
+    public EmisDestination getEmisDestinationByDestCode(String destCode);
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransProductMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransProductMapper.java
index 6e75c93de..1e4e591b3 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransProductMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransProductMapper.java
@@ -78,4 +78,6 @@ public interface EmisTransProductMapper extends BaseMapper<EmisTransProduct>
      * @return 结果
      */
     public int deleteEmisTransProductByIds(Long[] ids);
+
+    public EmisTransProduct getEmisTransProductByProdCode(String prodCode);
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index fa97b9bcb..f70af0024 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -363,19 +363,10 @@ public class EmisBaseService {
       * @return
       */
      public EmisDestination getDestinationByCode(String destCode){
-
          if(StringUtils.isEmpty(destCode)){
              return null;
          }
-         EmisDestination queryEmisDestination = new EmisDestination();
-         queryEmisDestination.setDestCode(destCode);
-
-         List<EmisDestination>  list=emisDestinationMapper.selectEmisDestinationList(queryEmisDestination);
-         if(list!=null){
-             return list.get(0);
-         }
-
-         return null;
+         return emisDestinationMapper.getEmisDestinationByDestCode(destCode);
      }
 
      /**
@@ -1824,14 +1815,7 @@ public class EmisBaseService {
       * @return
       */
      public EmisTransProduct getTransProductByCode(String code) {
-         EmisTransProduct emisTransProduct = new EmisTransProduct();
-         emisTransProduct.setProdCode(code);
-         List<EmisTransProduct> list=emisTransProductMapper.selectEmisTransProductList(emisTransProduct);
-         if(!CollectionUtils.isEmpty(list)) {
-             return list.get(0);
-         }
-
-         return null;
+         return emisTransProductMapper.getEmisTransProductByProdCode(code);
 
      }
 
diff --git a/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml b/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml
index 068442105..81a887e5d 100644
--- a/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml
@@ -73,6 +73,12 @@
         where a.id = #{id}
     </select>
 
+    <select id="getEmisDestinationByDestCode" parameterType="String" resultMap="EmisDestinationResult">
+        select id, dest_code, dest_name, dest_name_en, status, line_code, country, site_code, province, city, county, town, is_hinterland, country_area_id, remark, tenant_id, del_flag, create_by, create_site, create_time, update_by, update_site, update_time
+        from emis_destination a
+        where a.del_flag='0' and a.dest_code = #{destCode}
+    </select>
+
     <insert id="insertEmisDestination" parameterType="EmisDestination">
         insert into emis_destination
         <trim prefix="(" suffix=")" suffixOverrides=",">
diff --git a/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml
index 888b58f2c..2108046c2 100644
--- a/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml
@@ -104,6 +104,12 @@
         where a.id = #{id}
     </select>
 
+    <select id="getEmisTransProductByProdCode" parameterType="String" resultMap="EmisTransProductResult">
+        select id, prod_code, prod_name, prod_name_en, status, country, trans_line_code, trans_line, carry_type, trans_type, aging_desc, aging_flag, min_aging, max_aging, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        from emis_trans_product a
+        where a.del_flag='0' and a.prod_code = #{prodCode}
+    </select>
+
     <insert id="insertEmisTransProduct" parameterType="EmisTransProduct" useGeneratedKeys="true" keyProperty="id">
         insert into emis_trans_product
         <trim prefix="(" suffix=")" suffixOverrides=",">