From fdb53b5d30a1efa44fabf5eaf3abfa99a03b9ff3 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Tue, 5 Mar 2024 09:49:49 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=86=85=E5=8C=85=E9=97=B4=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java | 6 +++--- lms/nladmin-ui/src/views/tools/storage/index.vue | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java index b9ee676f9..1bcf5bf46 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java @@ -127,14 +127,14 @@ public class PaperTubeTask extends AbstractAcsTask { //todo:创建桁架任务搬运一个符合的气涨轴 JSONObject jo = new JSONObject(); jo.put("task_type", "010602"); - String public_area = ""; + /*String public_area = ""; if (product_area.equals("A1") || product_area.equals("A2")) { public_area = "A1"; } if (product_area.equals("A3") || product_area.equals("A4")) { public_area = "A3"; - } - JSONObject qhd_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("point_type = '6' AND product_area = '" + public_area + "'").uniqueResult(0); + }*/ + JSONObject qhd_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("point_type = '6' AND product_area = '" + product_area + "'").uniqueResult(0); jo.put("point_code1", qhd_jo.getString("point_code")); jo.put("point_code2", cbz_jo.getString("point_code")); jo.put("truss_type", "8"); diff --git a/lms/nladmin-ui/src/views/tools/storage/index.vue b/lms/nladmin-ui/src/views/tools/storage/index.vue index 4f82202c0..bf3ea3cda 100644 --- a/lms/nladmin-ui/src/views/tools/storage/index.vue +++ b/lms/nladmin-ui/src/views/tools/storage/index.vue @@ -65,7 +65,7 @@ >