|
@@ -1058,6 +1058,7 @@
|
|
|
const sSize = String(v.stackingLength);
|
|
|
allSizeArr.push(Number(sSize) / 1000);
|
|
|
// 重量相加
|
|
|
+ console.log('stackLength', v);
|
|
|
itemWeight += steelPlateFormula(v.stackingLength, v.stackingCount);
|
|
|
const stackKey = sSize + 'stackLength' + v.stackingBhtcId;
|
|
|
// 查找某一个堆垛 dataIndex='stackLength' + stackingBhtcId
|
|
@@ -1270,9 +1271,10 @@
|
|
|
remakeColSpan.value = Math.ceil(allSpan / 3);
|
|
|
const nnColSpan = Math.ceil((allSpan - remakeColSpan.value) / 2);
|
|
|
const newNNColSpan = nnColSpan % 2 === 0 ? nnColSpan : nnColSpan + 1;
|
|
|
- sizeColSpan.value = newNNColSpan / 2 > 4 ? 4 : newNNColSpan / 2;
|
|
|
- flowColSpan.value = newNNColSpan - sizeColSpan.value;
|
|
|
+ sizeColSpan.value = newNNColSpan / 2 > 4 ? 4 : newNNColSpan / 2 <= 2 ? 2 : newNNColSpan / 2;
|
|
|
+ flowColSpan.value = newNNColSpan - sizeColSpan.value <= 0 ? 1 : newNNColSpan - sizeColSpan.value;
|
|
|
weightColSpan.value = allSpan - remakeColSpan.value - newNNColSpan;
|
|
|
+
|
|
|
// console.log('列宽计算结果allSpan', allSpan);
|
|
|
// console.log('列宽计算结果stackColNums', stackColNums);
|
|
|
// console.log('列宽计算结果remakeColSpan.value', remakeColSpan.value);
|
|
@@ -1310,6 +1312,11 @@
|
|
|
hotSendList.value['老'].forEach((ele) => (allWeight += ele.weight));
|
|
|
}
|
|
|
|
|
|
+ if (Object.values(stackingSize)) {
|
|
|
+ stackingList.value = Object.values(stackingSize);
|
|
|
+ stackingList.value.forEach((ele) => (allWeight += ele.weight));
|
|
|
+ }
|
|
|
+
|
|
|
// 冷装统计
|
|
|
if (Object.values(rollOneHotAndColdSize['1'].roll_club_two).length) {
|
|
|
coldSendList.value['二'] = Object.values(rollOneHotAndColdSize['1'].roll_club_two);
|