From 33ddacf8f0d844bd4b3a97569b4799aa98f0beef Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Mon, 26 Aug 2024 10:20:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=8A=A5=E5=B7=A5=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/fg/receiptByPlan.vue | 110 ++++++++++++++++----------------- 1 file changed, 54 insertions(+), 56 deletions(-) diff --git a/src/pages/fg/receiptByPlan.vue b/src/pages/fg/receiptByPlan.vue index 3e93c9cc..9e2bf839 100644 --- a/src/pages/fg/receiptByPlan.vue +++ b/src/pages/fg/receiptByPlan.vue @@ -275,43 +275,30 @@ console.log(JSON.stringify(params)) let list = [] - try { - var planData = await planReceiptSubmit(params) - console.log('planData', planData) - if (planData.data) { - - planData.data.forEach(item => { - list.push({ - itemCode: item.itemCode, // 物品代码 - itemName: item.itemName, // 物品名称 - packName: item.packName, // 包装名称 - packageCode: item.toPackingNumber, // 包装号 - batch: item.toBatch, //批次 - parentNumber: item.parentNumber, //父包装号 - itemType: item.itemType, //物料类型 - asnNumber: item.asnNumber, //ASN - supplierCode: item.supplierCode, // 供应商 - qty: item.qty, // 数量 - printTimes: getCurrDateTime(), // 打印时间 - productionLineCode: item.productionLineCode, //生产线 - barcodeString: item.barcodeString, // 标签信息 - barcodeBase64: '', - requestNumber: item.requestNumber - }) + var planData = await planReceiptSubmit(params) + console.log('planData', planData) + if (planData.data && planData.data.length > 0) { + planData.data.forEach(item => { + list.push({ + itemCode: item.itemCode, // 物品代码 + itemName: item.itemName, // 物品名称 + packName: item.packName, // 包装名称 + packageCode: item.toPackingNumber, // 包装号 + batch: item.toBatch, //批次 + parentNumber: item.parentNumber, //父包装号 + itemType: item.itemType, //物料类型 + asnNumber: item.asnNumber, //ASN + supplierCode: item.supplierCode, // 供应商 + qty: item.qty, // 数量 + printTimes: getCurrDateTime(), // 打印时间 + productionLineCode: item.productionLineCode, //生产线 + barcodeString: item.barcodeString, // 标签信息 + barcodeBase64: '', + requestNumber: item.requestNumber }) - } else { - throw new Error("提交失败") - } - } catch (error) { - console.log('异常', error) - if (error.indexOf('请返回开工阶段') > -1) { - uni.hideLoading() - this.showErrorMessage('计划已完成') - this.clearData() - this.openFg(); - return - } - + }) + } else { + throw new Error("提交失败") } //装配收货记录 生成后 创建 制品上架申请 @@ -324,15 +311,17 @@ // } //创建上架申请和检验申请 if (createProductputawaySwitch) { - createPutawayRequestByPlan(list[0].requestNumber).then(res => { - createInspectRequestByPlan(list[0].requestNumber) - }) + if (list.length > 0 && list[0].requestNumber) { + createPutawayRequestByPlan(list[0].requestNumber).then(res => { + createInspectRequestByPlan(list[0].requestNumber) + }) + } } else { //创建检验申请 - createInspectRequestByPlan(list[0].requestNumber) + if (list.length > 0 && list[0].requestNumber) { + createInspectRequestByPlan(list[0].requestNumber) + } } - - var queryParams = { filters: [{ column: "number", @@ -375,15 +364,24 @@ this.index = 1; this.dataContent.handleQty = 0; } - + var hintMsg ="提交成功\n生成装配收货记录\n"; + if(list.length>0&&list[0].requestNumber){ + hintMsg += list[0].requestNumber + } nextTick(() => { - this.showCommitSuccessMessage("提交成功\n生成装配收货记录\n" + list[0].requestNumber, list) + this.showCommitSuccessMessage(hintMsg, list) }) } catch (error) { uni.hideLoading() var hint = error.message ? error.message : error - this.showErrorMessage(hint) + if (hint.indexOf('请返回开工阶段') > -1) { + this.showErrorMessage('计划已完成') + this.clearData() + this.openFg(); + } else { + this.showErrorMessage(hint) + } } }, @@ -490,7 +488,7 @@ batchPrintingLable(number).then(resLable => { console.log('batchPrintingLable', resLable) uni.hideLoading() - if(resLable.data){ + if (resLable.data) { const webUrl = `${import.meta.env.VITE_JMREPORT_BASE_URL}/jmreport/view/922734157577715712` const webData = { token: storage.getStorage(storage.constant.token), @@ -499,8 +497,8 @@ uni.navigateTo({ url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}` }); - }else { - _this.showErrorMessage(number+"批量打印标签 H5失败") + } else { + _this.showErrorMessage(number + "批量打印标签 H5失败") } }).catch(error => { uni.hideLoading() @@ -527,22 +525,22 @@ return } uni.showLoading({ - title:"正在获取打印信息", - mask:true + title: "正在获取打印信息", + mask: true }) getBalanceToPackage({ packingNumber: packingNumber.join(',') }).then(res => { console.log('PC打印', res) - if(res.data&&res.data.number){ + if (res.data && res.data.number) { _this.getH5BatchPrintingLable(res.data.number) - }else { + } else { uni.hideLoading() - var hint ="" - packingNumber.forEach(item=>{ - hint+=item + var hint = "" + packingNumber.forEach(item => { + hint += item }) - hint+"根据库存余额获取包装信息" + hint + "根据库存余额获取包装信息" _this.showErrorMessage(hint) } From dbf00159db8ea25d2d1e356904d22058960d8bf3 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Mon, 26 Aug 2024 10:20:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/manifest.json b/src/manifest.json index f73c8c85..81575e5c 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -3,8 +3,8 @@ "package" : "uni.UNI43932FE", "appid" : "__UNI__C9CF4BF", "description" : "", - "versionName" : "1.0.68", - "versionCode" : 68, + "versionName" : "1.0.69", + "versionCode" : 69, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : {