From 3bacc728341977908fa71202bcdb10cbd26c802d Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Fri, 4 Nov 2022 16:24:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java | 2 +- .../src/main/java/org/nl/wms/pdm/wql/QPDM_WORKORDER01.wql | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java index 156839c1..d50a0391 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java @@ -67,7 +67,7 @@ public class WorkOrderServiceImpl implements WorkOrdereService { if (StrUtil.isNotEmpty(device_code)) { map.put("device_code", "%" + device_code + "%"); } - JSONObject json = WQL.getWO("QPDM_WORKORDER01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "WorkOrder.planend_time,mb.material_code,WorkOrder.pcsn"); + JSONObject json = WQL.getWO("QPDM_WORKORDER01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "planend_date,mb.material_code,WorkOrder.pcsn"); return json; } @Override diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKORDER01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKORDER01.wql index d49992d8..20a09895 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKORDER01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKORDER01.wql @@ -54,7 +54,9 @@ IF 输入.flag = "1" PAGEQUERY SELECT - WorkOrder.*, mb.material_code, + WorkOrder.*, + LEFT(WorkOrder.planend_time, 10) AS planend_date, + mb.material_code, mb.material_name, mb.ext_id, device.device_code,