From 2ec8e0c957115ea988f9762a70fcab600cbfb6bc Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Fri, 30 Sep 2022 17:26:43 +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/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java index 49aa747a..a33c136d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java @@ -1040,11 +1040,7 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService { } JSONObject work_task = WQLObject.getWQLObject("PDM_BI_WorkTask").query("worktask_id = '" + worktask_id + "'").uniqueResult(0); - //判断该设备是否属于喷雾设备 - JSONObject device_jo = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '"+device_code+"' AND workprocedure_code = 'GX003'").uniqueResult(0); - if (ObjectUtil.isEmpty(device_jo)){ - throw new PdaRequestException("请输入喷雾设备编码！"); - } + JSONObject device_jo = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_id = '" + work_task.getString("device_id") + "'").uniqueResult(0); if (StrUtil.isEmpty(work_task.getString("device_id"))) { throw new PdaRequestException("当前工序任务还未绑定设备！");