diff --git a/components/architecture/architecture.vue b/components/architecture/architecture.vue index a7c12c0..506fc01 100644 --- a/components/architecture/architecture.vue +++ b/components/architecture/architecture.vue @@ -67,7 +67,6 @@ if (props.fence.filter((item : any) => item).length === 0) { state.inputText = res state.show = false - console.log(res); emits('scanConfirm', res) } } @@ -75,9 +74,11 @@ emits('inputConfirm', e) } const closeFun = (time : number = 4000) => { + console.log('123'); setTimeout(() => { state.inputText = '' state.show = true + console.log('456'); emits('inputConfirm', '') },time) } diff --git a/components/scan-frame/scan-frame.vue b/components/scan-frame/scan-frame.vue index dae2230..4bda038 100644 --- a/components/scan-frame/scan-frame.vue +++ b/components/scan-frame/scan-frame.vue @@ -138,6 +138,7 @@ state.locationData = obj.locationData if (state.warehouseData.FIsOpenLocation) { state.NoLocationList = true + state.NoLocationListText = t('index.ksmcw') } else { state.NoLocationList = false @@ -167,29 +168,28 @@ //首次数据校验&修正 const dataValidation = () => { //批号校验 - if (state.receiveBillScanData.FIsBatchManage === 'True') { - if (state.scanFrame.batchNumberStr !== '' && state.scanFrame.batchNumberStr !== state.receiveBillScanData.FLot_Text) { - state.show = true - uni.showModal({ - title: t('index.ts'), content: '与默认批号不同，是否替换新的批号', cancelText: '取消', confirmText: '替换', - success(res) { - if (res.confirm) { - state.scanFrame.batchNumberStr = state.receiveBillScanData.FLot_Text - } else if (res.cancel) { - console.log('用户点击取消'); - } - } - }); - } else if (state.scanFrame.batchNumberStr == '') { - state.scanFrame.batchNumberStr = state.receiveBillScanData.FLot_Text - } - } else { - state.scanFrame.batchNumberStr = '', - state.batchNumberStrState = true - state.batchNumberStrPdr = '批号未启用' - } - - + // if (state.receiveBillScanData.FIsBatchManage === 'True') { + // if (state.scanFrame.batchNumberStr !== '' && state.scanFrame.batchNumberStr !== state.receiveBillScanData.FLot_Text) { + // state.show = true + // uni.showModal({ + // title: t('index.ts'), content: '与默认批号不同，是否替换新的批号', cancelText: '取消', confirmText: '替换', + // success(res) { + // if (res.confirm) { + // state.scanFrame.batchNumberStr = state.receiveBillScanData.FLot_Text + // } else if (res.cancel) { + // console.log('用户点击取消'); + // } + // } + // }); + // } else if (state.scanFrame.batchNumberStr == '') { + // state.scanFrame.batchNumberStr = state.receiveBillScanData.FLot_Text + // } + // } else { + // state.scanFrame.batchNumberStr = '' + // state.batchNumberStrState = true + // state.batchNumberStrPdr = '批号未启用' + // } + state.scanFrame.batchNumberStr = state.receiveBillScanData.FLot_Text //仓库校验 if (Object.keys(state.warehouseData).length !== 0 && Object.keys(state.receiveBillScanData.StockId).length !== 0) { console.log('断点1'); @@ -214,6 +214,7 @@ FNAME: formatLangTextValue(state.receiveBillScanData.StockId.Name), FNUMBER: state.receiveBillScanData.StockId.Number, FSTOCKID: state.receiveBillScanData.StockId.Id, + } if (state.warehouseData.FIsOpenLocation) { state.NoLocationList = true @@ -232,7 +233,6 @@ } state.scanFrame.articlesStr = state.receiveBillScanData.MaterialNumber state.scanFrame.barCodeStr = state.receiveBillScanData.queryString - //如果开启了异常弹出，则自动返回数据 if (!state.receiveBillScanData.scanFrameShowSate && !state.show) { if (dataVerifyFun()) { @@ -247,7 +247,7 @@ eimts('confirmation', { ...state.scanFrame, warehouseData: state.warehouseData, locationData: state.locationData || {}, id: state.receiveBillScanData.Id }) dataErase() state.show = false - eimts('boxShow',state.show) + eimts('boxShow', state.show) } } @@ -302,11 +302,11 @@ */ const close = () => { state.show = false - console.log('===================<><><><><><>=====================',state.show); - eimts('boxShow',state.show) + console.log('===================<><><><><><>=====================', state.show); + eimts('boxShow', state.show) } - const open = () => { - eimts('boxShow',state.show) + const open = () => { + eimts('boxShow', state.show) } //待使用 const stateShow = (val : boolean) => { state.show = val } @@ -321,7 +321,6 @@ } const warehouseDataFun = (item : any) => { state.warehouseData = item - console.log(item); state.scanFrame.warehouseStr = item.FNAME state.warehouse = false state.locationData = {} diff --git a/components/tools/shortcut.vue b/components/tools/shortcut.vue index b5869de..e40f276 100644 --- a/components/tools/shortcut.vue +++ b/components/tools/shortcut.vue @@ -82,7 +82,7 @@ import { fStockFlexDetailList } from '../../common/request/api/api'; const getI18n = useI18n() const { t, locale } = getI18n - const eimts = defineEmits(['dataToscanFrame','boxShow']) + const eimts = defineEmits(['dataToscanFrame', 'boxShow']) const state = reactive({ show: false, warehouse: false, @@ -92,6 +92,7 @@ NoLocationListText: t('public.xzcw'), NoLocationList: true, specialModule: '', + modeTyoeStr: '', shortcut: { warehouseStr: '', locationStr: '', @@ -139,12 +140,32 @@ const open = () => { eimts('boxShow', state.show) } + const dataToscanFrameFun = () => { if (state.shortcut.warehouseStr !== '' && state.NoLocationList && state.shortcut.locationStr === '') { uni.$u.toast(t('public.qxzcw')) state.show = true return } + if(state.modeTyoeStr !== ''){ + let shortcutObjList : any = [...uni.getStorageSync('shortcutObj')] + let shortcutObjItem : any = uni.getStorageSync('shortcutObj').find((item : any) => item.key === state.modeTyoeStr) + if (Object.keys(shortcutObjItem).length !== 0) { + shortcutObjList.forEach((item : any) => { + if(item.key === state.modeTyoeStr){ + item.warehouseData = state.warehouseData + item.locationData = state.locationData + } + }) + } else { + shortcutObjList.push({ + key: state.modeTyoeStr, + warehouseData: state.warehouseData, + locationData: state.locationData + }) + } + uni.setStorageSync('shortcutObj',shortcutObjList) + } eimts('dataToscanFrame', { ...state.shortcut, warehouseData: state.warehouseData, @@ -164,7 +185,24 @@ } eimts('dataToscanFrame', {}) } - const stateShow = (val : boolean, specialModule : string = '') => { + const stateShow = (val : boolean, specialModule : string = '', modeTyoeStr : string = '') => { + if (modeTyoeStr != '') { + state.modeTyoeStr = modeTyoeStr + if (!uni.getStorageSync('shortcutObj')) uni.setStorageSync('shortcutObj', []) + else { + let shortcutObjItem : any = uni.getStorageSync('shortcutObj').find((item : any) => item.key === modeTyoeStr) + if (Object.keys(shortcutObjItem).length !== 0) { + if (Object.keys(shortcutObjItem.warehouseData).length) { + state.warehouseData = shortcutObjItem.warehouseData + state.shortcut.warehouseStr = shortcutObjItem.warehouseData.FNAME + } + if (Object.keys(shortcutObjItem.locationData).length) { + state.locationData = shortcutObjItem.locationData + state.shortcut.locationStr = shortcutObjItem.locationData.FFlexValueName + } + } + } + } state.specialModule = specialModule state.show = val } diff --git a/i18n/cn.ts b/i18n/cn.ts index ad03d8e..214b815 100644 --- a/i18n/cn.ts +++ b/i18n/cn.ts @@ -33,7 +33,7 @@ export const cn = { 'grn': '收料通知单号', 'date': '日期', 'gys': '供应商', - 'mmsph': '美塞斯批号', + 'mmsph': '批号', 'wlbm': '物料编码', 'tj': '提交', 'tm': '条码', @@ -54,12 +54,12 @@ export const cn = { 'ckmc':'仓库名称', 'cwmc':'仓位名称', 'qty': '数量', - 'mmsph': '美塞斯批号', + 'mmsph': '批号', 'xzck': '选择仓库', 'xzcw':'选择仓位', 'cwwqy':'仓位未启用', 'qsrsl':'请输入数量', - 'qsrmssph':'请输入美塞斯批号', + 'qsrmssph':'请输入批号', 'gdtcckMessage':'扫描后固定弹出窗口', 'gdtc':'固定弹出', 'yctc':'异常弹出', diff --git a/pages.json b/pages.json index 403514f..5a4115f 100644 --- a/pages.json +++ b/pages.json @@ -56,9 +56,6 @@ { "path": "pages/material/material" }, - - - { "path": "pages/supplement/index" }, @@ -74,8 +71,6 @@ { "path": "pages/supplementaryValidation/material" }, - - { "path": "pages/returnMaterials/index" }, diff --git a/pages/BatchOutOftock/material.vue b/pages/BatchOutOftock/material.vue index 0f60e2f..62330f6 100644 --- a/pages/BatchOutOftock/material.vue +++ b/pages/BatchOutOftock/material.vue @@ -252,7 +252,8 @@ } //唤起默认值弹窗 const defaultPopupFun = () => { - shortcutRef.value.stateShow(true) + shortcutRef.value.stateShow(true,'','BatchOutOftock') + //Ba } const scanRecordFun = () => { toPages('/pages/records/index', { diff --git a/pages/main/home.vue b/pages/main/home.vue index 87551f2..149b304 100644 --- a/pages/main/home.vue +++ b/pages/main/home.vue @@ -42,7 +42,6 @@ {{ t('home.sctlyz') }} - {{ t('index.ctll') }} diff --git a/pages/material/material.vue b/pages/material/material.vue index 5f86d08..0c03e62 100644 --- a/pages/material/material.vue +++ b/pages/material/material.vue @@ -234,7 +234,7 @@ } //唤起默认值弹窗 const defaultPopupFun = () => { - shortcutRef.value.stateShow(true) + shortcutRef.value.stateShow(true,'','material') } const scanRecordFun = () => { toPages('/pages/records/index', { diff --git a/pages/productionReturnVerify/material.vue b/pages/productionReturnVerify/material.vue index 24a8f28..b186637 100644 --- a/pages/productionReturnVerify/material.vue +++ b/pages/productionReturnVerify/material.vue @@ -230,7 +230,7 @@ } //唤起默认值弹窗 const defaultPopupFun = () => { - shortcutRef.value.stateShow(true) + shortcutRef.value.stateShow(true,'','productionReturnVerify') } const scanRecordFun = () => { toPages('/pages/records/index', { @@ -278,8 +278,6 @@ }) //推送数据 PRD_ReturnMtrlCheck({ - // EntryIds: EntryIds.toString(), - // Ids: state.materialId Items: ScanEntry }).then((resA : any) => { if (resA.code === 200) { diff --git a/pages/productionStorage/material.vue b/pages/productionStorage/material.vue index 3b3c70f..68beb18 100644 --- a/pages/productionStorage/material.vue +++ b/pages/productionStorage/material.vue @@ -225,7 +225,7 @@ } //唤起默认值弹窗 const defaultPopupFun = () => { - shortcutRef.value.stateShow(true) + shortcutRef.value.stateShow(true,'','productionStorage') } const scanRecordFun = () => { toPages('/pages/records/index', { diff --git a/pages/purchase/material.vue b/pages/purchase/material.vue index 4b831e4..beb2aaf 100644 --- a/pages/purchase/material.vue +++ b/pages/purchase/material.vue @@ -250,7 +250,7 @@ } //唤起默认值弹窗 const defaultPopupFun = () => { - shortcutRef.value.stateShow(true) + shortcutRef.value.stateShow(true,'','purchase') } const scanRecordFun = () => { toPages('/pages/records/index', { diff --git a/pages/purchaseTa/material.vue b/pages/purchaseTa/material.vue index 96edff3..494c117 100644 --- a/pages/purchaseTa/material.vue +++ b/pages/purchaseTa/material.vue @@ -178,11 +178,12 @@ FBillNo: state.FBillNo, IsInStock: 'true' }).then((res : any) => { - if (res.data !== null) { - console.log(res); + if (res.code == 200) { const scanData = res.data - if( scanData.UnScanQty > scanData.BarCodeQty ) scanData.UnScanQty = scanData.BarCodeQty + // if( scanData.UnScanQty > scanData.BarCodeQty ) scanData.UnScanQty = scanData.BarCodeQty + scanFrameRef.value.getreceiveBillScanData({ ...res.data, queryString: state.queryString, scanFrameShowSate: state.shortcutDataFeedback.scanFrameShowSate, stashVerify: true }) + console.log(state.shortcutDataFeedback,'1231231231321'); if (Object.keys(state.shortcutDataFeedback).length) { if (state.shortcutDataFeedback.scanFrameShowSate) { scanFrameRef.value.stateShow(true) @@ -254,7 +255,7 @@ } //唤起默认值弹窗 const defaultPopupFun = () => { - shortcutRef.value.stateShow(true) + shortcutRef.value.stateShow(true,'','purchaseTa') } const scanRecordFun = () => { toPages('/pages/records/index', { diff --git a/pages/putInProd/details.vue b/pages/putInProd/details.vue index e14dd6e..2646024 100644 --- a/pages/putInProd/details.vue +++ b/pages/putInProd/details.vue @@ -124,9 +124,9 @@ PRD_MORPTSave(state.type === '3' ? obj2 : obj1).then((resItem : any) => { if (resItem.code === 200) { uni.$u.toast(t('public.cg')) - // if(state.type === '3'){ - // toPages('/pages/putInProd/print',state.EnterIntoProData) - // } + if(state.type === '3'){ + toPages('/pages/putInProd/index') + } } }) } else { diff --git a/pages/receive/material.vue b/pages/receive/material.vue index 252982a..a174169 100644 --- a/pages/receive/material.vue +++ b/pages/receive/material.vue @@ -227,7 +227,7 @@ } //唤起默认值弹窗 const defaultPopupFun = () => { - shortcutRef.value.stateShow(true) + shortcutRef.value.stateShow(true,'','receive') } const scanRecordFun = () => { toPages('/pages/records/index', { diff --git a/pages/returnMaterials/material.vue b/pages/returnMaterials/material.vue index 86f2478..35b0aef 100644 --- a/pages/returnMaterials/material.vue +++ b/pages/returnMaterials/material.vue @@ -243,7 +243,7 @@ } //唤起默认值弹窗 const defaultPopupFun = () => { - shortcutRef.value.stateShow(true) + shortcutRef.value.stateShow(true,'','returnMaterials') } const scanRecordFun = () => { toPages('/pages/records/index', { diff --git a/pages/ruleValidation/verification.vue b/pages/ruleValidation/verification.vue index 0aba815..add4834 100644 --- a/pages/ruleValidation/verification.vue +++ b/pages/ruleValidation/verification.vue @@ -239,7 +239,7 @@ } //唤起默认值弹窗 const defaultPopupFun = () => { - shortcutRef.value.stateShow(true) + shortcutRef.value.stateShow(true,'','ruleValidation') } const scanRecordFun = () => { toPages('/pages/records/index', { diff --git a/pages/supplement/material.vue b/pages/supplement/material.vue index 0d40449..fbac657 100644 --- a/pages/supplement/material.vue +++ b/pages/supplement/material.vue @@ -7,16 +7,7 @@ - + @@ -160,15 +151,19 @@ //防抖输入 const debounceTimer = ref() const changeFun = (e : any) => { + if (debounceTimer.value !== null) clearTimeout(debounceTimer.value) debounceTimer.value = setTimeout(() => { state.queryString = e if(e != '') state.code = e if (state.queryString !== '') getReceiveBillScanData(e) + }) } const confirmFun = (e : any) => { if(e != '') state.code = e + console.log('input测试'); + getReceiveBillScanData(state.code) } //查询录入 @@ -178,10 +173,12 @@ FBillNo: state.BillNo, IsFeed: 'true' }).then((res : any) => { - if (res.data !== null) { - console.log(res); + console.log(res,'11212313212313232231231'); + if (res.code == 200) { + + const scanData = res.data - if (scanData.UnScanQty > scanData.BarCodeQty) scanData.UnScanQty = scanData.BarCodeQty + scanData.UnScanQty = scanData.BarCodeQty scanFrameRef.value.getreceiveBillScanData({ ...res.data, queryString: state.queryString, @@ -255,7 +252,7 @@ } //唤起默认值弹窗 const defaultPopupFun = () => { - shortcutRef.value.stateShow(true) + shortcutRef.value.stateShow(true,'','supplement') } const scanRecordFun = () => { toPages('/pages/records/index', { diff --git a/pages/supplementaryValidation/material.vue b/pages/supplementaryValidation/material.vue index c20c180..87ab077 100644 --- a/pages/supplementaryValidation/material.vue +++ b/pages/supplementaryValidation/material.vue @@ -56,7 +56,7 @@ - @@ -230,7 +230,7 @@ } //唤起默认值弹窗 const defaultPopupFun = () => { - shortcutRef.value.stateShow(true) + shortcutRef.value.stateShow(true,'','supplementaryValidation') } const scanRecordFun = () => { toPages('/pages/records/index', { diff --git a/pages/verify/material.vue b/pages/verify/material.vue index 52265aa..eedc184 100644 --- a/pages/verify/material.vue +++ b/pages/verify/material.vue @@ -213,7 +213,7 @@ } //唤起默认值弹窗 const defaultPopupFun = () => { - shortcutRef.value.stateShow(true) + shortcutRef.value.stateShow(true,'','verify') } const scanRecordFun = () => { toPages('/pages/records/index', { diff --git a/pages/verifyTa/material.vue b/pages/verifyTa/material.vue index 27128d9..ede9c08 100644 --- a/pages/verifyTa/material.vue +++ b/pages/verifyTa/material.vue @@ -238,7 +238,7 @@ } //唤起默认值弹窗 const defaultPopupFun = () => { - shortcutRef.value.stateShow(true) + shortcutRef.value.stateShow(true,'','verifyTa') } const scanRecordFun = () => { toPages('/pages/records/index', { diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js index f6389ea..39d1735 100644 --- a/unpackage/dist/dev/app-plus/app-service.js +++ b/unpackage/dist/dev/app-plus/app-service.js @@ -8632,7 +8632,6 @@ ${codeFrame}` : message2); const fStockFlexDetailMultiDelete = async (data) => requst("/api/TemporaryScan/MultiDelete", "post", { ...data }); const getDataCenterList = (data) => requst("/api/Account/GetDataCenterList", "post", { ...data }); const accountSearchOrg = (data) => requst("/api/Account/SearchOrg", "post", { ...data }); - const getAppVersion = () => requst("https://maxcess.gatedge.cn:91/api/Admin/GlobalSwitch/GetAppVersion?key=A9E45EED-E6F2-4276-8554-AF3055CA0512", "get", {}); const UHIK_BD_BarCodeMainFileView = (data) => requst("/api/UHIK_BD_BarCodeMainFile/View", "get", { ...data }); const PRD_ReturnMtrlList = (data) => requst("/api/PRD_ReturnMtrl/List", "get", { ...data }); const PRD_ReturnMtrlView = (data) => requst("/api/PRD_ReturnMtrl/View", "get", { ...data }); @@ -10660,7 +10659,6 @@ ${codeFrame}` : message2); if (props2.fence.filter((item) => item).length === 0) { state.inputText = res2; state.show = false; - formatAppLog("log", "at components/architecture/architecture.vue:70", res2); emits2("scanConfirm", res2); } }; @@ -10668,9 +10666,11 @@ ${codeFrame}` : message2); emits2("inputConfirm", e); }; const closeFun = (time2 = 4e3) => { + formatAppLog("log", "at components/architecture/architecture.vue:77", "123"); setTimeout(() => { state.inputText = ""; state.show = true; + formatAppLog("log", "at components/architecture/architecture.vue:81", "456"); emits2("inputConfirm", ""); }, time2); }; @@ -15538,29 +15538,7 @@ ${codeFrame}` : message2); } }; const dataValidation = () => { - if (state.receiveBillScanData.FIsBatchManage === "True") { - if (state.scanFrame.batchNumberStr !== "" && state.scanFrame.batchNumberStr !== state.receiveBillScanData.FLot_Text) { - state.show = true; - uni.showModal({ - title: t("index.ts"), - content: "与默认批号不同，是否替换新的批号", - cancelText: "取消", - confirmText: "替换", - success(res2) { - if (res2.confirm) { - state.scanFrame.batchNumberStr = state.receiveBillScanData.FLot_Text; - } else if (res2.cancel) { - formatAppLog("log", "at components/scan-frame/scan-frame.vue:179", "用户点击取消"); - } - } - }); - } else if (state.scanFrame.batchNumberStr == "") { - state.scanFrame.batchNumberStr = state.receiveBillScanData.FLot_Text; - } - } else { - state.scanFrame.batchNumberStr = "", state.batchNumberStrState = true; - state.batchNumberStrPdr = "批号未启用"; - } + state.scanFrame.batchNumberStr = state.receiveBillScanData.FLot_Text; if (Object.keys(state.warehouseData).length !== 0 && Object.keys(state.receiveBillScanData.StockId).length !== 0) { formatAppLog("log", "at components/scan-frame/scan-frame.vue:195", "断点1"); if (state.receiveBillScanData.StockId.Number !== state.warehouseData.FNUMBER) @@ -15662,7 +15640,6 @@ ${codeFrame}` : message2); }; const warehouseDataFun = (item) => { state.warehouseData = item; - formatAppLog("log", "at components/scan-frame/scan-frame.vue:324", item); state.scanFrame.warehouseStr = item.FNAME; state.warehouse = false; state.locationData = {}; @@ -17207,6 +17184,7 @@ ${codeFrame}` : message2); NoLocationListText: t("public.xzcw"), NoLocationList: true, specialModule: "", + modeTyoeStr: "", shortcut: { warehouseStr: "", locationStr: "", @@ -17261,6 +17239,25 @@ ${codeFrame}` : message2); state.show = true; return; } + if (state.modeTyoeStr !== "") { + let shortcutObjList = [...uni.getStorageSync("shortcutObj")]; + let shortcutObjItem = uni.getStorageSync("shortcutObj").find((item) => item.key === state.modeTyoeStr); + if (Object.keys(shortcutObjItem).length !== 0) { + shortcutObjList.forEach((item) => { + if (item.key === state.modeTyoeStr) { + item.warehouseData = state.warehouseData; + item.locationData = state.locationData; + } + }); + } else { + shortcutObjList.push({ + key: state.modeTyoeStr, + warehouseData: state.warehouseData, + locationData: state.locationData + }); + } + uni.setStorageSync("shortcutObj", shortcutObjList); + } eimts("dataToscanFrame", { ...state.shortcut, warehouseData: state.warehouseData, @@ -17280,7 +17277,25 @@ ${codeFrame}` : message2); }; eimts("dataToscanFrame", {}); }; - const stateShow = (val, specialModule = "") => { + const stateShow = (val, specialModule = "", modeTyoeStr = "") => { + if (modeTyoeStr != "") { + state.modeTyoeStr = modeTyoeStr; + if (!uni.getStorageSync("shortcutObj")) + uni.setStorageSync("shortcutObj", []); + else { + let shortcutObjItem = uni.getStorageSync("shortcutObj").find((item) => item.key === modeTyoeStr); + if (Object.keys(shortcutObjItem).length !== 0) { + if (Object.keys(shortcutObjItem.warehouseData).length) { + state.warehouseData = shortcutObjItem.warehouseData; + state.shortcut.warehouseStr = shortcutObjItem.warehouseData.FNAME; + } + if (Object.keys(shortcutObjItem.locationData).length) { + state.locationData = shortcutObjItem.locationData; + state.shortcut.locationStr = shortcutObjItem.locationData.FFlexValueName; + } + } + } + } state.specialModule = specialModule; state.show = val; }; @@ -19363,7 +19378,7 @@ This will fail in production if not fixed.`); shortcutRef.value.stateShow(false); }; const defaultPopupFun = () => { - shortcutRef.value.stateShow(true); + shortcutRef.value.stateShow(true, "", "receive"); }; const scanRecordFun = () => { toPages("/pages/records/index", { @@ -20089,7 +20104,7 @@ This will fail in production if not fixed.`); shortcutRef.value.stateShow(false); }; const defaultPopupFun = () => { - shortcutRef.value.stateShow(true); + shortcutRef.value.stateShow(true, "", "verify"); }; const scanRecordFun = () => { toPages("/pages/records/index", { @@ -20813,7 +20828,7 @@ This will fail in production if not fixed.`); shortcutRef.value.stateShow(false); }; const defaultPopupFun = () => { - shortcutRef.value.stateShow(true); + shortcutRef.value.stateShow(true, "", "verifyTa"); }; const scanRecordFun = () => { toPages("/pages/records/index", { @@ -20831,6 +20846,7 @@ This will fail in production if not fixed.`); if (res2.confirm) { let ids = []; let checkIds = []; + let ScanEntry = []; let param = { FormId: "PUR_ReceiveBill", UserId: uni.getStorageSync("userInfo").Context.UserId, @@ -20845,10 +20861,16 @@ This will fail in production if not fixed.`); }); resLIst.data.list.forEach((item) => { checkIds.push(item.FID); + ScanEntry.push({ + Ids: state.materialId, + EntryIds: item.FVHUBEntryId, + FQty: item.FVHUBScanQty + " " + }); }); PURReceiveBillScanCheck({ - EntryIds: ids.toString(), - Ids: state.materialId + // EntryIds: ids.toString(), + // Ids: state.materialId + Items: ScanEntry }).then((resCheck) => { if (resCheck.code === 200) { fStockFlexDetailDelete({ Ids: checkIds.toString() }).then((resDelete) => { @@ -20865,7 +20887,7 @@ This will fail in production if not fixed.`); } }); } else if (res2.cancel) { - formatAppLog("log", "at pages/verifyTa/material.vue:297", "用户点击取消"); + formatAppLog("log", "at pages/verifyTa/material.vue:304", "用户点击取消"); } } }); @@ -21530,7 +21552,7 @@ This will fail in production if not fixed.`); shortcutRef.value.stateShow(false); }; const defaultPopupFun = () => { - shortcutRef.value.stateShow(true); + shortcutRef.value.stateShow(true, "", "purchase"); }; const scanRecordFun = () => { toPages("/pages/records/index", { @@ -22217,12 +22239,10 @@ This will fail in production if not fixed.`); FBillNo: state.FBillNo, IsInStock: "true" }).then((res2) => { - if (res2.data !== null) { - formatAppLog("log", "at pages/purchaseTa/material.vue:182", res2); - const scanData = res2.data; - if (scanData.UnScanQty > scanData.BarCodeQty) - scanData.UnScanQty = scanData.BarCodeQty; + if (res2.code == 200) { + res2.data; scanFrameRef.value.getreceiveBillScanData({ ...res2.data, queryString: state.queryString, scanFrameShowSate: state.shortcutDataFeedback.scanFrameShowSate, stashVerify: true }); + formatAppLog("log", "at pages/purchaseTa/material.vue:186", state.shortcutDataFeedback, "1231231231321"); if (Object.keys(state.shortcutDataFeedback).length) { if (state.shortcutDataFeedback.scanFrameShowSate) { scanFrameRef.value.stateShow(true); @@ -22241,7 +22261,7 @@ This will fail in production if not fixed.`); }; const scanFrameCnfirmation = (row) => { state.scanFrameDataFeedback = row; - formatAppLog("log", "at pages/purchaseTa/material.vue:205", row); + formatAppLog("log", "at pages/purchaseTa/material.vue:206", row); postTemporaryScanDraftSaveFun(state.scanFrameDataFeedback); }; const scanFrameErrFun = () => { @@ -22249,7 +22269,7 @@ This will fail in production if not fixed.`); }; const postTemporaryScanDraftSaveFun = (item) => { const obj = {}; - formatAppLog("log", "at pages/purchaseTa/material.vue:215", item); + formatAppLog("log", "at pages/purchaseTa/material.vue:216", item); debugger; if (item.warehouseData.FIsOpenLocation && Object.keys(item.locationData).length != 0) { const key = `FVHUBSTOCKFLEX__FF${item.locationData.FID}`; @@ -22296,7 +22316,7 @@ This will fail in production if not fixed.`); shortcutRef.value.stateShow(false); }; const defaultPopupFun = () => { - shortcutRef.value.stateShow(true); + shortcutRef.value.stateShow(true, "", "purchaseTa"); }; const scanRecordFun = () => { toPages("/pages/records/index", { @@ -22353,7 +22373,7 @@ This will fail in production if not fixed.`); } }); } else { - formatAppLog("log", "at pages/purchaseTa/material.vue:317", "==========================================", resPush); + formatAppLog("log", "at pages/purchaseTa/material.vue:318", "==========================================", resPush); uni.$u.toast(resPush.msg); } }); @@ -22363,7 +22383,7 @@ This will fail in production if not fixed.`); } }); } else if (res.cancel) { - formatAppLog("log", "at pages/purchaseTa/material.vue:329", "用户点击取消"); + formatAppLog("log", "at pages/purchaseTa/material.vue:330", "用户点击取消"); } } }); @@ -23067,7 +23087,7 @@ This will fail in production if not fixed.`); shortcutRef.value.stateShow(false); }; const defaultPopupFun = () => { - shortcutRef.value.stateShow(true); + shortcutRef.value.stateShow(true, "", "material"); }; const scanRecordFun = () => { toPages("/pages/records/index", { @@ -23660,7 +23680,7 @@ This will fail in production if not fixed.`); code: "" }); onLoad((pageData) => { - formatAppLog("log", "at pages/supplement/material.vue:117", pageData); + formatAppLog("log", "at pages/supplement/material.vue:108", pageData); state.materialId = pageData.id; state.FBillNo = pageData.fBillNo; state.BillNo = pageData.BillNo; @@ -23714,6 +23734,7 @@ This will fail in production if not fixed.`); const confirmFun = (e) => { if (e != "") state.code = e; + formatAppLog("log", "at pages/supplement/material.vue:165", "input测试"); getReceiveBillScanData(state.code); }; const getReceiveBillScanData = (val) => { @@ -23722,11 +23743,10 @@ This will fail in production if not fixed.`); FBillNo: state.BillNo, IsFeed: "true" }).then((res2) => { - if (res2.data !== null) { - formatAppLog("log", "at pages/supplement/material.vue:182", res2); + formatAppLog("log", "at pages/supplement/material.vue:176", res2, "11212313212313232231231"); + if (res2.code == 200) { const scanData = res2.data; - if (scanData.UnScanQty > scanData.BarCodeQty) - scanData.UnScanQty = scanData.BarCodeQty; + scanData.UnScanQty = scanData.BarCodeQty; scanFrameRef.value.getreceiveBillScanData({ ...res2.data, queryString: state.queryString, @@ -23763,7 +23783,7 @@ This will fail in production if not fixed.`); obj[key] = { FNumber: item.locationData.FlexEntryId.Number }; } const str = JSON.stringify(obj); - formatAppLog("log", "at pages/supplement/material.vue:223", item); + formatAppLog("log", "at pages/supplement/material.vue:220", item); temporaryScanDraftSave({ FVHUBFormId: "PRD_PPBOM", //数据类型 @@ -23789,7 +23809,7 @@ This will fail in production if not fixed.`); FType: "Feed", ...JSON.parse(str) }).then((res2) => { - formatAppLog("log", "at pages/supplement/material.vue:241", res2); + formatAppLog("log", "at pages/supplement/material.vue:238", res2); state.queryString = ""; if (res2.data.IsSuccess) { fnDataList(state.materialId); @@ -23804,7 +23824,7 @@ This will fail in production if not fixed.`); shortcutRef.value.stateShow(false); }; const defaultPopupFun = () => { - shortcutRef.value.stateShow(true); + shortcutRef.value.stateShow(true, "", "supplement"); }; const scanRecordFun = () => { toPages("/pages/records/index", { @@ -23868,7 +23888,7 @@ This will fail in production if not fixed.`); } }); } else if (res2.cancel) { - formatAppLog("log", "at pages/supplement/material.vue:326", "用户点击取消"); + formatAppLog("log", "at pages/supplement/material.vue:323", "用户点击取消"); } } }); @@ -23966,16 +23986,6 @@ This will fail in production if not fixed.`); onInputConfirm: $setup.changeFun, fence: [$setup.state.scanFrameRefShow, $setup.state.shortcutRefShow] }, null, 8, ["dataType", "placeholder", "fence"]), - vue.createCommentVNode(` \r - \r - \r - \r - \r - \r - `), vue.createElementVNode("view", { class: "material-listBox" }, [ vue.createElementVNode( "scroll-view", @@ -24916,7 +24926,7 @@ This will fail in production if not fixed.`); shortcutRef.value.stateShow(false); }; const defaultPopupFun = () => { - shortcutRef.value.stateShow(true); + shortcutRef.value.stateShow(true, "", "supplementaryValidation"); }; const scanRecordFun = () => { toPages("/pages/records/index", { @@ -25233,7 +25243,6 @@ This will fail in production if not fixed.`); { ref: "scanFrameRef", onConfirmation: $setup.scanFrameCnfirmation, - qtyState: true, onScanFrameDataFeedback: _cache[0] || (_cache[0] = (res2) => { $setup.state.scanFrameDataFeedback = res2; }), @@ -25623,7 +25632,7 @@ This will fail in production if not fixed.`); shortcutRef.value.stateShow(false); }; const defaultPopupFun = () => { - shortcutRef.value.stateShow(true); + shortcutRef.value.stateShow(true, "", "returnMaterials"); }; const scanRecordFun = () => { toPages("/pages/records/index", { @@ -26739,7 +26748,7 @@ This will fail in production if not fixed.`); shortcutRef.value.stateShow(false); }; const defaultPopupFun = () => { - shortcutRef.value.stateShow(true); + shortcutRef.value.stateShow(true, "", "productionReturnVerify"); }; const scanRecordFun = () => { toPages("/pages/records/index", { @@ -26771,16 +26780,13 @@ This will fail in production if not fixed.`); 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 + Ids: state.materialId, + EntryIds: item.FVHUBEntryId, + FQty: item.FVHUBScanQty + " " }); }); PRD_ReturnMtrlCheck({ - EntryIds: EntryIds.toString(), - Ids: state.materialId + Items: ScanEntry }).then((resA) => { if (resA.code === 200) { fStockFlexDetailDelete({ Ids: ids.toString() }).then((res3) => { @@ -26797,7 +26803,7 @@ This will fail in production if not fixed.`); } }); } else if (res2.cancel) { - formatAppLog("log", "at pages/productionReturnVerify/material.vue:294", "用户点击取消"); + formatAppLog("log", "at pages/productionReturnVerify/material.vue:299", "用户点击取消"); } } }); @@ -27990,7 +27996,7 @@ This will fail in production if not fixed.`); shortcutRef.value.stateShow(false); }; const defaultPopupFun = () => { - shortcutRef.value.stateShow(true); + shortcutRef.value.stateShow(true, "", "ruleValidation"); }; const scanRecordFun = () => { toPages("/pages/records/index", { @@ -28022,16 +28028,15 @@ This will fail in production if not fixed.`); 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 + 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((res3) => { console.log(); if (res3.code === 200) { @@ -28049,7 +28054,7 @@ This will fail in production if not fixed.`); } }); } else if (res2.cancel) { - formatAppLog("log", "at pages/ruleValidation/verification.vue:306", "用户点击取消"); + formatAppLog("log", "at pages/ruleValidation/verification.vue:312", "用户点击取消"); } } }); @@ -31134,7 +31139,7 @@ This will fail in production if not fixed.`); shortcutRef.value.stateShow(false); }; const defaultPopupFun = () => { - shortcutRef.value.stateShow(true); + shortcutRef.value.stateShow(true, "", "productionStorage"); }; const scanRecordFun = () => { toPages("/pages/records/index", { @@ -34296,7 +34301,7 @@ This will fail in production if not fixed.`); shortcutRef.value.stateShow(false); }; const defaultPopupFun = () => { - shortcutRef.value.stateShow(true); + shortcutRef.value.stateShow(true, "", "BatchOutOftock"); }; const scanRecordFun = () => { toPages("/pages/records/index", { @@ -34331,9 +34336,6 @@ This will fail in production if not fixed.`); Ids: state.materialId, EntryIds: item.FVHUBEntryId, FQty: item.FVHUBScanQty + " ", - // Flot: item.FVHUBFlot, - // StockId: item.FVHUBStock, - // StockFlex: item.FVHUBStockFlex, FMaxcessSNo: item.FVHUBJSON }); }); @@ -34355,7 +34357,7 @@ This will fail in production if not fixed.`); } }); } else if (res2.cancel) { - formatAppLog("log", "at pages/BatchOutOftock/material.vue:318", "用户点击取消"); + formatAppLog("log", "at pages/BatchOutOftock/material.vue:316", "用户点击取消"); } } }); @@ -35928,44 +35930,6 @@ This will fail in production if not fixed.`); url: "/pages/client/account/login" }); } - const appVersion = "0.2.2"; - const appTaiGuoVersion = "0.2.2"; - getAppVersion().then((res2) => { - formatAppLog("log", "at App.vue:59", res2); - let appLoginInfo = uni.getStorageSync("appLoginInfo"); - let patternId = appLoginInfo.organizationObj["FOrgOrgId.FNumber"]; - var pages2 = getCurrentPages(); - var page2 = pages2[pages2.length - 1]; - var currentWebview = page2.$getAppWebview(); - let pageUrl = "/uni_modules/uni-upgrade-center-app/pages/upgrade-popup"; - if (pageUrl.indexOf(currentWebview.__uniapp_route) == -1) { - uni.setStorageSync("local_storage_key", res2.data); - if (Object.keys(appLoginInfo).length !== 0) { - if (patternId === "101") { - if (appVersion !== res2.data.version) { - uni.$u.route({ - url: pageUrl, - params: { - local_storage_key: "local_storage_key", - patternId: "101" - } - }); - } - } - if (patternId === "103") { - if (appTaiGuoVersion !== res2.data.taiGuoVersion) { - uni.$u.route({ - url: pageUrl, - params: { - local_storage_key: "local_storage_key", - patternId: "103" - } - }); - } - } - } - } - }); }, onHide: function() { formatAppLog("log", "at App.vue:99", "App Hide"); @@ -38257,7 +38221,7 @@ This will fail in production if not fixed.`); "grn": "收料通知单号", "date": "日期", "gys": "供应商", - "mmsph": "美塞斯批号", + "mmsph": "批号", "wlbm": "物料编码", "tj": "提交", "tm": "条码", @@ -38278,12 +38242,12 @@ This will fail in production if not fixed.`); "ckmc": "仓库名称", "cwmc": "仓位名称", "qty": "数量", - "mmsph": "美塞斯批号", + "mmsph": "批号", "xzck": "选择仓库", "xzcw": "选择仓位", "cwwqy": "仓位未启用", "qsrsl": "请输入数量", - "qsrmssph": "请输入美塞斯批号", + "qsrmssph": "请输入批号", "gdtcckMessage": "扫描后固定弹出窗口", "gdtc": "固定弹出", "yctc": "异常弹出",