From b8758fb3f2a63fb65c76838843f75cb664100c8c Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Fri, 30 Jan 2026 10:58:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=8D=95=E6=8D=AE=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E4=B8=AD=E7=9B=B4=E6=8E=A5=E7=9A=84SQL=E6=8B=BC=E6=8E=A5?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=B8=BA=E9=A2=84=E7=BC=96=E8=AF=91=E8=AF=AD?=
 =?UTF-8?q?=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/erp/controller/DepotItemController.java   |  9 +++------
 .../jsh/erp/datasource/mappers/DepotItemMapperEx.java |  2 +-
 .../java/com/jsh/erp/service/DepotItemService.java    |  4 ++--
 .../main/resources/mapper_xml/DepotItemMapperEx.xml   | 11 +++++++----
 4 files changed, 13 insertions(+), 13 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 07e39b85..f315984d 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
@@ -1062,7 +1062,7 @@ public class DepotItemController {
         Map<String, Object> data = new HashMap<>();
         String message = "";
         try {
-            String barCodes = "";
+            List<String> barCodeList = new ArrayList<>();
             //文件扩展名只能为xls
             String fileName = file.getOriginalFilename();
             if(StringUtil.isNotEmpty(fileName)) {
@@ -1118,12 +1118,9 @@ public class DepotItemController {
                     materialMap.put("taxRate", taxRate);
                     materialMap.put("remark", remark);
                     detailList.add(materialMap);
-                    barCodes += "'" + barCode + "',";
+                    barCodeList.add(barCode);
                 }
-                if (StringUtil.isNotEmpty(barCodes)) {
-                    barCodes = barCodes.substring(0, barCodes.length() - 1);
-                }
-                JSONObject map = depotItemService.parseMapByExcelData(barCodes, detailList, prefixNo);
+                JSONObject map = depotItemService.parseMapByExcelData(barCodeList, detailList, prefixNo);
                 if (map != null) {
                     res.code = 200;
                 } else {
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java
index 68f0d3bf..a97d4394 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java
@@ -252,7 +252,7 @@ public interface DepotItemMapperEx {
             @Param("batchNumber") String batchNumber);
 
     List<MaterialVo4Unit> getBillItemByParam(
-            @Param("barCodes") String barCodes);
+            @Param("barCodeList") List<String> barCodeList);
 
     BigDecimal getCurrentStockByParam(
             @Param("depotId") Long depotId,
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/DepotItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/DepotItemService.java
index ac221cc1..f11c6b26 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/DepotItemService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/DepotItemService.java
@@ -1341,10 +1341,10 @@ public class DepotItemService {
         return depotItemMapperEx.getCountByMaterialAndDepot(mId, depotId);
     }
 
-    public JSONObject parseMapByExcelData(String barCodes, List<Map<String, String>> detailList, String prefixNo) throws Exception {
+    public JSONObject parseMapByExcelData(List<String> barCodeList, List<Map<String, String>> detailList, String prefixNo) throws Exception {
         JSONObject map = new JSONObject();
         JSONArray arr = new JSONArray();
-        List<MaterialVo4Unit> list = depotItemMapperEx.getBillItemByParam(barCodes);
+        List<MaterialVo4Unit> list = depotItemMapperEx.getBillItemByParam(barCodeList);
         Map<String, MaterialVo4Unit> materialMap = new HashMap<>();
         Map<String, Long> depotMap = new HashMap<>();
         for (MaterialVo4Unit material: list) {
diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index b3167154..0fff6d6f 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -1122,8 +1122,11 @@
         from jsh_material m
         left join jsh_material_extend me on m.id=me.material_id and ifnull(me.delete_Flag,'0') !='1'
         where 1=1
-        <if test="barCodes != null">
-            and me.bar_code in (${barCodes})
+        <if test="barCodeList.size()>0">
+            and me.bar_code in
+            <foreach collection="barCodeList" item="item" index="index" separator="," open="(" close=")">
+                #{item}
+            </foreach>
         </if>
         and ifnull(m.delete_flag,'0') !='1'
         order by m.id desc
@@ -1134,10 +1137,10 @@
         from jsh_material_current_stock
         where 1=1
         <if test="depotId != null">
-            and depot_id = ${depotId}
+            and depot_id = #{depotId}
         </if>
         <if test="mId != null">
-            and material_id = ${mId}
+            and material_id = #{mId}
         </if>
         and ifnull(delete_flag,'0') !='1'
     </select>