|
|
@@ -349,6 +349,7 @@ function checkMaterialEnough(materialGroup, materialDetails) {
|
|
|
}
|
|
|
|
|
|
function checkPickMaterialForComposite(materialGroup, materialDetails, wantCount) {
|
|
|
+ lk.log(`test###########1##${wantCount}`)
|
|
|
let needNumDict = {};
|
|
|
for (let i = 0; i < materialGroup.length; i++) {
|
|
|
const materialObj = materialGroup[i];
|
|
|
@@ -369,6 +370,7 @@ function checkPickMaterialForComposite(materialGroup, materialDetails, wantCount
|
|
|
}
|
|
|
minCount = Math.min(minCount, wantCount);
|
|
|
let nCompositeGroup = [];
|
|
|
+ lk.log(`test###########2##${minCount}`)
|
|
|
for (let n = 0; n < minCount; n++) {
|
|
|
let resultMaterialLst = [];
|
|
|
let interrupt = false;
|
|
|
@@ -381,26 +383,27 @@ function checkPickMaterialForComposite(materialGroup, materialDetails, wantCount
|
|
|
interrupt = true;
|
|
|
break;
|
|
|
}
|
|
|
- let oneMaterial = {
|
|
|
+ let materialSeries = {
|
|
|
castingId: castingId,
|
|
|
orderList: [],
|
|
|
};
|
|
|
for (let j = ownLst.length - 1; j >= 0; j--) {
|
|
|
num -= 1;
|
|
|
let info = ownLst[j];
|
|
|
- oneMaterial.orderList.push(info.id);
|
|
|
+ materialSeries.orderList.push(info.id);
|
|
|
ownLst.splice(j, 1);
|
|
|
if (num == 0) {
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
- resultMaterialLst.push(oneMaterial);
|
|
|
+ resultMaterialLst.push(materialSeries);
|
|
|
}
|
|
|
if (interrupt) {
|
|
|
break;
|
|
|
}
|
|
|
nCompositeGroup.push(resultMaterialLst);
|
|
|
}
|
|
|
+ lk.log(`test###########3##`)
|
|
|
return nCompositeGroup;
|
|
|
}
|
|
|
|