From 3e058c3aa1c2b0084ce3851f682392a8649034a4 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Tue, 6 Aug 2024 16:31:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99=E4=BB=BB?=
=?UTF-8?q?=E5=8A=A1=E6=89=A7=E8=A1=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 6 +++---
src/pages/issue/coms/comScanIssuePack.vue | 5 +++--
src/pages/issue/job/issueDetail.vue | 22 +++-------------------
src/pages/issue/job/issueJob.vue | 6 +++---
4 files changed, 12 insertions(+), 27 deletions(-)
diff --git a/.env.development b/.env.development
index 36a656a8..b92deca0 100644
--- a/.env.development
+++ b/.env.development
@@ -1,11 +1,11 @@
VITE_BASE_URL=http://172.21.47.239:12080/admin-api
-VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api
+VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api
# 租户配置
VITE_TENANT='[{"text":"长春1379","value":1}]'
# 是否是测试环境
-VITE_isDevelopment=false
+VITE_isDevelopment=true
# 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://172.21.32.13:90'
+VITE_JMREPORT_BASE_URL='http://172.21.32.14:90'
diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue
index 9296a11e..f61b885f 100644
--- a/src/pages/issue/coms/comScanIssuePack.vue
+++ b/src/pages/issue/coms/comScanIssuePack.vue
@@ -411,7 +411,7 @@
result.balance = res.data[0]
if (result.label.packingNumber != result.balance.packingNumber) {
- result.balance.lableQty = result.label.qty
+ result.balance.lableQty = Number(result.label.qty)
}
this.afterGetBalance(result.label, result.balance, result.package);
} else {
@@ -667,8 +667,9 @@
packingNumber: label.packingNumber,
parentPackingNumber: packageInfo.parentNumber,
batch: label.batch,
- qty: Number(balance.qty),
+ // qty: Number(balance.qty),
// qty: Number(label.qty) > Number(balance.qty) ? Number(balance.qty) : Number(label.qty),
+ qty: balance.lableQty ?? Number(label.qty),
uom: balance.uom,
inventoryStatus: balance.inventoryStatus,
balance: balance,
diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue
index 004506d1..682fe194 100644
--- a/src/pages/issue/job/issueDetail.vue
+++ b/src/pages/issue/job/issueDetail.vue
@@ -476,27 +476,11 @@
this.$refs.comMessage.showQuestionMessage('实际扫描数量【' + totalHandleQty +
'】与物料需求数量【' + item.qty +
'】不一致，是否继续提交', res => {
- if (res) {
- this.submit();
- }
+ // if (res) {
+ // this.submit();
+ // }
});
}
-
-
- // if (item.qty == totalHandleQty&&!isHandleEmpty) {
- // //提交
- // console.log("提交")
- // // this.submit();
- // } else {
- // this.$refs.comMessage.showQuestionMessage('实际扫描数量【' + totalHandleQty +
- // '】与物料需求数量【' + item.qty +
- // '】不一致，是否继续提交', res => {
- // if (res) {
- // console.log("提交")
- // // this.submit();
- // }
- // });
- // }
})
})
},
diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index c77ce378..903e01d9 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -150,7 +150,7 @@
getBusinessType(this.businessTypeCode, res => {
if (res.success) {
this.businessType = res.businessType;
- this.fromInventoryStatuses = res.fromInventoryStatuses.split(',');
+ this.fromInventoryStatuses = res.fromInventoryStatuses.split(',');
this.fromLocationAreaTypeList = res.fromLocationAreaTypeList
// this.openScanPopup();
} else {
@@ -509,8 +509,8 @@
this.selectItem(list[0])
}
} else {
- this.showMessage("物料号[" + result.label.itemCode + "]批次[" + result.label.batch +
- ']' + "未查找到任务
" + "扫描[" + result.scanMessage + "]")
+ this.showMessage("按来源库位[" + balance.locationCode + "]批次[" + result.label.batch +
+ "]物料号[" + result.label.itemCode + "]未查找到任务
" + "扫描[" + result.scanMessage + "]")
}
}).catch(error => {
this.showMessage(error + "
扫描[" + result.scanMessage + "]")