From b842f9932ef4c74f34dd6ce97f747e907c4dda1f Mon Sep 17 00:00:00 2001
From: loujf <loujingfei666@163.com>
Date: Tue, 27 Sep 2022 16:36:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9E=9B=E5=9E=8B=E5=8F=82=E6=95=B0=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CribbinginfoServiceImpl.java  | 13 ++++++++++++-
 wms/qd/src/views/wms/Cribbing/index.vue        | 18 ++++++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/impl/CribbinginfoServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/impl/CribbinginfoServiceImpl.java
index 6501735..505a9d4 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/impl/CribbinginfoServiceImpl.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/impl/CribbinginfoServiceImpl.java
@@ -2,6 +2,7 @@
 package org.nl.wms.Cribbing.service.impl;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import org.nl.exception.BadRequestException;
@@ -37,9 +38,19 @@ public class CribbinginfoServiceImpl implements CribbinginfoService {
 
     @Override
     public Map<String, Object> queryAll(Map whereJson, Pageable page) {
+//        WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo");
+//        ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc");
+//        final JSONObject json = rb.pageResult();
+//        return json;
         WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo");
-        ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc");
+        String name = (String) whereJson.get("name");
+        String sql = "1=1";
+        if (StrUtil.isNotEmpty(name)) {
+            sql = " (material_code like '%" + name + "%' OR material_name like '%" + name + "%')";
+        }
+        ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), sql + " and is_delete='0'", "update_time desc");
         final JSONObject json = rb.pageResult();
+        log.info("json:{}", json);
         return json;
     }
 
diff --git a/wms/qd/src/views/wms/Cribbing/index.vue b/wms/qd/src/views/wms/Cribbing/index.vue
index b96458b..40ecdeb 100644
--- a/wms/qd/src/views/wms/Cribbing/index.vue
+++ b/wms/qd/src/views/wms/Cribbing/index.vue
@@ -4,16 +4,26 @@
     <div class="head-container">
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
+      <el-input
+        v-model="query.name"
+        size="small"
+        clearable
+        placeholder="输入物料名称或编码"
+        style="width: 200px;"
+        class="filter-item"
+        @keyup.enter.native="crud.toQuery"
+      />
+      <rrOperation />
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
-          <el-form-item v-if = "false" label="物料标志">
+          <el-form-item v-if="false" label="物料标志">
             <el-input v-model="form.material_id" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="物料编码">
-            <el-input v-model="form.material_code" style="width: 370px;" @focus="getMater"/>
+            <el-input v-model="form.material_code" style="width: 370px;" @focus="getMater" />
           </el-form-item>
-          <el-form-item v-if = "false" label="物料名称 ">
+          <el-form-item v-if="false" label="物料名称 ">
             <el-input v-model="form.material_name" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="产品编号">
@@ -292,7 +302,7 @@ export default {
   components: { pagination, crudOperation, rrOperation, udOperation, MaterDialog },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
-    return CRUD({title: '基础垛形参数', url: 'api/cribbinginfo', idField: 'info_id', sort: 'info_id,desc', crudMethod: { ...crudCribbinginfo }})
+    return CRUD({ title: '基础垛形参数', url: 'api/cribbinginfo', idField: 'info_id', sort: 'info_id,desc', crudMethod: { ...crudCribbinginfo }})
   },
   data() {
     return {