From c21d36715be68c24911faae10b96d8bad7b8d15f Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Wed, 10 Dec 2025 22:49:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=BA=8F=E5=88=97=E5=8F=B7=E5=95=86?= =?UTF-8?q?=E5=93=81=E7=9A=84=E5=8D=95=E6=8D=AE=E4=B8=AD=E7=9A=84=E5=87=BA?= =?UTF-8?q?=E5=BA=93=EF=BC=8C=E5=81=9A=E6=88=90=E6=94=AF=E6=8C=81=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=87=BA=E5=BA=93=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=88?= =?UTF-8?q?=E5=9C=A8=E5=87=BA=E5=BA=93=E7=9A=84=E6=97=B6=E5=80=99=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E5=BA=8F=E5=88=97=E5=8F=B7=E6=94=AF=E6=8C=81=E6=8C=89?= =?UTF-8?q?=E9=80=97=E5=8F=B7=E5=88=86=E9=9A=94=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/SerialNumberController.java | 14 ++++++++++++-- .../mappers/SerialNumberMapperEx.java | 2 ++ .../jsh/erp/service/SerialNumberService.java | 8 ++++---- .../mapper_xml/SerialNumberMapperEx.xml | 18 +++++++++++++++++- .../jeecgbiz/modal/JSelectSnAddModal.vue | 6 +++++- .../jeecgbiz/modal/JSelectSnModal.vue | 6 +++++- 6 files changed, 45 insertions(+), 9 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/SerialNumberController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/SerialNumberController.java index a2c9bc06..53d27ea2 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/SerialNumberController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/SerialNumberController.java @@ -7,6 +7,7 @@ import com.jsh.erp.service.DepotHeadService; import com.jsh.erp.service.DepotItemService; import com.jsh.erp.service.SerialNumberService; import com.jsh.erp.utils.BaseResponseInfo; +import com.jsh.erp.utils.StringUtil; import com.jsh.erp.utils.Tools; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -80,15 +81,24 @@ public class SerialNumberController { Map map = new HashMap<>(); try { String number = ""; + String [] nameArray = null; if(depotItemId != null) { DepotItem depotItem = depotItemService.getDepotItem(depotItemId); number = depotHeadService.getDepotHead(depotItem.getHeaderId()).getNumber(); } - List list = serialNumberService.getEnableSerialNumberList(number, name, depotId, barCode, (currentPage-1)*pageSize, pageSize); + // 批量查询序列号时，name可能为多个 + if(StringUtil.isNotEmpty(name)) { + name = name.replace("，",","); + if(name.contains(",")) { + nameArray = name.split(","); + name = null; + } + } + List list = serialNumberService.getEnableSerialNumberList(number, name, nameArray, depotId, barCode, (currentPage-1)*pageSize, pageSize); for(SerialNumberEx serialNumberEx: list) { serialNumberEx.setCreateTimeStr(Tools.getCenternTime(serialNumberEx.getCreateTime())); } - Long total = serialNumberService.getEnableSerialNumberCount(number, name, depotId, barCode); + Long total = serialNumberService.getEnableSerialNumberCount(number, name, nameArray, depotId, barCode); map.put("rows", list); map.put("total", total); res.code = 200; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java index 012693de..8b3ff0f2 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java @@ -44,12 +44,14 @@ public interface SerialNumberMapperEx { List getEnableSerialNumberList(@Param("number") String number, @Param("name") String name, + @Param("nameArray") String [] nameArray, @Param("depotId") Long depotId, @Param("barCode") String barCode, @Param("offset") Integer offset, @Param("rows") Integer rows); Long getEnableSerialNumberCount(@Param("number") String number, @Param("name") String name, + @Param("nameArray") String [] nameArray, @Param("depotId") Long depotId, @Param("barCode") String barCode); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/SerialNumberService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/SerialNumberService.java index f71c2e5a..232ae126 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/SerialNumberService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/SerialNumberService.java @@ -218,20 +218,20 @@ public class SerialNumberService { return result; } - public List getEnableSerialNumberList(String number, String name, Long depotId, String barCode, Integer offset, Integer rows)throws Exception { + public List getEnableSerialNumberList(String number, String name, String [] nameArray, Long depotId, String barCode, Integer offset, Integer rows)throws Exception { List list =null; try{ - list = serialNumberMapperEx.getEnableSerialNumberList(StringUtil.toNull(number), StringUtil.toNull(name), depotId, barCode, offset, rows); + list = serialNumberMapperEx.getEnableSerialNumberList(StringUtil.toNull(number), StringUtil.toNull(name), nameArray, depotId, barCode, offset, rows); }catch(Exception e){ JshException.readFail(logger, e); } return list; } - public Long getEnableSerialNumberCount(String number, String name, Long depotId, String barCode)throws Exception { + public Long getEnableSerialNumberCount(String number, String name, String [] nameArray, Long depotId, String barCode)throws Exception { Long count = 0L; try{ - count = serialNumberMapperEx.getEnableSerialNumberCount(StringUtil.toNull(number), StringUtil.toNull(name), depotId, barCode); + count = serialNumberMapperEx.getEnableSerialNumberCount(StringUtil.toNull(number), StringUtil.toNull(name), nameArray, depotId, barCode); }catch(Exception e){ JshException.readFail(logger, e); } diff --git a/jshERP-boot/src/main/resources/mapper_xml/SerialNumberMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/SerialNumberMapperEx.xml index 4491b99c..2b671190 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/SerialNumberMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/SerialNumberMapperEx.xml @@ -159,6 +159,14 @@ and ser.serial_number like #{bindName} + + and ser.serial_number + in ( + + #{name} + + ) + and ser.depot_id = #{depotId} @@ -187,6 +195,14 @@ and ser.serial_number like #{bindName} + + and ser.serial_number + in ( + + #{name} + + ) + and ser.depot_id = #{depotId} @@ -208,4 +224,4 @@ and is_sell = '0' and ifnull(delete_flag,'0') !='1' - \ No newline at end of file + diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectSnAddModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectSnAddModal.vue index 7ffb18e7..77f820cb 100644 --- a/jshERP-web/src/components/jeecgbiz/modal/JSelectSnAddModal.vue +++ b/jshERP-web/src/components/jeecgbiz/modal/JSelectSnAddModal.vue @@ -32,7 +32,7 @@
@@ -206,6 +206,10 @@ if(!this.queryParam.multiName) { return } + if(this.queryParam.multiName && this.queryParam.multiName.length>1000) { + this.$message.warning('序列号长度不能超出1000个字符！'); + return + } this.queryParam.multiName = this.queryParam.multiName.replaceAll('，',',') let nameArr = this.queryParam.multiName.split(',') for (let i = 0; i < nameArr.length; i++) { diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectSnModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectSnModal.vue index 0a2bc78b..de9059a2 100644 --- a/jshERP-web/src/components/jeecgbiz/modal/JSelectSnModal.vue +++ b/jshERP-web/src/components/jeecgbiz/modal/JSelectSnModal.vue @@ -17,7 +17,7 @@ - + @@ -329,6 +329,10 @@ this.selectionRows = selectionRows; }, onSearch() { + if(this.queryParam.name && this.queryParam.name.length>1000) { + this.$message.warning('序列号长度不能超出1000个字符！'); + return + } this.loadData(1); }, modalFormOk() {