#

zhou zhou

6 小时以前 30f51a9b64a7db841f1659b8a06666c38d81331a

#

 pages/listing/matnrPalletising.vue

@@ -150,7 +150,7 @@
                    </view>
                </view>
                <view class="modal-footer">
                    <button class="modal-btn modal-btn-cancel" @click="closeAgvInputModal">取消</button>
                    <button class="modal-btn modal-btn-cancel" @click="handleAgvNo">不需要</button>
                    <button class="modal-btn modal-btn-confirm" @click="confirmAgvStation">确定</button>
                </view>
            </view>
@@ -383,7 +383,7 @@
                    return ;
                }
                // 显示AGV确认弹窗
                this.showAgvModal = true;
                this.showAgvInputModal = true;
            },
            confirm2() {
                if(this.container === '' || this.container === null){
@@ -402,45 +402,8 @@
                    })
                    return ;
                }
                this.submitConfirm2();
            },
            // 提交组托请求
            async submitConfirm2() {
                this.repeatClick = true				
                const newArr = this.list.map(item => {
					
                    return {
                        ...item,
                        anfme: item.anfme === null ? 0 : +item.anfme,					
                    };
                });
			
                const requestData = {
                    items: newArr,
                    barcode: this.container,
                };
                const {
                    code,
                    data,
                    msg
                } = await request('/waitPakin/merge', requestData)
                if (code === 200) {
                    uni.showToast({
                        title: '组盘成功'
                    })
                    this.list = []
                    this.barcode = ''
                    this.container = ''
                    this.isconfirm = false
                } else {
                    uni.showToast({
                        title: msg,
                        icon: "none",
                        position: 'top'
                    })
                }
                this.repeatClick = false
            },
                this.submitConfirm('');
            },			
            // 关闭AGV确认弹窗
            closeAgvModal() {
                this.showAgvModal = false;
@@ -492,14 +455,17 @@
            
            // 如果有AGV站点，添加到请求参数中
            if (agvStation) {
                requestData.agvStation = agvStation;
                requestData.staNo = agvStation;
                requestData.agvSign = 1;
            }else{
                requestData.agvSign = 0;
            }

            const {
                code,
                data,
                msg
            } = await request('/waitPakin/merge/v2', requestData)
            } = await request('/waitPakin/merge', requestData)
            if (code === 200) {
                uni.showToast({
                    title: '组盘成功'