From 67e8d2ab158d20f591b6f2197af32d3e80e56d49 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Tue, 16 Dec 2025 20:00:20 +0800
Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E5=BA=93=E5=AD=98=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=A2=9E=E5=8A=A0=E5=90=88=E8=AE=A1=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/MdPbStoragevehicleextMapper.java   |  7 ++++
 .../mapper/MdPbStoragevehicleextMapper.xml    | 40 +++++++++++++++++++
 .../MdPbStoragevehicleextServiceImpl.java     | 17 +++++++-
 .../views/wms/statement/structivt/index.vue   |  2 +-
 4 files changed, 64 insertions(+), 2 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 ed5f9e3..cf92d45 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
@@ -54,6 +54,13 @@ public interface MdPbStoragevehicleextMapper extends BaseMapper<MdPbStoragevehic
      */
     IPage<JSONObject> queryAllByPage(Page<JSONObject> page, @Param("param") Map whereJson);
 
+    /**
+     * 计算总计
+     * @param whereJson 入参
+     * @return List<JSONObject>
+     */
+    JSONObject queryAllSumQty(@Param("param") Map whereJson);
+
     /**
      * erp查询库存
      * @param 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 a0fb189..90491af 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
@@ -178,6 +178,46 @@
         ORDER BY ext.insert_time Desc
     </select>
 
+    <select id="queryAllSumQty" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            SUM(ext.canuse_qty) AS canuse_qty,
+            SUM(ext.frozen_qty) AS frozen_qty
+        FROM
+            md_pb_storagevehicleext ext
+            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
+            LEFT JOIN md_pb_groupplate late ON late.material_id = ext.material_id and late.pcsn = ext.pcsn and late.storagevehicle_code = ext.storagevehicle_code
+        <where>
+            1 = 1
+            <if test="param.stor_id != null and param.stor_id != ''">
+                AND
+                attr.stor_id = #{param.stor_id}
+            </if>
+
+            <if test="param.sect_id != null and param.sect_id != ''">
+                AND
+                attr.sect_id = #{param.sect_id}
+            </if>
+
+            <if test="param.struct_code != null and param.struct_code != ''">
+                AND
+                (attr.struct_code LIKE #{param.struct_code} or
+                attr.struct_name LIKE #{param.struct_code} )
+            </if>
+
+            <if test="param.material_code != null and param.material_code != ''">
+                AND
+                (mater.material_code LIKE #{param.material_code} or
+                mater.material_name LIKE #{param.material_code} )
+            </if>
+
+            <if test="param.pcsn != null and param.pcsn != ''">
+                AND
+                ext.pcsn LIKE #{param.pcsn}
+            </if>
+        </where>
+    </select>
+
     <select id="queryCanuseSum" resultType="java.math.BigDecimal">
         SELECT
         SUM(canuse_qty)
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicleextServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicleextServiceImpl.java
index 6e78200..b9abfd9 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicleextServiceImpl.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicleextServiceImpl.java
@@ -77,8 +77,23 @@ public class MdPbStoragevehicleextServiceImpl extends ServiceImpl<MdPbStorageveh
 
     @Override
     public IPage<JSONObject> queryAll(Map whereJson, PageQuery page) {
-        return this.baseMapper.queryAllByPage(new Page<>(page.getPage() + 1, page.getSize()),
+        IPage<JSONObject> jsonObjectIPage = this.baseMapper.queryAllByPage(new Page<>(page.getPage() + 1, page.getSize()),
                 whereJson);
+        List<JSONObject> records = jsonObjectIPage.getRecords();
+        JSONObject jsonSum = this.baseMapper.queryAllSumQty(whereJson);
+
+        if (ObjectUtil.isNotEmpty(jsonSum)) {
+            jsonSum.put("sect_name", "合计");
+            records.add(jsonSum);
+        } else {
+            if (ObjectUtil.isNotEmpty(records)) {
+                JSONObject json = new JSONObject();
+                json.put("sect_name","合计");
+                records.add(json);
+            }
+        }
+        jsonObjectIPage.setRecords(records);
+        return jsonObjectIPage;
     }
 
     @Override
diff --git a/wms/nladmin-ui/src/views/wms/statement/structivt/index.vue b/wms/nladmin-ui/src/views/wms/statement/structivt/index.vue
index 4e318f1..8955e0c 100644
--- a/wms/nladmin-ui/src/views/wms/statement/structivt/index.vue
+++ b/wms/nladmin-ui/src/views/wms/statement/structivt/index.vue
@@ -160,7 +160,7 @@ export default {
     },
     toView(vehicle) {
       this.showModal = true
-      crudStructivt.imageLoad('vehicle').then(response => {
+      crudStructivt.imageLoad(vehicle).then(response => {
         const blob = new Blob([response]) // 尽可能根据响应头确定类型
         this.imageUrl = URL.createObjectURL(blob)
       }