From 167ba5ca35965f0d6723fd0bbfc3c7447a49aa2c Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 30 Sep 2022 17:22:22 +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 --- .../pdm/service/impl/ProductProcessParamServiceImpl.java | 4 ++-- .../wms/statistics/service/impl/PhysicalQueryServiceImpl.java | 2 +- .../src/views/wms/basedata/pdm/productProcessParam/index.vue | 3 +++ mes/qd/src/views/wms/statistics/phySicalQuery/index.vue | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/ProductProcessParamServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/ProductProcessParamServiceImpl.java index 38b6ad2a..d7dfd67a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/ProductProcessParamServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/ProductProcessParamServiceImpl.java @@ -113,12 +113,12 @@ public class ProductProcessParamServiceImpl implements ProductProcessParamServic json1.put("prop", "material_code"); json1.put("label", "物料编码"); json1.put("isVisiable", true); - result.add(json1); +// result.add(json1); JSONObject json2 = new JSONObject(); json2.put("prop", "material_name"); json2.put("label", "物料名称"); json2.put("isVisiable", true); - result.add(json2); +// result.add(json2); for (int i = 0; i < rows.size(); i++) { JSONObject jsonObject = rows.getJSONObject(i); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/PhysicalQueryServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/PhysicalQueryServiceImpl.java index ecd1086d..0bdc718a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/PhysicalQueryServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/PhysicalQueryServiceImpl.java @@ -166,7 +166,7 @@ public class PhysicalQueryServiceImpl implements PhysicalQueryService { // jsonResultArr.add(jsonResult2); // jsonResultArr.add(jsonResult20); jsonResultArr.add(jsonResult21); - jsonResultArr.add(jsonResult3); +// jsonResultArr.add(jsonResult3); jsonResultArr.add(jsonResult4); jsonResultArr.add(jsonResult5); for (int j = 0; j < jsonPointArr.size(); j++) { diff --git a/mes/qd/src/views/wms/basedata/pdm/productProcessParam/index.vue b/mes/qd/src/views/wms/basedata/pdm/productProcessParam/index.vue index 0abb1da3..cbe8778c 100644 --- a/mes/qd/src/views/wms/basedata/pdm/productProcessParam/index.vue +++ b/mes/qd/src/views/wms/basedata/pdm/productProcessParam/index.vue @@ -24,6 +24,9 @@ style="width: 100%;" @selection-change="crud.selectionChangeHandler" > + + + diff --git a/mes/qd/src/views/wms/statistics/phySicalQuery/index.vue b/mes/qd/src/views/wms/statistics/phySicalQuery/index.vue index 81a9e41d..5937536d 100644 --- a/mes/qd/src/views/wms/statistics/phySicalQuery/index.vue +++ b/mes/qd/src/views/wms/statistics/phySicalQuery/index.vue @@ -128,6 +128,7 @@ +