From a4085f7667065bcd415bf49e92043470bf0258f7 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Fri, 6 Jun 2025 11:21:52 +0800
Subject: [PATCH] =?UTF-8?q?rev:=20=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/MdPbStoragevehicleextMapper.java   | 11 ++++-
 .../mapper/MdPbStoragevehicleextMapper.xml    | 42 ++++++++++++++++---
 2 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.java
index 66b1db4..9b58ba2 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.java
@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleext;
 
-import java.util.List;
 import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -49,4 +49,13 @@ public interface MdPbStoragevehicleextMapper extends BaseMapper<MdPbStoragevehic
      * @return List<JSONObject>
      */
     List<JSONObject> erpQueryIvt(@Param("param") JSONObject whereJson);
+
+    /**
+     * 手持出库确认查询明细
+     * @param whereJson {
+     *              storagevehicle_code： 载具号
+     * }
+     * @return List<JSONObject>
+     */
+    List<JSONObject> getIosDtl(@Param("param") JSONObject whereJson);
 }
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml
index 60b40bb..ddbcc06 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml
@@ -21,7 +21,7 @@
             attr.struct_code AS turnout_struct_code
         FROM
             md_pb_storagevehicleext ext
-            LEFT JOIN md_me_materialbase material ON material.material_id = ext.material_id
+            INNER JOIN md_me_materialbase material ON material.material_id = ext.material_id
             INNER JOIN st_ivt_structattr attr ON ext.storagevehicle_code = attr.storagevehicle_code
         <where>
             attr.lock_type = '0'
@@ -74,8 +74,8 @@
         mater.material_name
         FROM
         md_pb_storagevehicleext ext
-        LEFT JOIN st_ivt_structattr attr ON ext.storagevehicle_code = attr.storagevehicle_code
-        LEFT JOIN md_me_materialbase mater ON mater.material_id = ext.material_id
+        INNER JOIN st_ivt_structattr attr ON ext.storagevehicle_code = attr.storagevehicle_code
+        INNER JOIN md_me_materialbase mater ON mater.material_id = ext.material_id
         <where>
             1 = 1
             <if test="param.stor_id != null and param.stor_id != ''">
@@ -135,9 +135,9 @@
             ext.insert_time AS in_time
         FROM
             md_pb_storagevehicleext ext
-            LEFT JOIN st_ivt_structattr attr ON ext.storagevehicle_code = attr.storagevehicle_code
-            LEFT JOIN md_me_materialbase mater ON mater.material_id = ext.material_id
-            LEFT JOIN md_pb_measureunit unit ON ext.qty_unit_id = unit.measure_unit_id
+            INNER JOIN st_ivt_structattr attr ON ext.storagevehicle_code = attr.storagevehicle_code
+            INNER JOIN md_me_materialbase mater ON mater.material_id = ext.material_id
+            INNER JOIN md_pb_measureunit unit ON ext.qty_unit_id = unit.measure_unit_id
         <where>
             attr.lock_type = '0'
             AND attr.is_used = "1"
@@ -160,4 +160,34 @@
         </where>
             ORDER BY ext.insert_time Desc
     </select>
+
+    <select id="getIosDtl" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            mst.bill_code,
+            point.point_code,
+            mater.material_id,
+            mater.material_code,
+            mater.material_name,
+            ext.storagevehicle_code,
+            ext.pcsn,
+            ext.canuse_qty AS qty,
+            ext.qty_unit_name,
+            ext.qty_unit_id,
+            ext.storagevehicleext_id
+        FROM
+            md_pb_storagevehicleext ext
+            INNER JOIN sch_base_point point ON ext.storagevehicle_code = point.vehicle_code
+            INNER JOIN st_ivt_iostorinvdis dis ON dis.iostorinvdis_id = point.ios_id
+            INNER JOIN st_ivt_iostorinv mst ON dis.iostorinv_id = mst.iostorinv_id
+            LEFT JOIN md_me_materialbase mater ON mater.material_id = ext.material_id
+        <where>
+            1 = 1
+            <if test="param.storagevehicle_code != null and param.storagevehicle_code != ''">
+                AND
+                ext.storagevehicle_code = #{param.storagevehicle_code}
+            </if>
+
+        </where>
+            ORDER BY ext.insert_time Desc
+    </select>
 </mapper>