From 9d8c3668a18dd2856e5b799d19a58ed010f764de Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Tue, 7 Mar 2023 12:18:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java | 2 ++ .../main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql | 2 +- lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java index 590ee5f45..4b5729491 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java @@ -219,9 +219,11 @@ public class MesToLmsServiceImpl implements MesToLmsService { throw new BadRequestException("该生箔工单对应的状态不为准备就绪，不允许确认下卷！"); } // 下发ACS更改任务状态 + JSONObject task_jo = WQLObject.getWQLObject("SCH_BASE_Task").query("material_code = '" + containerName + "' and task_status <> '07' AND is_delete = '0'").uniqueResult(0); JSONArray paramArr = new JSONArray(); JSONObject json = new JSONObject(); json.put("device_code", jsonSb.getString("point_code")); + param.put("task_code", task_jo.getString("task_code")); json.put("option ", "2"); paramArr.add(json); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql index bcb2cdc92..d597d2d54 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql @@ -92,7 +92,7 @@ FROM sch_base_task WHERE - ( point_code1 = full_point_code OR point_code2 = full_point_code ) + ( point_code1 = empty_point_code OR point_code2 = empty_point_code ) AND task_status < '07' AND is_delete = '0' ) diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue index 90a5b47d6..d85b120b6 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue @@ -102,6 +102,9 @@ + + + @@ -153,7 +156,6 @@ -