仓库管理修改

blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java

@@ -1,6 +1,5 @@
 package org.springblade.wms.controller;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -70,11 +69,6 @@ public class StGoodsController extends BladeController {
 		QueryWrapper<StGoods> wrapper = Condition.getQueryWrapper(stGoods, StGoods.class);
 		wrapper.eq("is_deleted", 0)
 			   .orderByDesc("create_time");
-
-		String goodsCodeAndGoodsName = StrUtil.toString(stGoods.get("goodsCodeAndGoodsName"));
-		if (StrUtil.isNotBlank(goodsCodeAndGoodsName)) {
-			wrapper.and(w -> w.like("goods_code", goodsCodeAndGoodsName).or().like("goods_name", goodsCodeAndGoodsName));
-		}
 		IPage<StGoods> pages = stGoodsService.page(Condition.getPage(query), wrapper);
 		return R.data(StGoodsWrapper.build().pageVO(pages));
 	}

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml

@@ -61,8 +61,18 @@
     </resultMap>
 
 
-    <select id="selectStGoodsPage" resultMap="stGoodsResultMap">
-        select * from ST_GOODS where is_deleted = 0
+    <select id="selectStGoodsPage" resultType="org.springblade.wms.pojo.vo.StGoodsVO">
+        SELECT *
+        FROM ST_GOODS
+        WHERE is_deleted = 0
+        AND used = 1
+        <if test="stGoods.goodsCodeAndGoodsName != null and stGoods.goodsCodeAndGoodsName != ''">
+            AND (
+            goods_code LIKE '%' || #{stGoods.goodsCodeAndGoodsName} || '%'
+            OR goods_name LIKE '%' || #{stGoods.goodsCodeAndGoodsName} || '%'
+            )
+        </if>
+        ORDER BY create_time DESC
     </select>
 
     <select id="selectFindAllGoodsPage" resultMap="stGoodsResultMap">