From 4de2a260815278abbcfb45f16fe5009460795230 Mon Sep 17 00:00:00 2001
From: ludj <ldj_willow@163.com>
Date: Mon, 21 Nov 2022 10:41:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../st/ivt/service/impl/StructIvtServiceImpl.java    | 12 +++---------
 .../java/org/nl/wms/st/ivt/wql/QST_structIvt_01.wql  | 12 ++++++++++--
 wms/qd/src/views/wms/sch/point/index.vue             |  4 ++--
 wms/qd/src/views/wms/st/structIvt/index.vue          |  2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/service/impl/StructIvtServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/service/impl/StructIvtServiceImpl.java
index e646366..f628ad3 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/service/impl/StructIvtServiceImpl.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/service/impl/StructIvtServiceImpl.java
@@ -4,7 +4,6 @@ package org.nl.wms.st.ivt.service.impl;
 
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.json.JSONArray;
@@ -31,13 +30,7 @@ public class StructIvtServiceImpl implements StructIvtService {
 
     @Override
     public Map<String, Object> queryAll(Map whereJson, Pageable page) {
-        //QST_structIvt_01
-        String customer = (String)whereJson.get("customer");
-        String pcsn =(String) whereJson.get("pcsn");
-        String searchbar = "";
-        if (StrUtil.isNotEmpty(customer)&& StrUtil.isNotEmpty(pcsn)){
-            searchbar =pcsn+customer;
-        }
+
         HashMap json = new HashMap<>();
         json.put("flag", "1");
         json.put("material_blury", whereJson.get("material_blury"));
@@ -47,7 +40,8 @@ public class StructIvtServiceImpl implements StructIvtService {
         json.put("row_num", whereJson.get("row_num"));
         json.put("col_num", whereJson.get("col_num"));
         json.put("layer_num", whereJson.get("layer_num"));
-        json.put("searchbar",searchbar);
+        json.put("formula", whereJson.get("formula"));
+        json.put("pcsn", whereJson.get("pcsn"));
         JSONObject result = WQL.getWO("QST_structIvt_01").addParamMap(json).pageQuery(WqlUtil.getHttpContext(page), "ivt.instorage_time desc");
 
         //处理静置结束时间
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/wql/QST_structIvt_01.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/wql/QST_structIvt_01.wql
index 61fdfcb..219fe6b 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/wql/QST_structIvt_01.wql
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/wql/QST_structIvt_01.wql
@@ -22,6 +22,8 @@
 	输入.col_num			    	                  TYPEAS s_string
 	输入.layer_num			    	              TYPEAS s_string
 	输入.searchbar			    	              TYPEAS s_string
+	输入.pcsn			    	                  TYPEAS s_string
+	输入.formula			    	                  TYPEAS s_string
 
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
@@ -94,11 +96,17 @@
             OPTION 输入.row_num <> ""
                  struct.row_num = 输入.row_num
             ENDOPTION
-            OPTION 输入.col_num <> ""
-                 struct.col_num = 输入.col_num
+            OPTION 输入.formula <> ""
+                 labelMst.formula = 输入.formula
+            ENDOPTION
+             OPTION 输入.pcsn <> ""
+                 labelMst.pcsn = 输入.pcsn
             ENDOPTION
             OPTION 输入.layer_num <> ""
                  struct.layer_num = 输入.layer_num
+            ENDOPTION
+             OPTION 输入.layer_num <> ""
+                 struct.layer_num = 输入.layer_num
             ENDOPTION
             OPTION 输入.searchbar <> ""
                 ivt.label_code like  "%" 输入.searchbar
diff --git a/wms/qd/src/views/wms/sch/point/index.vue b/wms/qd/src/views/wms/sch/point/index.vue
index b316165..585f100 100644
--- a/wms/qd/src/views/wms/sch/point/index.vue
+++ b/wms/qd/src/views/wms/sch/point/index.vue
@@ -112,7 +112,7 @@
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
-        <el-button
+       <!-- <el-button
           slot="right"
           class="filter-item"
           type="info"
@@ -122,7 +122,7 @@
           @click="sync()"
         >
           仓位同步
-        </el-button>
+        </el-button>-->
       </crudOperation>
       <!--表单组件-->
       <el-dialog
diff --git a/wms/qd/src/views/wms/st/structIvt/index.vue b/wms/qd/src/views/wms/st/structIvt/index.vue
index 2ba72d3..9830b1c 100644
--- a/wms/qd/src/views/wms/st/structIvt/index.vue
+++ b/wms/qd/src/views/wms/st/structIvt/index.vue
@@ -175,8 +175,8 @@ export default {
       this.hand()
     },
     handleChangepcsn(value) {
+      this.query.formula = value[0]
       this.query.pcsn = value[1]
-      this.query.customer = value
       this.hand()
     },
     hand(value) {