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 data = new HashMap<>(); String message = ""; try { - String barCodes = ""; + List 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 getBillItemByParam( - @Param("barCodes") String barCodes); + @Param("barCodeList") List 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> detailList, String prefixNo) throws Exception { + public JSONObject parseMapByExcelData(List barCodeList, List> detailList, String prefixNo) throws Exception { JSONObject map = new JSONObject(); JSONArray arr = new JSONArray(); - List list = depotItemMapperEx.getBillItemByParam(barCodes); + List list = depotItemMapperEx.getBillItemByParam(barCodeList); Map materialMap = new HashMap<>(); Map 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 - - and me.bar_code in (${barCodes}) + + and me.bar_code in + + #{item} + and ifnull(m.delete_flag,'0') !='1' order by m.id desc @@ -1134,10 +1137,10 @@ from jsh_material_current_stock where 1=1 - and depot_id = ${depotId} + and depot_id = #{depotId} - and material_id = ${mId} + and material_id = #{mId} and ifnull(delete_flag,'0') !='1'