|
|
@@ -140,7 +140,7 @@ function getCompositeTaskListStatus() {
|
|
|
function getCompositeTaskMode() {
|
|
|
let val = lk.getVal(GandartConstKey.CompositeTaskMode);
|
|
|
if (lk.isEmpty(val)) {
|
|
|
- val = 1;
|
|
|
+ val = 0;
|
|
|
} else {
|
|
|
val = Number(val);
|
|
|
}
|
|
|
@@ -186,12 +186,17 @@ function getWillCompositeTaskId() {
|
|
|
}
|
|
|
|
|
|
async function tryToExecCompositeTask(taskId, taskInfo = {}) {
|
|
|
- if (getCompositeTaskMode() == 0) {
|
|
|
+ if (getCompositeTaskMode() == 1) {
|
|
|
let jsonStr = lk.getVal(GandartConstKey.CompositeTaskMateList);
|
|
|
if (!lk.isEmpty(jsonStr)) {
|
|
|
let data = JSON.parse(jsonStr);
|
|
|
let taskInfo = data.taskInfo;
|
|
|
let finalGroups = data.finalGroups;
|
|
|
+ if (finalGroups.length == 0) {
|
|
|
+ lk.log('暂无可行的合成组合,请检查');
|
|
|
+ lk.appendNotifyInfo('⚠️暂无可行的合成组合');
|
|
|
+ return;
|
|
|
+ }
|
|
|
let retOrderLst = [];
|
|
|
for (let i = 0; i < finalGroups.length; i++) {
|
|
|
let ret = await confirmCompositeV2(taskInfo.id, taskInfo, finalGroups[i]);
|
|
|
@@ -238,6 +243,11 @@ async function tryToExecCompositeTask(taskId, taskInfo = {}) {
|
|
|
}
|
|
|
lk.log("test##########4");
|
|
|
if (isExecFinalComposite()) {
|
|
|
+ if (finalGroups.length == 0) {
|
|
|
+ lk.log('暂无可行的合成组合,请检查');
|
|
|
+ lk.appendNotifyInfo('⚠️暂无可行的合成组合');
|
|
|
+ return;
|
|
|
+ }
|
|
|
let retOrderLst = [];
|
|
|
for (let i = 0; i < finalGroups.length; i++) {
|
|
|
let ret = await confirmCompositeV2(taskId, taskInfo, finalGroups[i]);
|