优化ERP接收单据逻辑，一期领料变更逻辑修改

wangxinhui

9 天以前 3571d8b2231e06e46774af86be502014d6974e1d

 ÏîÄ¿´úÂë/BigScreen/src/views/index.vue

@@ -173,10 +173,13 @@
                    // 1. æŒ‰çº¸å·æ¡ç åˆ†ç»„
                    const groupedData = {};
                    res.data.data.forEach((x) => {
                        if (!groupedData[x.palletCode]) {
                        console.log(x);
                        if (x.taskNum) {
                            if (!groupedData[x.palletCode]) {
                            groupedData[x.palletCode] = [];
                            }
                            groupedData[x.palletCode].push(x);
                        }
                        groupedData[x.palletCode].push(x);
                    });
                    
                    // 2. å¤„理数据：将每组相同纸卷条码的记录合并为一条
@@ -196,7 +199,6 @@
                                uniquePalletCodes.add(item.palletCode);
                            }
                        });
                        this.showMsg = uniquePalletCodes.size;
                        
                        // ç›´æŽ¥å¤„理每条记录，不进行分组
                        group.forEach((item) => {
@@ -216,26 +218,26 @@
                        
                        // åˆ›å»ºåˆå¹¶åŽçš„单条记录
                        var item = [
                            '<span style="color:#FF4500; font-size:85px;">' + palletCode + '</span>',
                            '<span style="color:#FF4500; font-size:90px;">' + palletCode + '</span>',
                            //'<span style="color:#FF4500; font-size:55px;">' + orderNos + '</span>',
                            '<span style="color:#FF4500; font-size:85px;">' + firstItem.materielCode + '</span>',
                            '<span style="color:#FF4500; font-size:85px;">' + machineLastChar + '</span>',
                            '<span style="color:#FF4500; font-size:85px;">' + materialWide + '</span>',
                            '<span style="color:#FF4500; font-size:85px;;">' + originalQuantity + '</span>',
                            '<span style="color:#FF4500; font-size:85px;">' + parseInt(totalOrderQuantity) + '</span>',
                            '<span style="color:#FF4500; font-size:90px;">' + firstItem.materielCode + '</span>',
                            '<span style="color:#FF4500; font-size:90px;">' + machineLastChar + '</span>',
                            '<span style="color:#FF4500; font-size:90px;">' + materialWide + '</span>',
                            '<span style="color:#FF4500; font-size:90px;;">' + originalQuantity + '</span>',
                            '<span style="color:#FF4500; font-size:90px;">' + parseInt(totalOrderQuantity) + '</span>',
                        ];
                        arr.push(item);
                    });
                    if (this.IsDetail) {
                        this.config = {
                            header: [
                            '<span style="font-size:63px;">纸卷条码</span>',
                            '<span style="font-size:68px;">纸卷条码</span>',
                            //'<span style="font-size:50px;">工单号</span>',
                            '<span style="font-size:63px;">代码</span>',
                            '<span style="font-size:63px;">上机位</span>',
                            '<span style="font-size:63px;">宽幅</span>',
                            '<span style="font-size:63px;">纸卷长</span>',
                            '<span style="font-size:63px;">需用纸长</span>'
                            '<span style="font-size:68px;">代码</span>',
                            '<span style="font-size:68px;">上机位</span>',
                            '<span style="font-size:68px;">宽幅</span>',
                            '<span style="font-size:68px;">纸卷长</span>',
                            '<span style="font-size:68px;">需用纸长</span>'
                            ],
                            data: arr,
                            headerHeight: 60,