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

代码更新

Browse Source
This commit is contained in:
ludj
2022-11-28 10:13:33 +08:00
parent 3b47815506
commit 75d1a7509d
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wms/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QTASK_01.wql
View File

@@ -40,12 +40,18 @@
IF 输入.flag = "1" IF 输入.flag = "1"
QUERY QUERY
SELECT point_code,point_uuid from sch_base_point WHERE lock_type='01' and point_code not in ( SELECT point_code,point_uuid from sch_base_point WHERE lock_type='01' and point_code not in (
SELECT start_point_code as point_code from sch_base_task task WHERE is_delete='0' and task_status <>'06' SELECT start_point_code as point_code from sch_base_task task WHERE is_delete='0' and task_status <>'06'
union union
SELECT next_point_code as point_code from sch_base_task task WHERE is_delete='0' and task_status <>'06' SELECT next_point_code as point_code from sch_base_task task WHERE is_delete='0' and task_status <>'06'
) )
and point_uuid not in (
SELECT turnin_struct_uuid as point_uuid from st_buss_dumpinv dump WHERE is_delete='0' and bill_status <>'04'
union
SELECT turnout_struct_uuid as point_uuid from st_buss_dumpinv dump WHERE is_delete='0' and bill_status <>'04'
)
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
ENDIF ENDIF

1
wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -32,7 +32,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
* task_code：任务编码 * task_code：任务编码
* task_status：1:执行中,2:完成 ,3:acs取消 * task_status：1:执行中,2:完成 ,3:acs取消
* *
* @param jsonObject 条件
* @return * @return
*/ */
public static void main(String[] args) { public static void main(String[] args) {

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java
View File

@@ -242,7 +242,7 @@ public class InTask extends AbstractAcsTask {
} }
JSONObject taskjo = WQLObject.getWQLObject("sch_base_task").query("task_uuid='" + task_uuid + "'").uniqueResult(0); JSONObject taskjo = WQLObject.getWQLObject("sch_base_task").query("task_uuid='" + task_uuid + "'").uniqueResult(0);
taskjo.optString("taskfinish_mode", "02"); taskjo.optString("taskfinish_mode", "02");
this.updateTaskStatus(taskjo, TaskStatusEnum.FINISHED.getCode()); this.updateTaskStatus(taskjo, TaskStatusEnum.EXECUTING.getCode());
} }
@Override @Override