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

Compare commits

base: root:f1ca435080885181e33c74f741bc24ab9a28aa6d
Branches Tags
root:master root:acs_dev root:master_merge_0523 root:merge&mdm0417 root:master_merge_slitting_alter root:feature/dev_mdm_0522 root:acs_dev_kep root:agv_twoFloorAgvScreen_acs_dev root:master_merge root:master_1 root:feature/sso_function_v1205
...
compare: root:f84ffe894f188e31c1b7d0bc6feb60d85fca4611
Branches Tags
root:acs_dev root:master_merge_0523 root:merge&mdm0417 root:master_merge_slitting_alter root:feature/dev_mdm_0522 root:acs_dev_kep root:agv_twoFloorAgvScreen_acs_dev root:master_merge root:master_1 root:master root:feature/sso_function_v1205

2 Commits
f1ca435080 ... f84ffe894f

Author SHA1 Message Date
liyongde
f84ffe894f Merge remote-tracking branch 'origin/master_merge_0523' into master_merge_0523 2026-01-21 15:48:50 +08:00
liyongde
d04ac713f2 fix: 气胀轴回退任务下发控制 2026-01-21 15:47:31 +08:00
1 changed files with 1 additions and 1 deletions
Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/ReturnShaftAgvTask.java
View File

@@ -178,7 +178,7 @@ public class ReturnShaftAgvTask extends AbstractAcsTask {
param.put("task_group_id", task_group_id); param.put("task_group_id", task_group_id);
task2 = sendShaftToCacheTask.createTask(param); task2 = sendShaftToCacheTask.createTask(param);
} }
sendShaftToCacheTask.immediateNotifyAcs(ObjectUtil.isNotEmpty(task1) ? task1 : task2); // sendShaftToCacheTask.immediateNotifyAcs(ObjectUtil.isNotEmpty(task1) ? task1 : task2);
} }
// 取消 // 取消
if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) { if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {