From a925e1827c2462f36e2dbda34b77cafa571504fb Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 27 May 2024 17:33:51 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 3 +++ .env.hella13 | 5 ++++- .env.hella14 | 5 ++++- .env.hella15 | 9 ++++++--- .env.hella16 | 9 ++++++--- .env.hella8 | 6 +++++- .env.hella9 | 5 ++++- .env.production | 5 ++++- .env.test | 5 ++++- 9 files changed, 40 insertions(+), 12 deletions(-) diff --git a/.env.development b/.env.development index ec745b5e..ff5732c2 100644 --- a/.env.development +++ b/.env.development @@ -4,3 +4,6 @@ VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/api/admin-api # 是否是测试环境 VITE_isDevelopment=true + +# 积木报表请求路径 +VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310' diff --git a/.env.hella13 b/.env.hella13 index 853c42c2..cb56a1e4 100644 --- a/.env.hella13 +++ b/.env.hella13 @@ -5,4 +5,7 @@ VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api VITE_TENANT='[{"text":"长春","value":1}]' # 是否是测试环境 -VITE_isDevelopment=false \ No newline at end of file +VITE_isDevelopment=false + +# 积木报表请求路径 +VITE_JMREPORT_BASE_URL='http://172.21.32.13:90' diff --git a/.env.hella14 b/.env.hella14 index b36727af..8551225b 100644 --- a/.env.hella14 +++ b/.env.hella14 @@ -5,4 +5,7 @@ VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api VITE_TENANT='[{"text":"长春","value":1}]' # 是否是测试环境 -VITE_isDevelopment=false \ No newline at end of file +VITE_isDevelopment=false + +# 积木报表请求路径 +VITE_JMREPORT_BASE_URL='http://172.21.32.14:90' diff --git a/.env.hella15 b/.env.hella15 index b2e736b3..ec80eb53 100644 --- a/.env.hella15 +++ b/.env.hella15 @@ -1,8 +1,11 @@ -VITE_BASE_URL=http://172.21.32.15:81/api/admin-api -VITE_BASE_URL_IMAGE=http://172.21.32.15:81/admin-api +VITE_BASE_URL=https://scp.faway-hella.com:81/api/admin-api +VITE_BASE_URL_IMAGE=https://scp.faway-hella.com:81/admin-api # 租户配置 VITE_TENANT='[{"text":"长春","value":1}]' # 是否是测试环境 -VITE_isDevelopment=false \ No newline at end of file +VITE_isDevelopment=false + +# 积木报表请求路径 +VITE_JMREPORT_BASE_URL='https://scp.faway-hella.com' diff --git a/.env.hella16 b/.env.hella16 index 2f7a69ed..3dc7cd1c 100644 --- a/.env.hella16 +++ b/.env.hella16 @@ -1,8 +1,11 @@ -VITE_BASE_URL=http://172.21.32.16:81/api/admin-api -VITE_BASE_URL_IMAGE=http://172.21.32.16:81/admin-api +VITE_BASE_URL=https://scptest.faway-hella.com:81/api/admin-api +VITE_BASE_URL_IMAGE=https://scptest.faway-hella.com:81/admin-api # 租户配置 VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]' # 是否是测试环境 -VITE_isDevelopment=false \ No newline at end of file +VITE_isDevelopment=false + +# 积木报表请求路径 +VITE_JMREPORT_BASE_URL='https://scptest.faway-hella.com' diff --git a/.env.hella8 b/.env.hella8 index d1fde796..0f69956a 100644 --- a/.env.hella8 +++ b/.env.hella8 @@ -5,4 +5,8 @@ VITE_BASE_URL_IMAGE=http://172.22.32.8:81/admin-api VITE_TENANT='[{"text":"成都","value":2}]' # 是否是测试环境 -VITE_isDevelopment=false \ No newline at end of file +VITE_isDevelopment=false + + +# 积木报表请求路径 +VITE_JMREPORT_BASE_URL='http://172.22.32.8:90' diff --git a/.env.hella9 b/.env.hella9 index cfa01c2a..44e8ef4e 100644 --- a/.env.hella9 +++ b/.env.hella9 @@ -5,4 +5,7 @@ VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api VITE_TENANT='[{"text":"成都","value":2}]' # 是否是测试环境 -VITE_isDevelopment=false \ No newline at end of file +VITE_isDevelopment=false + +# 积木报表请求路径 +VITE_JMREPORT_BASE_URL='http://172.22.32.9:90' diff --git a/.env.production b/.env.production index dbe149eb..9175d1cc 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,7 @@ VITE_BASE_URL=http://172.21.32.14:81/api/admin-api VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api # 租户配置 VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]' # 是否是测试环境 -VITE_isDevelopment=false \ No newline at end of file +VITE_isDevelopment=false + +# 积木报表请求路径 +VITE_JMREPORT_BASE_URL='http://172.21.32.14:90' diff --git a/.env.test b/.env.test index 6c18a67f..81ff2460 100644 --- a/.env.test +++ b/.env.test @@ -6,4 +6,7 @@ VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/admin-api VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]' # 是否是测试环境 -VITE_isDevelopment=false \ No newline at end of file +VITE_isDevelopment=false + +# 积木报表请求路径 +VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310' From c41602a2b56abc7afbdcd9a2df0fdb23772cf1c4 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 27 May 2024 17:39:52 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7--?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request2.js | 10 + src/pages.json | 12 + src/pages/pointProductReceipt/index.vue | 287 ++++++++++++++++++ src/pages/pointProductReceipt/webview.vue | 29 ++ .../job/fgProductReceiptDetail.vue | 57 +++- 5 files changed, 394 insertions(+), 1 deletion(-) create mode 100644 src/pages/pointProductReceipt/index.vue create mode 100644 src/pages/pointProductReceipt/webview.vue diff --git a/src/api/request2.js b/src/api/request2.js index f9b6f0ad..dc98b2f4 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -3888,6 +3888,16 @@ export function getManagementPrecision(params) { }); } +// 装配收货详情--打印功能 +export function getPrintProductReceiptList(params) { + return request({ + url: baseApi + "/wms/barbasic/getBarbasicByPackingNumber", + method: "get", + data: params, + }); +} + + /** * 查询库存通过多种条件 高级筛选 diff --git a/src/pages.json b/src/pages.json index 245464b2..9900c2ab 100644 --- a/src/pages.json +++ b/src/pages.json @@ -2037,6 +2037,18 @@ "navigationBarTitleText": "打印", "enablePullDownRefresh": false } + },{ + "path": "pages/pointProductReceipt/index", + "style": { + "navigationBarTitleText": "打印", + "enablePullDownRefresh": false + } + },{ + "path": "pages/pointProductReceipt/webview", + "style": { + "navigationBarTitleText": "打印", + "enablePullDownRefresh": false + } }, { "path": "pages/print/index", diff --git a/src/pages/pointProductReceipt/index.vue b/src/pages/pointProductReceipt/index.vue new file mode 100644 index 00000000..28cb3a00 --- /dev/null +++ b/src/pages/pointProductReceipt/index.vue @@ -0,0 +1,287 @@ + + + + + \ No newline at end of file diff --git a/src/pages/pointProductReceipt/webview.vue b/src/pages/pointProductReceipt/webview.vue new file mode 100644 index 00000000..181d3a9d --- /dev/null +++ b/src/pages/pointProductReceipt/webview.vue @@ -0,0 +1,29 @@ + + + diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue index 9d93c945..28f4682a 100644 --- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue +++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue @@ -109,6 +109,7 @@ import comDetailCard from "@/mycomponents/detail/comDetailCard.vue" import jobTop from '@/mycomponents/job/jobTop.vue' import comProductDetailCard from "@/pages/productReceipt/coms/comProductDetailCard.vue" + import storage from '@/common/utils/storage.js' export default { name: 'receipt_detail', @@ -337,6 +338,59 @@ callback() } }); + }, + //打印功能 + print() { + let packingNumber = [] + this.detailSource.forEach(item => { + item.subList.forEach(detail => { + if (detail.scaned) { + // var info = getPackingNumberAndBatch(this.managementList, detail.itemCode, + // detail.packingNumber, detail.batch); + // detail.toPackingNumber = info.packingNumber; + packingNumber.push(detail.packingNumber) + } + }) + }) + // #ifdef APP + getPrintProductReceiptList({ + packingNumber: packingNumber.join(','), + type: 'MakeLabel' + }).then(res => { + console.log('打印', res) + let pointData = [] + res.data.forEach(item => { + pointData.push({ + barcodeString: item.barcodeString, //标签 + itemCode: item.itemCode || '', //物品代码 + itemName: item.itemName || '', //物品名称 + itemDesc1: item.itemDesc1 || '', //物品描述 + relateNumber: item.relateNumber || '', //relateNumber包装号 + batch: item.batch || '', //批次 + productionLineCode: item.productionLineCode || '', //生产线 + shiftCode: item.shiftCode || '', //班次 + qty: item.qty || '', //数量 + printTimes: item.printTimes || '' //打印时间 + }) + }) + console.log('pointData', pointData) + + uni.navigateTo({ + url: `/pages/pointProductReceipt/index?points=${JSON.stringify(pointData)}` + }); + + }).catch(error => { + this.showErrorMessage(error) + }) + // #endif + // #ifdef H5 + const webUrl = + `${import.meta.env.VITE_JMREPORT_BASE_URL}/jmreport/view/922734157577715712?token=${storage.getStorage(storage.constant.token)}&asn_number=PN0521-000012` + uni.navigateTo({ + url: `/pages/pointProductReceipt/webview?url=${webUrl}` + }); + // #endif + }, commit() { @@ -466,7 +520,8 @@ showCommitSuccessMessage(hint) { this.$refs.comMessage.showSuccessMessage(hint, res => { - navigateBack(1) + // navigateBack(1) + this.print() }) }, From 51f8d7c6e7b31087d080d0b242d66c4cf710641d Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 27 May 2024 18:52:48 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/productReceipt/job/fgProductReceiptDetail.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue index 28f4682a..b5673e95 100644 --- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue +++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue @@ -75,7 +75,8 @@ getProductReceiptJobDetail, takeProductReceiptJob, cancleTakeProductReceiptJob, - productReceiptJobsubmit + productReceiptJobsubmit, + getPrintProductReceiptList } from '@/api/request2.js'; import { goHome, From fe5fdede4ec1fc1f2f7b5a096fc27add811f8a53 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 27 May 2024 19:55:02 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=8F=B7=E5=8F=98?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/productReceipt/job/fgProductReceiptDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue index b5673e95..da63c691 100644 --- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue +++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue @@ -386,7 +386,7 @@ // #endif // #ifdef H5 const webUrl = - `${import.meta.env.VITE_JMREPORT_BASE_URL}/jmreport/view/922734157577715712?token=${storage.getStorage(storage.constant.token)}&asn_number=PN0521-000012` + `${import.meta.env.VITE_JMREPORT_BASE_URL}/jmreport/view/922734157577715712?token=${storage.getStorage(storage.constant.token)}&asn_number=${packingNumber.join(',')}` uni.navigateTo({ url: `/pages/pointProductReceipt/webview?url=${webUrl}` }); From 3eb6e4ff0fc2c7425f46c128dee5fa42c38749a3 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 28 May 2024 09:57:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7H5?= =?UTF-8?q?=E7=AB=AF=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request2.js | 17 ++ src/pages/pointProductReceipt/webview.vue | 3 +- .../job/fgProductReceiptDetail.vue | 150 ++++++++++-------- 3 files changed, 105 insertions(+), 65 deletions(-) diff --git a/src/api/request2.js b/src/api/request2.js index dc98b2f4..e86d383b 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -3897,7 +3897,24 @@ export function getPrintProductReceiptList(params) { }); } +// 根据库存余额获取包装信息进行打印标签 H5 +export function getBalanceToPackage(params) { + return request({ + url: baseApi + "/wms/package/getBalanceToPackage", + method: "get", + data: params, + }); +} + +// 批量打印标签 H5 +export function batchPrintingLable(params) { + return request({ + url: baseApi + "/wms/package/batchPrintingLable", + method: "post", + data: params, + }); +} /** * 查询库存通过多种条件 高级筛选 diff --git a/src/pages/pointProductReceipt/webview.vue b/src/pages/pointProductReceipt/webview.vue index 181d3a9d..2b2bcde4 100644 --- a/src/pages/pointProductReceipt/webview.vue +++ b/src/pages/pointProductReceipt/webview.vue @@ -23,7 +23,8 @@ } }, onLoad(event) { - this.webUrl = event.url + let webData = JSON.parse(event.webData) + this.webUrl = event.url+'?token='+webData.token+'&asn_number='+webData.asn_number } } diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue index da63c691..af9309f0 100644 --- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue +++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue @@ -49,10 +49,10 @@ - - + + @@ -75,8 +75,10 @@ getProductReceiptJobDetail, takeProductReceiptJob, cancleTakeProductReceiptJob, - productReceiptJobsubmit, - getPrintProductReceiptList + productReceiptJobsubmit, + getPrintProductReceiptList, + getBalanceToPackage, + batchPrintingLable } from '@/api/request2.js'; import { goHome, @@ -288,10 +290,10 @@ pack.handleQty = calc.add(pack.handleQty, fg.qty); // item.qty = calc.add(item.qty, detail.qty); } - }) - // 扫满箱后应该自动提交 - if(pack.scaned&&pack.qty==pack.fgList.length){ - this.commit() + }) + // 扫满箱后应该自动提交 + if (pack.scaned && pack.qty == pack.fgList.length) { + this.commit() } }) }) @@ -339,61 +341,81 @@ callback() } }); - }, - //打印功能 - print() { - let packingNumber = [] - this.detailSource.forEach(item => { - item.subList.forEach(detail => { - if (detail.scaned) { - // var info = getPackingNumberAndBatch(this.managementList, detail.itemCode, - // detail.packingNumber, detail.batch); - // detail.toPackingNumber = info.packingNumber; - packingNumber.push(detail.packingNumber) - } - }) - }) - // #ifdef APP - getPrintProductReceiptList({ - packingNumber: packingNumber.join(','), - type: 'MakeLabel' - }).then(res => { - console.log('打印', res) - let pointData = [] - res.data.forEach(item => { - pointData.push({ - barcodeString: item.barcodeString, //标签 - itemCode: item.itemCode || '', //物品代码 - itemName: item.itemName || '', //物品名称 - itemDesc1: item.itemDesc1 || '', //物品描述 - relateNumber: item.relateNumber || '', //relateNumber包装号 - batch: item.batch || '', //批次 - productionLineCode: item.productionLineCode || '', //生产线 - shiftCode: item.shiftCode || '', //班次 - qty: item.qty || '', //数量 - printTimes: item.printTimes || '' //打印时间 - }) - }) - console.log('pointData', pointData) - - uni.navigateTo({ - url: `/pages/pointProductReceipt/index?points=${JSON.stringify(pointData)}` - }); - - }).catch(error => { - this.showErrorMessage(error) - }) - // #endif - // #ifdef H5 - const webUrl = - `${import.meta.env.VITE_JMREPORT_BASE_URL}/jmreport/view/922734157577715712?token=${storage.getStorage(storage.constant.token)}&asn_number=${packingNumber.join(',')}` - uni.navigateTo({ - url: `/pages/pointProductReceipt/webview?url=${webUrl}` - }); - // #endif - + }, + //打印功能 + print() { + let _this = this + let packingNumber = [] + this.detailSource.forEach(item => { + item.subList.forEach(detail => { + if (detail.scaned) { + // var info = getPackingNumberAndBatch(this.managementList, detail.itemCode, + // detail.packingNumber, detail.batch); + // detail.toPackingNumber = info.packingNumber; + packingNumber.push(detail.packingNumber) + } + }) + }) + // #ifdef APP + getPrintProductReceiptList({ + packingNumber: packingNumber.join(','), + type: 'MakeLabel' + }).then(res => { + console.log('打印', res) + let pointData = [] + res.data.forEach(item => { + pointData.push({ + barcodeString: item.barcodeString, //标签 + itemCode: item.itemCode || '', //物品代码 + itemName: item.itemName || '', //物品名称 + itemDesc1: item.itemDesc1 || '', //物品描述 + relateNumber: item.relateNumber || '', //relateNumber包装号 + batch: item.batch || '', //批次 + productionLineCode: item.productionLineCode || '', //生产线 + shiftCode: item.shiftCode || '', //班次 + qty: item.qty || '', //数量 + printTimes: item.printTimes || '' //打印时间 + }) + }) + console.log('pointData', pointData) + + uni.navigateTo({ + url: `/pages/pointProductReceipt/index?points=${JSON.stringify(pointData)}` + }); + + }).catch(error => { + _this.showErrorMessage(error) + }) + // #endif + // #ifdef H5 + getBalanceToPackage({ + packingNumber: packingNumber.join(',') + }).then(res => { + console.log('PC打印', res) + _this.getH5BatchPrintingLable(res.data.number) + + }).catch(error => { + _this.showErrorMessage(error) + }) + + // #endif + }, + getH5BatchPrintingLable( number) { + let _this = this + batchPrintingLable(number).then(resLable => { + console.log('batchPrintingLable', resLable) + const webUrl = `${import.meta.env.VITE_JMREPORT_BASE_URL}/jmreport/view/922734157577715712` + const webData = { + token: storage.getStorage(storage.constant.token), + asn_number: resLable.data + } + uni.navigateTo({ + url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}` + }); + }) + }, commit() { // this.scanCount = getScanCount(this.subList); // if (this.scanCount == 0) { @@ -521,7 +543,7 @@ showCommitSuccessMessage(hint) { this.$refs.comMessage.showSuccessMessage(hint, res => { - // navigateBack(1) + // navigateBack(1) this.print() }) },