diff --git a/.env.hella13 b/.env.hella13
index cb56a1e4..0f9e2a39 100644
--- a/.env.hella13
+++ b/.env.hella13
@@ -5,7 +5,7 @@ VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api
VITE_TENANT='[{"text":"长春","value":1}]'
# 是否是测试环境
-VITE_isDevelopment=false
+VITE_isDevelopment=true
# 积木报表请求路径
VITE_JMREPORT_BASE_URL='http://172.21.32.13:90'
diff --git a/.env.hella14 b/.env.hella14
index 8551225b..ee57aacd 100644
--- a/.env.hella14
+++ b/.env.hella14
@@ -5,7 +5,7 @@ VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api
VITE_TENANT='[{"text":"长春","value":1}]'
# 是否是测试环境
-VITE_isDevelopment=false
+VITE_isDevelopment=true
# 积木报表请求路径
VITE_JMREPORT_BASE_URL='http://172.21.32.14:90'
diff --git a/.env.hella15 b/.env.hella15
index ec80eb53..3b5350a9 100644
--- a/.env.hella15
+++ b/.env.hella15
@@ -5,7 +5,7 @@ VITE_BASE_URL_IMAGE=https://scp.faway-hella.com:81/admin-api
VITE_TENANT='[{"text":"长春","value":1}]'
# 是否是测试环境
-VITE_isDevelopment=false
+VITE_isDevelopment=true
# 积木报表请求路径
VITE_JMREPORT_BASE_URL='https://scp.faway-hella.com'
diff --git a/.env.hella16 b/.env.hella16
index 3dc7cd1c..720e4bca 100644
--- a/.env.hella16
+++ b/.env.hella16
@@ -5,7 +5,7 @@ VITE_BASE_URL_IMAGE=https://scptest.faway-hella.com:81/admin-api
VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]'
# 是否是测试环境
-VITE_isDevelopment=false
+VITE_isDevelopment=true
# 积木报表请求路径
VITE_JMREPORT_BASE_URL='https://scptest.faway-hella.com'
diff --git a/.env.hella8 b/.env.hella8
index 0f69956a..0a44abbd 100644
--- a/.env.hella8
+++ b/.env.hella8
@@ -5,7 +5,7 @@ VITE_BASE_URL_IMAGE=http://172.22.32.8:81/admin-api
VITE_TENANT='[{"text":"成都","value":2}]'
# 是否是测试环境
-VITE_isDevelopment=false
+VITE_isDevelopment=true
# 积木报表请求路径
diff --git a/.env.hella9 b/.env.hella9
index 44e8ef4e..1a872aac 100644
--- a/.env.hella9
+++ b/.env.hella9
@@ -5,7 +5,7 @@ VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api
VITE_TENANT='[{"text":"成都","value":2}]'
# 是否是测试环境
-VITE_isDevelopment=false
+VITE_isDevelopment=true
# 积木报表请求路径
VITE_JMREPORT_BASE_URL='http://172.22.32.9:90'
diff --git a/.env.production b/.env.production
index 9175d1cc..fa2a6ba1 100644
--- a/.env.production
+++ b/.env.production
@@ -1,7 +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
+VITE_isDevelopment=true
# 积木报表请求路径
VITE_JMREPORT_BASE_URL='http://172.21.32.14:90'
diff --git a/.env.test b/.env.test
index 81ff2460..42216624 100644
--- a/.env.test
+++ b/.env.test
@@ -6,7 +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
+VITE_isDevelopment=true
# 积木报表请求路径
VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310'
diff --git a/src/mycomponents/item/itemCompareQty.vue b/src/mycomponents/item/itemCompareQty.vue
index 4779ba7f..560137b4 100644
--- a/src/mycomponents/item/itemCompareQty.vue
+++ b/src/mycomponents/item/itemCompareQty.vue
@@ -3,7 +3,7 @@
-
+
{
- uni.hideLoading();
- if (res.success) {
- this.managementPrecision = res.managementPrecision
- this.afterQueryBalance(res.data.list);
- } else {
- this.showErrorMessage(res.message, res => {
- this.packGetFocus();
- })
- }
- // uni.hideLoading();
- });
+ if (this.queryBalance == true) {
+ // uni.showLoading({
+ // title: '查询中...',
+ // mask: true
+ // })
+ getBalanceByManagementPrecision(result.label, this.fromLocationCode, this.fromInventoryStatuses,
+ res => {
+ uni.hideLoading();
+ if (res.success) {
+ this.managementPrecision = res.managementPrecision
+ this.afterQueryBalance(res.data.list);
+ } else {
+ this.showErrorMessage(res.message, res => {
+ this.packGetFocus();
+ })
+ }
+ // uni.hideLoading();
+ });
+ } else {
+ this.packCallBack(null);
+ }
}
},
@@ -448,4 +456,4 @@
height: auto;
max-height: 300rpx;
}
-
\ No newline at end of file
+
diff --git a/src/pages/purchaseReturn/job/returnDetail.vue b/src/pages/purchaseReturn/job/returnDetail.vue
index f982cf88..9682998b 100644
--- a/src/pages/purchaseReturn/job/returnDetail.vue
+++ b/src/pages/purchaseReturn/job/returnDetail.vue
@@ -35,7 +35,7 @@
-
+
@@ -240,77 +240,94 @@
r.batch == batch &&
r.fromLocationCode == result.fromLocationCode
})
- let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+ // let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
//不存在提示
if (itemDetail == undefined) {
this.showErrorMessage("箱码【" + packingNumber + "】
批次【" + batch + "】
库位【" + result
- .fromLocationCode + "】
状态【" + balanceStatus + "】
未找到记录")
+ .fromLocationCode + "】
未找到明细")
return;
} else {
- itemDetail = detail.subList.find(r => {
- return r.packingNumber == packingNumber &&
- r.batch == batch &&
- r.fromLocationCode == result.fromLocationCode &&
- r.inventoryStatus == result.balance.inventoryStatus
- })
- //箱码、批次、库位、状态不一致
- if (itemDetail == undefined) {
- itemDetail = detail.subList.find(r => {
- return r.packingNumber == packingNumber &&
- r.batch == batch &&
- r.fromLocationCode == result.fromLocationCode
- })
- if (itemDetail.scaned) {
- this.showErrorMessage("箱码【" + packingNumber + "】
批次【" + batch + "】
库位【" + result
- .fromLocationCode + "】
状态【" + balanceStatus + "】
已经扫描")
- return;
- }
-
- let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
- if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
- this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
- ']不一致,是否继续退货?', res => {
- if (res) {
- itemDetail.scaned = true;
- itemDetail.handleQty = Number(result.balance.qty);
- itemDetail.toInventoryStatus = result.balance.inventoryStatus;
- itemDetail.inventoryStatus =result.balance.inventoryStatus;
- itemDetail.balance = result.balance;
- itemDetail.balance.balanceQty = result.balance.qty;
- itemDetail.balance.packQty = result.package.packQty
- itemDetail.balance.packUnit = result.package.packUnit
- this.calcHandleQty();
- } else {
- this.scanPopupGetFocus();
- }
- });
- } else {
- this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
- itemStatus +
- ']不一致,不允许转移!', res => {
- this.scanPopupGetFocus();
- });
- }
-
-
+ if (itemDetail.scaned) {
+ this.showErrorMessage("箱码【" + packingNumber + "】
批次【" + batch + "】
库位【" + result
+ .fromLocationCode + "】已经扫描")
+ return;
} else {
- // 箱码、批次、库位、状态一致
- if (itemDetail.scaned) {
- this.showErrorMessage("箱码【" + packingNumber + "】
批次【" + batch + "】
库位【" + result
- .fromLocationCode + "】
状态【" + balanceStatus + "】
已经扫描")
- return;
- } else {
- itemDetail.scaned = true;
- itemDetail.handleQty = Number(result.balance.qty);
- itemDetail.toInventoryStatus = result.balance.inventoryStatus;
- itemDetail.inventoryStatus =result.balance.inventoryStatus;
- itemDetail.balance = result.balance;
- itemDetail.balance.balanceQty = Number(result.balance.qty);
- itemDetail.balance.packQty = Number(result.package.packQty)
- itemDetail.balance.packUnit = result.package.packUnit
- this.calcHandleQty();
- }
+ itemDetail.scaned = true;
+ itemDetail.handleQty = Number(result.label.qty);
+
+ itemDetail.toInventoryStatus = itemDetail.inventoryStatus;
+
+ // itemDetail.balance = result.balance;
+ // itemDetail.balance.balanceQty = Number(result.balance.qty);
+ // itemDetail.balance.packQty = Number(result.package.packQty)
+ // itemDetail.balance.packUnit = result.package.packUnit
+ // itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+ // itemDetail.inventoryStatus =result.balance.inventoryStatus;
+ // itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+ // itemDetail.inventoryStatus =result.balance.inventoryStatus;
+ // itemDetail.balance = result.balance;
+ // itemDetail.balance.balanceQty = Number(result.balance.qty);
+ // itemDetail.balance.packQty = Number(result.package.packQty)
+ // itemDetail.balance.packUnit = result.package.packUnit
+ this.calcHandleQty();
}
+
+
+ // if (itemDetail == undefined) {
+ // itemDetail = detail.subList.find(r => {
+ // return r.packingNumber == packingNumber &&
+ // r.batch == batch &&
+ // r.fromLocationCode == result.fromLocationCode
+ // })
+ // if (itemDetail.scaned) {
+ // this.showErrorMessage("箱码【" + packingNumber + "】
批次【" + batch + "】
库位【" + result
+ // .fromLocationCode + "】
状态【" + balanceStatus + "】
已经扫描")
+ // return;
+ // }
+
+ // let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+ // if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
+ // this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+ // ']不一致,是否继续退货?', res => {
+ // if (res) {
+ // itemDetail.scaned = true;
+ // itemDetail.handleQty = Number(result.balance.qty);
+ // itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+ // itemDetail.inventoryStatus =result.balance.inventoryStatus;
+ // itemDetail.balance = result.balance;
+ // itemDetail.balance.balanceQty = result.balance.qty;
+ // itemDetail.balance.packQty = result.package.packQty
+ // itemDetail.balance.packUnit = result.package.packUnit
+ // this.calcHandleQty();
+ // } else {
+ // this.scanPopupGetFocus();
+ // }
+ // });
+ // } else {
+ // this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+ // itemStatus +
+ // ']不一致,不允许转移!', res => {
+ // this.scanPopupGetFocus();
+ // });
+ // }
+ // } else {
+ // // 箱码、批次、库位、状态一致
+ // if (itemDetail.scaned) {
+ // this.showErrorMessage("箱码【" + packingNumber + "】
批次【" + batch + "】
库位【" + result
+ // .fromLocationCode + "】
状态【" + balanceStatus + "】
已经扫描")
+ // return;
+ // } else {
+ // itemDetail.scaned = true;
+ // itemDetail.handleQty = Number(result.balance.qty);
+ // itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+ // itemDetail.inventoryStatus =result.balance.inventoryStatus;
+ // itemDetail.balance = result.balance;
+ // itemDetail.balance.balanceQty = Number(result.balance.qty);
+ // itemDetail.balance.packQty = Number(result.package.packQty)
+ // itemDetail.balance.packUnit = result.package.packUnit
+ // this.calcHandleQty();
+ // }
+ // }
}