From 271026979d74e5e9f913f85156e1af29ab1a61d0 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sun, 15 Jun 2025 16:01:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=95=86=E5=93=81=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=89=87=E7=9A=84=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsh/erp/controller/DepotItemController.java     | 5 +++++
 .../src/main/resources/mapper_xml/DepotItemMapperEx.xml      | 4 ++--
 .../src/main/resources/mapper_xml/MaterialMapperEx.xml       | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
index 4dbac175..6995ce05 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
@@ -389,6 +389,11 @@ public class DepotItemController {
                     } else {
                         item.put("thisAllPrice", thisSum.multiply(diEx.getPurchaseDecimal()));
                     }
+                    item.put("imgName", diEx.getImgName());
+                    if(fileUploadType == 2) {
+                        item.put("imgSmall", "small");
+                        item.put("imgLarge", "large");
+                    }
                     dataArray.add(item);
                 }
             }
diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index 0e769b1c..0cf7857c 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -350,7 +350,7 @@
 
     <select id="getInOutStock" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultByMaterial">
         select m.id MId, me.bar_code, m.name MName, m.mfrs MMfrs, m.model MModel, m.standard MStandard, m.brand,
-        m.other_field1 MOtherField1,m.other_field2 MOtherField2,m.other_field3 MOtherField3,
+        m.other_field1 MOtherField1,m.other_field2 MOtherField2,m.other_field3 MOtherField3, m.img_name,
         concat_ws('', m.unit, u.basic_unit) MaterialUnit, m.color MColor, m.unit_id, u.name unit_name,
         ifnull(me.purchase_decimal,0) purchase_decimal, ifnull(mcs.current_unit_price,0) currentUnitPrice
         from jsh_material m
@@ -377,7 +377,7 @@
         </if>
         and ifnull(m.delete_flag,'0') !='1'
         group by m.id, me.bar_code, m.name, m.mfrs, m.model, m.standard, m.brand,
-        m.other_field1,m.other_field2,m.other_field3,m.unit, u.basic_unit, m.color, m.unit_id, u.name,
+        m.other_field1,m.other_field2,m.other_field3, m.img_name ,m.unit, u.basic_unit, m.color, m.unit_id, u.name,
         me.purchase_decimal, mcs.current_unit_price
         order by m.id desc
         <if test="offset != null and rows != null">
diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
index a6001dde..5e397679 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
@@ -650,7 +650,7 @@
     </select>
 
     <select id="getListWithStock" resultMap="ResultMapListWithStock">
-        select m.id, m.name, m.standard, m.model, m.color, m.brand, m.mfrs, m.position,
+        select m.id, m.name, m.standard, m.model, m.color, m.brand, m.mfrs, m.position, m.img_name,
                me.commodity_unit unitName, mc.name categoryName, me.bar_code mBarCode,
         ifnull(me.purchase_decimal,0) purchaseDecimal,
         ifnull(mcs.current_unit_price,0) currentUnitPrice,
@@ -688,7 +688,7 @@
             or m.other_field2 like #{bindKey} or m.other_field3 like #{bindKey})
         </if>
         and ifnull(m.delete_flag,'0') !='1'
-        group by m.id, m.name, m.standard, m.model, m.color, m.brand, m.mfrs, m.position,
+        group by m.id, m.name, m.standard, m.model, m.color, m.brand, m.mfrs, m.position, m.img_name,
         me.commodity_unit, mc.name, me.bar_code, ifnull(me.purchase_decimal,0), ifnull(mcs.current_unit_price,0)
         <if test="zeroStock == 0">
             having ifnull(sum(mcs.current_number),0)!=0