From a27c44dd0198cf12ecf8a31fd8d3206edc81b85f Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 5 Aug 2022 18:18:00 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=BA=93=E5=AD=98=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=9C=AA=E6=B7=BB=E5=8A=A0=E5=88=86=E5=BA=93=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/inventory/InvProductsController.java | 5 +---- .../resources/mybatis/mapper/inventory/InvProductDao.xml | 3 +++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java index 90a0610..5dec685 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java @@ -47,10 +47,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml index 6f142f9..a528401 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml @@ -239,6 +239,9 @@ AND invStorageCode like concat('%', #{invStorageCode,jdbcType=VARCHAR}, '%') + + AND invWarehouseCode like concat('%', #{invWarehouseCode,jdbcType=VARCHAR}, '%') + AND ip.batchNo like concat('%', #{batchNo,jdbcType=VARCHAR}, '%')