root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-08-23 08:50:44 +08:00
parent 4068867a38
commit 8fb6ba3d42
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/wql/QERP.wql
View File

@@ -136,13 +136,13 @@
PURCHASE_IN pp PURCHASE_IN pp
WHERE 1=1 WHERE 1=1
OPTION 输入.import_date4 <> "" OPTION 输入.import_date4 <> ""
pp.CREATIONTIME > to_date(输入.import_date4,'yyyy-mm-dd HH24:MI:SS') pp.CREATIONTIME > 输入.import_date4
ENDOPTION ENDOPTION
OPTION 输入.begin_time <> "" OPTION 输入.begin_time <> ""
pp.CREATIONTIME >= to_date(输入.begin_time,'yyyy-mm-dd HH24:MI:SS') pp.CREATIONTIME >= 输入.begin_time
ENDOPTION ENDOPTION
OPTION 输入.end_time <> "" OPTION 输入.end_time <> ""
pp.CREATIONTIME <= to_date(输入.end_time,'yyyy-mm-dd HH24:MI:SS') pp.CREATIONTIME <= 输入.end_time
ENDOPTION ENDOPTION
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY

4
mes/hd/nladmin-system/src/main/java/org/nl/pda/task/service/impl/HandTaskServiceImpl.java
View File

@@ -137,13 +137,13 @@ public class HandTaskServiceImpl implements HandTaskService {
taskjo.put("taskdtl_id", taskdtl_id); taskjo.put("taskdtl_id", taskdtl_id);
taskjo.put("task_id", task_id); taskjo.put("task_id", task_id);
taskjo.put("task_code", task_code); 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); 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")){ if (start_point.getString("area_type").equals("30")||next_point.getString("area_type").equals("30")){
taskjo.put("acs_task_type", "3"); taskjo.put("acs_task_type", "3");
}else { }else {
taskjo.put("acs_task_type", acs_task_type); taskjo.put("acs_task_type", acs_task_type);
}*/ }
//其他 //其他
taskjo.put("task_type", "11"); taskjo.put("task_type", "11");
//点对点 //点对点