From 8fb6ba3d42a3aacbabec6adc0e4b1280e2f1db43 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Tue, 23 Aug 2022 08:50:44 +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

---
 .../src/main/java/org/nl/ext/erp/wql/QERP.wql               | 6 +++---
 .../org/nl/pda/task/service/impl/HandTaskServiceImpl.java   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/wql/QERP.wql b/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/wql/QERP.wql
index 4c6422d5..c699bbea 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/wql/QERP.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/wql/QERP.wql
@@ -136,13 +136,13 @@
                         PURCHASE_IN pp
                     WHERE 1=1
                         OPTION 输入.import_date4 <> ""
-                               pp.CREATIONTIME > to_date(输入.import_date4,'yyyy-mm-dd HH24:MI:SS')
+                               pp.CREATIONTIME > 输入.import_date4
                         ENDOPTION
                         OPTION 输入.begin_time <> ""
-                               pp.CREATIONTIME >= to_date(输入.begin_time,'yyyy-mm-dd HH24:MI:SS')
+                               pp.CREATIONTIME >= 输入.begin_time
                         ENDOPTION
                         OPTION 输入.end_time <> ""
-                               pp.CREATIONTIME <= to_date(输入.end_time,'yyyy-mm-dd HH24:MI:SS')
+                               pp.CREATIONTIME <= 输入.end_time
                         ENDOPTION
                     ENDSELECT
                 ENDQUERY
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/task/service/impl/HandTaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/task/service/impl/HandTaskServiceImpl.java
index 41d32368..8473ade3 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/task/service/impl/HandTaskServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/task/service/impl/HandTaskServiceImpl.java
@@ -137,13 +137,13 @@ public class HandTaskServiceImpl implements HandTaskService {
         taskjo.put("taskdtl_id", taskdtl_id);
         taskjo.put("task_id", task_id);
         taskjo.put("task_code", task_code);
-        /*JSONObject start_point = WQLObject.getWQLObject("sch_base_point").query("point_code = '"+start_point_code+"'").uniqueResult(0);
+        JSONObject start_point = WQLObject.getWQLObject("sch_base_point").query("point_code = '"+start_point_code+"'").uniqueResult(0);
         JSONObject next_point = WQLObject.getWQLObject("sch_base_point").query("point_code = '"+next_point_code+"'").uniqueResult(0);
         if (start_point.getString("area_type").equals("30")||next_point.getString("area_type").equals("30")){
             taskjo.put("acs_task_type", "3");
         }else {
             taskjo.put("acs_task_type", acs_task_type);
-        }*/
+        }
         //其他
         taskjo.put("task_type", "11");
         //点对点