From 11bcf3c9f754eea0e64021078a8c4ff3af35b243 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Fri, 25 Apr 2025 18:50:45 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=89=88=E6=9C=AC1.1.0?= 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 c26acdb9..2bc8ae5e 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -3,8 +3,8 @@ "package" : "com.yingtai.pda", "appid" : "__UNI__F36DDCF", "description" : "", - "versionName" : "1.0.9", - "versionCode" : 9, + "versionName" : "1.1.0", + "versionCode" : 10, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { From 4925b0cdb74fad38338fd3da689790fd47cfcb9c Mon Sep 17 00:00:00 2001 From: zhang_li Date: Sun, 27 Apr 2025 10:13:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8F=B7=E5=8F=A3=E5=93=81=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E8=AF=A6=E6=83=85=E6=89=AB=E6=8F=8F=E4=B8=8D=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/productReceipt/job/productReceiptDetail.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue index 9eec34a6..aa012673 100644 --- a/src/pages/productReceipt/job/productReceiptDetail.vue +++ b/src/pages/productReceipt/job/productReceiptDetail.vue @@ -255,9 +255,7 @@ that.toLocationCode = that.subList[0].toLocationCode that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes) that.detailSource = getDataSource(that.subList) - if (that.scanMessage) { - this.$refs.scanPopup.simulateScan(that.scanMessage); - } + //获取管理模式，封装参数 var itemCodes = [] this.detailSource.forEach(item => { @@ -279,6 +277,9 @@ } }) + if (that.scanMessage) { + this.$refs.scanPopup.simulateScan(that.scanMessage); + } } }) } else { @@ -313,7 +314,6 @@ var qty = label.qty; var itemCode = label.itemCode; - var detail = this.detailSource.find(r => r.itemCode == itemCode); if (detail == undefined) { this.showErrorMessage("物料号【" + itemCode + "】不在列表中") @@ -380,6 +380,7 @@ this.showErrorMessage("包装[" + packingNumber + "]" + "批次[" + batch + "]不在任务列表中") } } + uni.hideLoading() } }, From a36f5f324fee5d4ea5c389bc2a0dff3bff0d30e8 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Sun, 27 Apr 2025 16:17:35 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=89=93=E5=8C=85=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.production b/.env.production index a3d9c20b..f569f4ff 100644 --- a/.env.production +++ b/.env.production @@ -5,7 +5,7 @@ VITE_BASE_URL_IMAGE=http://192.168.120.34:81/admin-api VITE_TENANT='[{"text":"英泰","value":1}]' # 是否是测试环境 -VITE_isDevelopment=true +VITE_isDevelopment=false # 积木报表请求路径 VITE_JMREPORT_BASE_URL='http://192.168.120.34:81/api' From e191d8dacf320fed5c82fa64ff13c96e466ce78d Mon Sep 17 00:00:00 2001 From: zhang_li Date: Mon, 28 Apr 2025 11:18:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?YT-2553=E3=80=90=E5=8F=B7=E5=8F=A3=E5=93=81?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E4=BB=BB=E5=8A=A1=E3=80=91=E3=80=90=E8=A1=A5?= =?UTF-8?q?=E7=BB=99=E5=93=81=E7=94=9F=E4=BA=A7=E4=BB=BB=E5=8A=A1=E3=80=91?= =?UTF-8?q?=E4=B8=AD=E6=89=93=E5=8D=B0=E7=9A=84=E6=A0=87=E7=AD=BE=E9=87=8C?= =?UTF-8?q?=E6=9C=89=E7=94=B3=E8=AF=B7=E5=8D=95=E5=8F=B7=EF=BC=8CPDA?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=90=8E=EF=BC=8C=E9=9C=80=E8=A6=81=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E7=94=B3=E8=AF=B7=E5=8D=95=E5=8F=B7+=E5=93=81?= =?UTF-8?q?=E7=95=AA=E5=8E=BB=E6=9F=A5=E4=BB=BB=E5=8A=A1=E7=9A=84=E7=8A=B6?= =?UTF-8?q?=E6=80=811.=E5=9C=A8=E7=94=B3=E8=AF=B7=E4=B8=AD=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=BA=86=E6=A0=87=E7=AD=BE=EF=BC=8C=E4=BD=86=E6=98=AF?= =?UTF-8?q?=E6=9C=AA=E5=A4=84=E7=90=86=E7=94=B3=E8=AF=B7=EF=BC=88=E5=8D=B3?= =?UTF-8?q?=E8=BF=98=E6=B2=A1=E6=9C=89=E7=94=9F=E6=88=90=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=EF=BC=89=E6=97=B6=EF=BC=8C=E6=8F=90=E7=A4=BA=EF=BC=9A=E8=AF=A5?= =?UTF-8?q?=E5=93=81=E7=95=AA=E5=AF=B9=E5=BA=94=E7=9A=84=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=20[=E7=94=B3=E8=AF=B7=E5=8D=95=E5=8F=B7]=20=E4=B8=8B=E6=9C=AA?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=B0=E4=BB=BB=E5=8A=A12.=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=A4=84=E7=90=86=E5=90=8E=E7=94=9F=E6=88=90=E4=BA=86?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E4=BD=86=E6=98=AF=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E4=BA=86=E4=BB=BB=E5=8A=A1=E6=97=B6=EF=BC=8C=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=EF=BC=9A=E8=AF=A5=E5=93=81=E7=95=AA=E5=AF=B9=E5=BA=94=E7=9A=84?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=20[=E7=94=B3=E8=AF=B7=E5=8D=95=E5=8F=B7]=20?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E4=BB=BB=E5=8A=A1=E5=B7=B2=E5=85=B3=E9=97=AD?= =?UTF-8?q?3.=E7=94=B3=E8=AF=B7=E5=A4=84=E7=90=86=E5=90=8E=E7=94=9F?= =?UTF-8?q?=E6=88=90=E4=BA=86=E4=BB=BB=E5=8A=A1=EF=BC=8C=E4=BD=86=E6=98=AF?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E4=BA=86=E7=94=B3=E8=AF=B7=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=9A=E8=AF=A5=E5=93=81=E7=95=AA=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E7=9A=84=E7=94=B3=E8=AF=B7=20[=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=8D=95=E5=8F=B7]=20=E4=B8=8B=E7=9A=84=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=B7=B2=E5=85=B3=E9=97=AD4.=E4=BB=BB=E5=8A=A1=E5=B7=B2?= =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=8C=E6=8F=90=E7=A4=BA=EF=BC=9A=E8=AF=A5?= =?UTF-8?q?=E5=93=81=E7=95=AA=E5=AF=B9=E5=BA=94=E7=9A=84=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=20[=E7=94=B3=E8=AF=B7=E5=8D=95=E5=8F=B7]=20=E4=B8=8B=E7=9A=84?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=B7=B2=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productReceipt/job/productReceiptJob.vue | 29 ++++++++++--------- .../job/semiProductReceiptJob.vue | 2 +- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue index 170ac141..7631abcf 100644 --- a/src/pages/productReceipt/job/productReceiptJob.vue +++ b/src/pages/productReceipt/job/productReceiptJob.vue @@ -356,23 +356,13 @@ }, async getScanResult(result) { if(!result.label.requestNumber ){ - this.showMessage("该标签未关联到收货申请") + this.showMessage(`该品番对应的申请 【${ result.label.requestNumber}】下未查询到任务`) return; } uni.showLoading({ title: "加载中....", mask: true }); - const res1 = await getNumberForStatus(result.label.requestNumber) - if(res1.data == 5){ - uni.hideLoading() - this.showMessage(`该品番对应的申请【${result.label.requestNumber}】已关闭`) - return - }else if(res1.data == 8){ - uni.hideLoading() - this.showMessage(`该品番对应的生产任务【${result.label.requestNumber}】已经完成`) - return - } try { this.scanMessage = "" var filters = [ @@ -404,18 +394,29 @@ { column: "status", action: "in", - value: '1,2', + value: '1,2,3,4', } ] getProductReceiptJobList({ filters: filters, pageNo: 1, pageSize: 100, - }).then(res => { + }).then(async res => { uni.hideLoading() this.scanMessage = result.scanMessage let resultList = res.data.list; if (resultList.length > 0) { + + const res1 = await getNumberForStatus(result.label.requestNumber) + if(resultList[0].status==4||res1.data == 5){ + uni.hideLoading() + this.showMessage(`该品番对应的申请【${result.label.requestNumber}】下的任务已关闭`) + return + }else if(res1.data == 8){ + uni.hideLoading() + this.showMessage(`该品番对应的申请【${result.label.requestNumber}】下的任务已完成`) + return + } resultList.forEach(item => { item.title = item.number; item.selected = false @@ -432,7 +433,7 @@ this.selectItem(list[0]) } } else { - this.showMessage("该标签未关联到收货申请\n" + "扫描[" + result.scanMessage + "]") + this.showMessage(`该品番对应的申请 【${ result.label.requestNumber}】下未查询到任务`) } }).catch(error => { uni.hideLoading() diff --git a/src/pages/productReceipt/job/semiProductReceiptJob.vue b/src/pages/productReceipt/job/semiProductReceiptJob.vue index 21da8442..6d4a8c66 100644 --- a/src/pages/productReceipt/job/semiProductReceiptJob.vue +++ b/src/pages/productReceipt/job/semiProductReceiptJob.vue @@ -1,6 +1,6 @@