diff --git a/pages/productionReturnVerify/material.vue b/pages/productionReturnVerify/material.vue index bef6eae..24a8f28 100644 --- a/pages/productionReturnVerify/material.vue +++ b/pages/productionReturnVerify/material.vue @@ -262,18 +262,25 @@ res.data.list.forEach((item : any) => { EntryIds.push(item.FVHUBEntryId) ids.push(item.FID) + // ScanEntry.push({ + // FENTRYID: item.FVHUBEntryId, + // Qty: item.FVHUBScanQty, + // Flot: item.FVHUBFlot, + // StockId: item.FVHUBStock, + // StockFlex: item.FVHUBStockFlex + // }) + ScanEntry.push({ - FENTRYID: item.FVHUBEntryId, - Qty: item.FVHUBScanQty, - Flot: item.FVHUBFlot, - StockId: item.FVHUBStock, - StockFlex: item.FVHUBStockFlex + Ids: state.materialId, + EntryIds: item.FVHUBEntryId, + FQty: item.FVHUBScanQty + ' ', }) }) //推送数据 PRD_ReturnMtrlCheck({ - EntryIds: EntryIds.toString(), - Ids: state.materialId + // EntryIds: EntryIds.toString(), + // Ids: state.materialId + Items: ScanEntry }).then((resA : any) => { if (resA.code === 200) { fStockFlexDetailDelete({ Ids: ids.toString() }).then((res : any) => { diff --git a/pages/ruleValidation/verification.vue b/pages/ruleValidation/verification.vue index 633f362..0aba815 100644 --- a/pages/ruleValidation/verification.vue +++ b/pages/ruleValidation/verification.vue @@ -113,7 +113,7 @@ inputFocus: true, scanFrameDataFeedback: {}, shortcutDataFeedback: {}, - code:'' + code: '' }) onLoad((pageData : any) => { console.log(pageData); @@ -135,7 +135,7 @@ }) const scanConfirmFun = (e : any) => { - if(e != '') state.code = e + if (e != '') state.code = e getReceiveBillScanData(state.code) } const shortcutBoxShowShow = (val : boolean) => { @@ -165,7 +165,7 @@ if (debounceTimer.value !== null) clearTimeout(debounceTimer.value) debounceTimer.value = setTimeout(() => { state.queryString = e - if(e != '') state.code = e + if (e != '') state.code = e if (state.queryString !== '') getReceiveBillScanData(e) }, 500) } @@ -272,18 +272,24 @@ res.data.list.forEach((item : any) => { EntryIds.push(item.FVHUBEntryId) ids.push(item.FID) + // ScanEntry.push({ + // FENTRYID: item.FVHUBEntryId, + // Qty: item.FVHUBScanQty, + // Flot: item.FVHUBFlot, + // StockId: item.FVHUBStock, + // StockFlex: item.FVHUBStockFlex + // }) ScanEntry.push({ - FENTRYID: item.FVHUBEntryId, - Qty: item.FVHUBScanQty, - Flot: item.FVHUBFlot, - StockId: item.FVHUBStock, - StockFlex: item.FVHUBStockFlex + Ids: state.materialId, + EntryIds: item.FVHUBEntryId, + FQty: item.FVHUBScanQty + ' ', }) }) //推送数据 PRD_PickMtrlCheck({ - EntryIds: EntryIds.toString(), - Ids: state.materialId + // EntryIds: EntryIds.toString(), + // Ids: state.materialId + Items: ScanEntry }).then((res : any) => { console.log(); if (res.code === 200) {