From 4f431b5d55e8221ce2b6829068ae7bbe95257490 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 28 Aug 2024 18:05:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=97=B6=E5=80=99=E8=A7=A3?=
=?UTF-8?q?=E5=86=B38=E6=9C=8817=E5=8F=B7=E5=92=8C20=E5=8F=B7=E7=9B=98?=
=?UTF-8?q?=E7=82=B9=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98=EF=BC=8C=E9=87=8D?=
=?UTF-8?q?=E6=96=B0=E4=BF=AE=E6=94=B9=E4=B8=80=E9=81=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../scan/winScanPackAndLocation.vue | 30 +++++++++++++------
1 file changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index de4e58ba..8dc8afb8 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -8,8 +8,8 @@
-
+
+
-
+
@@ -140,6 +140,7 @@
managementPrecision: '',
fromInventoryStatuses: "",
isCheck: false,
+ chooseWhich: '1'
}
},
created() {
@@ -176,7 +177,7 @@
this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态
this.$refs.popup.open('bottom')
-
+
setTimeout(res => {
if (this.fromLocationCode != '') {
this.packGetFocus();
@@ -317,7 +318,12 @@
uni.hideLoading();
if (res.success) {
this.managementPrecision = res.managementPrecision
- this.afterQueryBalance(res.data.list);
+ this.chooseWhich = '2'
+ if (res.data && res.data.list && res.data.list.length > 1) {
+ this.showBalanceSelect(res.data.list);
+ } else {
+ this.afterQueryBalance(res.data.list);
+ }
} else {
this.showErrorMessage(res.message, res => {
this.packGetFocus();
@@ -386,6 +392,7 @@
// }
} else {
this.showBalanceSelect(datas);
+ this.chooseWhich = '1'
}
},
@@ -394,7 +401,12 @@
},
selectBalanceItem(balance) {
- this.packCallBack(balance);
+ if (this.chooseWhich == 1) {
+ this.packCallBack(balance);
+ } else {
+ this.countCallBack(balance);
+ }
+ // this.packCallBack(balance);
//因为盘点时有负库存,暂时去掉判断 2023年12月28日
// if (balance.qty > 0) {
// this.packCallBack(balance);
@@ -459,10 +471,10 @@
let condition = '按照以下条件:\n';
let label = this.scanResult.label;
var isShowStatus = this.balanceFromInventoryStatuses ? this.fromInventoryStatuses : undefined
- if(isShowStatus){
+ if (isShowStatus) {
let status = getInventoryStatusDesc(isShowStatus);
}
-
+
switch (this.managementPrecision) {
case 'BY_PACKAGING':
condition = condition + '物料号=[' + label.itemCode + ']\n箱码=[' + label.packingNumber +