货位更新

acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java

@@ -13,6 +13,7 @@ import org.nl.acs.device.service.dto.StorageCellDto;
 import org.nl.exception.BadRequestException;
 import org.nl.utils.FileUtil;
 import org.nl.utils.SecurityUtils;
+import org.nl.wql.WQL;
 import org.nl.wql.core.bean.ResultBean;
 import org.nl.wql.core.bean.WQLObject;
 import org.nl.wql.util.WqlUtil;
@@ -22,10 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @author wangs
@@ -39,9 +37,13 @@ public class StorageCellServiceImpl implements StorageCellService {
 
     @Override
     public Map<String, Object> queryAll(Map whereJson, Pageable page) {
-        WQLObject wo = WQLObject.getWQLObject("acs_storage_cell");
+        HashMap map = new HashMap<>(16);
-        ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "", "update_time desc");
+        map.put("flag","6");
-        final JSONObject json = rb.pageResult();
+        if (whereJson.get("blurry") != null) {
+            map.put("blurry", "%" + whereJson.get("blurry") + "%");
+        }
+
+        JSONObject json = WQL.getWO("Qdevice_query_002").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page),"update_time desc");
         return json;
     }
 

acs/hd/nladmin-system/src/main/java/org/nl/acs/device/wql/Qdevice_query_002.wql

@@ -138,4 +138,21 @@
                                        address.methods_id = 输入.methods_id
                                    ENDOPTION
    		ENDSELECT
-    ENDIF
+    ENDIF
+
+   IF 输入.flag = "6"
+      	PAGEQUERY
+      			SELECT
+                  	*
+                  FROM
+                  acs_storage_cell as storage_cell
+                  WHERE
+                  	1=1
+                  	 OPTION 输入.blurry <> ""
+                            (storage_cell.storage_code like 输入.blurry
+                            or storage_cell.parent_storage_code like 输入.blurry
+                            or storage_cell.address like 输入.blurry )
+                       ENDOPTION
+      		ENDSELECT
+      	ENDPAGEQUERY
+     ENDIF

acs/qd/src/views/acs/device/driver/lnsh/lnsh_rgv.vue

@@ -375,7 +375,7 @@ export default {
       get_device_code1: '',
       get_device_code2: '',
       load_device_code: '',
-      put_device_code: '',
+      put_device_code1: '',
       put_device_code2: '',
       configLoading: false,
       dataOpcservers: [],

acs/qd/src/views/acs/device/storageCell/index.vue

@@ -2,6 +2,18 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <el-input
+          v-model="query.blurry"
+          size="small"
+          clearable
+          placeholder="请输入编码或地址"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+        <rrOperation />
+      </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
       <!--表单组件-->
@@ -67,13 +79,15 @@
 import crudStorageCell from '@/api/acs/device/storageCell'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
+import rrOperation from '@crud/RR.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 
 const defaultForm = { storage_id: null, storage_code: null, x: null, y: null, z: null, address: null, remark: null, is_active: null, is_delete: null, create_by: null, create_time: null, update_by: null, update_time: null, parent_storage_code: null }
 export default {
   name: 'StorageCell',
-  components: { pagination, crudOperation, udOperation },
+  // eslint-disable-next-line no-undef
+  components: { pagination, crudOperation, udOperation, rrOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({ title: '库位管理', url: 'api/storageCell', idField: 'storage_id', sort: 'storage_id,desc', crudMethod: { ...crudStorageCell }})