From 7d0b842c3da2d879d9c958a232e8768946a7c90e Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 30 Jul 2024 10:26:20 +0800
Subject: [PATCH] md

---
 .../erp/emis/mapper/EmisWarehouseInMapper.java  |  3 +++
 .../emis/service/IEmisWarehouseInService.java   |  2 ++
 .../impl/EmisWarehouseInServiceImpl.java        |  7 +++++++
 .../resources/mapper/EmisWarehouseInMapper.xml  | 17 ++++++++++++++++-
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInMapper.java
index 174639631..e4bd0a9d9 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInMapper.java
@@ -28,6 +28,9 @@ public interface EmisWarehouseInMapper extends BaseMapper<EmisWarehouseIn>
      */
     public EmisWarehouseIn selectEmisWarehouseInById(Long id);
 
+
+    public EmisWarehouseIn selectEmisWarehouseInByInNo(String inNo);
+
     /**
      * 查询列表
      * 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInService.java
index 41fc70744..9c7ae0931 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInService.java
@@ -27,6 +27,8 @@ public interface IEmisWarehouseInService
      */
     public EmisWarehouseIn selectEmisWarehouseInById(Long id);
 
+ public EmisWarehouseIn selectEmisWarehouseInByInNo(String inNo);
+
     /**
      * 查询进仓单列表
      * 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java
index efdeb3180..c21590d1b 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java
@@ -41,6 +41,13 @@ public class EmisWarehouseInServiceImpl implements IEmisWarehouseInService
         return emisWarehouseInMapper.selectEmisWarehouseInById(id);
     }
 
+    @Override
+    public EmisWarehouseIn selectEmisWarehouseInByInNo(String inNo)
+    {
+        return emisWarehouseInMapper.selectEmisWarehouseInByInNo(inNo);
+    }
+
+
     /**
      * 查询进仓单列表
      * 
diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
index 2b08eb91b..593542968 100644
--- a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
@@ -27,6 +27,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                      fetchType="lazy"
         />
 
+    </resultMap>
+
+    <resultMap id="EmisWarehouseInDetailResult" type="EmisWarehouseIn" extends="BaseEmisWarehouseInResult"  >
+        <association property="waybillDetail"
+                     column="bill_code"
+                     select="com.xdadan.erp.emis.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"
+                     fetchType="lazy"
+        />
+
         <association property="stockInBatchList"
                      column="in_no"
                      select="com.xdadan.erp.emis.mapper.EmisWarehouseInBatchMapper.selectStockInBatchListByInNo"
@@ -80,11 +89,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by create_time desc
     </select>
   
-    <select id="selectEmisWarehouseInById" parameterType="Long" resultMap="EmisWarehouseInResult">
+    <select id="selectEmisWarehouseInById" parameterType="Long" resultMap="EmisWarehouseInDetailResult">
         select id, serial_no, in_no, order_sn, bill_code, customer_code, customer_name, entry_date, confirm_status, confirm_date, used_status, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site 
         from emis_warehouse_in a
         where a.id = #{id}
     </select>
+
+    <select id="selectEmisWarehouseInByInNo" parameterType="String" resultMap="EmisWarehouseInDetailResult">
+        select id, serial_no, in_no, order_sn, bill_code, customer_code, customer_name, entry_date, confirm_status, confirm_date, used_status, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        from emis_warehouse_in a
+        where a.in_no = #{inNo}
+    </select>
         
     <insert id="insertEmisWarehouseIn" parameterType="EmisWarehouseIn" useGeneratedKeys="true" keyProperty="id">
         insert into emis_warehouse_in