From f3c671e9f8b93f33fb549f63b4695ed0aa37f62e Mon Sep 17 00:00:00 2001 From: zhangzq Date: Wed, 5 Aug 2026 09:29:21 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=87=BA=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dao/mapper/IOStorInvMapper.xml | 16 +++---- .../service/impl/OutBillServiceImpl.java | 45 ++----------------- nladmin-ui/src/views/wms/st/inbill/index.vue | 18 -------- nladmin-ui/src/views/wms/st/outbill/index.vue | 4 -- 4 files changed, 12 insertions(+), 71 deletions(-) diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/dao/mapper/IOStorInvMapper.xml b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/dao/mapper/IOStorInvMapper.xml index e3762ce..51fa0f7 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/dao/mapper/IOStorInvMapper.xml +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/dao/mapper/IOStorInvMapper.xml @@ -149,29 +149,29 @@ ios.is_upload = #{params.is_upload} - + AND - ios.stor_id IN #{params.storIds} + ios.stor_id = #{params.stor_id} - + AND - ios.bill_status IN #{params.billStatuses} + ios.bill_status = #{params.bill_status} - + AND - ios.bill_type IN #{params.billTypes} + ios.bill_type = #{params.bill_type} AND - dis.pcsn LIKE #{params.pcsn} + dis.pcsn = #{params.pcsn} AND - dis.pcsn IN #{params.pcsn_in} + dis.pcsn = #{params.pcsn_in} diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java index 58f59c8..bb1d553 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java @@ -122,56 +122,19 @@ public class OutBillServiceImpl extends ServiceImpl i // 空格查询 if (StrUtil.isNotEmpty(map.get("pcsn"))) { - // 判断是否有空格 - String pcsn = MapUtil.getStr(map, "pcsn"); - - boolean matches = pcsn.matches(".*\\s.*"); - - if (matches) { - String[] s = pcsn.split(" "); - String pcsn_in = String.join("','", Arrays.asList(s)); - - map.put("pcsn_in", "('"+pcsn_in+"')"); - map.put("pcsn", ""); - } else { - map.put("pcsn", "%" + map.get("pcsn") + "%"); - } + map.put("pcsn", map.get("pcsn")); } if (ObjectUtil.isNotEmpty(stor_id)) { - String storIds = "("; - for (int i = 0; i < stor_id.length; i++) { - if (i != stor_id.length - 1) { - storIds += "'" + stor_id[i] + "',"; - } else { - storIds += "'" + stor_id[i] + "')"; - } - } - map.put("storIds", storIds); + map.put("stor_id", map.get("stor_id")); } if (ObjectUtil.isNotEmpty(bill_status)) { - String billStatuses = "("; - for (int i = 0; i < bill_status.length; i++) { - if (i != bill_status.length - 1) { - billStatuses += "'" + bill_status[i] + "',"; - } else { - billStatuses += "'" + bill_status[i] + "')"; - } - } - map.put("billStatuses", billStatuses); + map.put("bill_status", map.get("bill_status")); } if (ObjectUtil.isNotEmpty(bill_type)) { - String billTypes = "("; - for (int i = 0; i < bill_type.length; i++) { - if (i != bill_type.length - 1) { - billTypes += "'" + bill_type[i] + "',"; - } else { - billTypes += "'" + bill_type[i] + "')"; - } - } - map.put("billTypes", billTypes); + map.put("bill_type", map.get("bill_type")); } return ioStorInvMapper.queryOutBillPage(new Page<>(page.getPage()+1,page.getSize()),map); diff --git a/nladmin-ui/src/views/wms/st/inbill/index.vue b/nladmin-ui/src/views/wms/st/inbill/index.vue index 3d52e62..c56a892 100644 --- a/nladmin-ui/src/views/wms/st/inbill/index.vue +++ b/nladmin-ui/src/views/wms/st/inbill/index.vue @@ -58,24 +58,6 @@ @change="crud.toQuery" /> - - - - - - -