From 244c2042c96d6d76430d16cf6c61e8c8896d26bc Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Thu, 28 Mar 2024 16:39:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A5=E6=96=99=E4=BB=BB?=
=?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mycomponents/balance/balance.vue | 2 +-
src/mycomponents/balance/handleBalance.vue | 13 +-
.../repleinsh/coms/comRepleishDetailCard.vue | 6 +-
.../repleinsh/coms/comScanReplishPack.vue | 134 +++++++++++-------
src/pages/repleinsh/job/repleinshDetail.vue | 49 ++++---
5 files changed, 125 insertions(+), 79 deletions(-)
diff --git a/src/mycomponents/balance/balance.vue b/src/mycomponents/balance/balance.vue
index d6f8c460..1886ea25 100644
--- a/src/mycomponents/balance/balance.vue
+++ b/src/mycomponents/balance/balance.vue
@@ -14,7 +14,7 @@
+ :handleQty="Number (dataContent.handleQty)" :isShowStdPack="isShowStdPack" :isShowStatus='isShowStatus'>
复制采购
diff --git a/src/mycomponents/balance/handleBalance.vue b/src/mycomponents/balance/handleBalance.vue
index 1707d4ab..71e35d1a 100644
--- a/src/mycomponents/balance/handleBalance.vue
+++ b/src/mycomponents/balance/handleBalance.vue
@@ -1,16 +1,16 @@
-
+
-
-
@@ -56,7 +56,10 @@
type: Boolean,
default: true
},
-
+ isShowStatus: {
+ type: Boolean,
+ default: true
+ },
},
watch: {
@@ -77,4 +80,4 @@
opacity: 1;
}
-
+
\ No newline at end of file
diff --git a/src/pages/repleinsh/coms/comRepleishDetailCard.vue b/src/pages/repleinsh/coms/comRepleishDetailCard.vue
index 8aa9becf..6fdcc65f 100644
--- a/src/pages/repleinsh/coms/comRepleishDetailCard.vue
+++ b/src/pages/repleinsh/coms/comRepleishDetailCard.vue
@@ -31,8 +31,12 @@
+
+ 外包装
+ {{record.parentPackingNumber}}
+
+ :isShowBatch="batch.packingNumber!=null" :isShowStatus='true'>
diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue
index c5fc6ae9..a62c0719 100644
--- a/src/pages/repleinsh/coms/comScanReplishPack.vue
+++ b/src/pages/repleinsh/coms/comScanReplishPack.vue
@@ -69,7 +69,7 @@
-
@@ -104,10 +104,10 @@
import {
getWorkShopLineStation
} from '@/api/request2.js';
-
+
import {
- calc
- } from '@/common/calc.js';
+ calc
+ } from '@/common/calc.js';
import {
getBalanceByManagementPrecision
@@ -242,30 +242,33 @@
)
return;
} else {
- //查找库存信息
- uni.showLoading({
- title: '加载中',
- mask: true
- })
- getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses,
- balanceRes => {
- if (balanceRes.success) {
- if (balanceRes.data.list.length == 0) {
- this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
- res => {
- this.packGetFocus();
- })
- } else if (balanceRes.data.list.length == 1) {
- let balance = balanceRes.data.list[0];
- this.afterGetBalance(result.label, balance, packageInfo);
- } else {
- this.showBalanceSelect(balanceRes.data.list);
- }
- } else {
- this.showErrorMessage(balanceRes.message.message);
- }
- uni.hideLoading();
- });
+
+ this.afterGetBalance(result.label, result.label, packageInfo);
+
+ // //查找库存信息
+ // uni.showLoading({
+ // title: '加载中',
+ // mask: true
+ // })
+ // getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses,
+ // balanceRes => {
+ // if (balanceRes.success) {
+ // if (balanceRes.data.list.length == 0) {
+ // this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
+ // res => {
+ // this.packGetFocus();
+ // })
+ // } else if (balanceRes.data.list.length == 1) {
+ // let balance = balanceRes.data.list[0];
+ // this.afterGetBalance(result.label, balance, packageInfo);
+ // } else {
+ // this.showBalanceSelect(balanceRes.data.list);
+ // }
+ // } else {
+ // this.showErrorMessage(balanceRes.message.message);
+ // }
+ // uni.hideLoading();
+ // });
}
} catch (e) {
this.showErrorMessage(e.stack)
@@ -297,11 +300,11 @@
if (batch.Recommends.length > 0) {
let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
if (recommend != undefined) {
- that.addRecord(batch, label, balance, packageInfo)
+ that.addRecord(batch, label, packageInfo)
} else {
//允许修改箱码
if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
- that.addRecord(batch, label, balance, packageInfo);
+ that.addRecord(batch, label, packageInfo);
} else {
that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
res => {
@@ -311,7 +314,7 @@
}
}
} else {
- that.addRecord(batch, label, balance, packageInfo)
+ that.addRecord(batch, label, packageInfo)
}
} else {
that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
@@ -325,8 +328,8 @@
this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
'】的发料明细,是否要继续发料?', res => {
if (res) {
- let batch = that.createBatchInfo(label, balance,packageInfo);
- if(fromLocation.Batchs.length>0){
+ let batch = that.createBatchInfo(label, balance, packageInfo);
+ if (fromLocation.Batchs.length > 0) {
batch.detail = fromLocation.Batchs[0].detail;
}
fromLocation.Batchs.unshift(batch);
@@ -355,7 +358,7 @@
}
},
- createBatchInfo(data, balance,packageInfo) {
+ createBatchInfo(data, balance, packageInfo) {
let batch = {
batch: data.batch,
qty: 0,
@@ -363,54 +366,75 @@
handleQty: Number(data.qty),
Records: []
}
- let record = this.creatRecord(data, balance,packageInfo);
+ let record = this.creatRecord(data, packageInfo);
batch.Records.push(record);
this.issueRecord.unshift(record)
return batch;
},
- creatRecord(label, balance, packageInfo) {
- balance.packQty = packageInfo.packQty
- balance.packUnit = packageInfo.packUnit
+ creatRecord(label, packageInfo) {
let record = {
scaned: true,
itemCode: label.itemCode,
packingNumber: label.packingNumber,
+ parentPackingNumber: packageInfo.parentNumber,
batch: label.batch,
- qty: Number(balance.qty),
+ qty: Number(label.qty),
// qty: Number(label.qty)>Number(balance.qty)?Number(balance.qty):Number(label.qty),
- uom: balance.uom,
- inventoryStatus: balance.inventoryStatus,
- balance: balance,
+ uom: label.uom,
+ inventoryStatus: "OK",
+ balance: null,
toLocationCode: this.toLocationCode,
supplierCode: label.supplierCode
}
return record;
},
+
+
+ // creatRecord(label, balance, packageInfo) {
+ // balance.packQty = packageInfo.packQty
+ // balance.packUnit = packageInfo.packUnit
+ // let record = {
+ // scaned: true,
+ // itemCode: label.itemCode,
+ // packingNumber: label.packingNumber,
+ // batch: label.batch,
+ // qty: Number(balance.qty),
+ // // qty: Number(label.qty)>Number(balance.qty)?Number(balance.qty):Number(label.qty),
+ // uom: balance.uom,
+ // inventoryStatus: balance.inventoryStatus,
+ // balance: balance,
+ // toLocationCode: this.toLocationCode,
+ // supplierCode: label.supplierCode
+ // }
+ // return record;
+ // },
+
calcBatchHandleQty(batch) {
let handleQty = 0;
batch.Records.forEach(res => {
- handleQty = calc.add(handleQty,res.qty)
+ handleQty = calc.add(handleQty, res.qty)
})
batch.handleQty = handleQty;
-
- this.dataContent.forEach(toLocationCode=>{
- toLocationCode.Items.forEach(item=>{
- var itemCodeHandleQty =0;
- item.Locations.forEach(batch=>{
- batch.Batchs.forEach(batchHandleQty=>{
- itemCodeHandleQty=calc.add(itemCodeHandleQty,batchHandleQty.handleQty)
+
+ this.dataContent.forEach(toLocationCode => {
+ toLocationCode.Items.forEach(item => {
+ var itemCodeHandleQty = 0;
+ item.Locations.forEach(batch => {
+ batch.Batchs.forEach(batchHandleQty => {
+ itemCodeHandleQty = calc.add(itemCodeHandleQty,
+ batchHandleQty.handleQty)
})
})
- item.handleQty=itemCodeHandleQty;
+ item.handleQty = itemCodeHandleQty;
})
-
+
})
},
- addRecord(batch, label, balance, packageInfo) {
- let record = this.creatRecord(label, balance, packageInfo);
+ addRecord(batch, label, packageInfo) {
+ let record = this.creatRecord(label, packageInfo);
batch.Records.push(record);
this.issueRecord.unshift(record)
this.calcBatchHandleQty(batch);
@@ -528,4 +552,4 @@
max-height: 300rpx;
padding: 10rpx;
}
-
+
\ No newline at end of file
diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue
index cf33ab4c..3a4bfe98 100644
--- a/src/pages/repleinsh/job/repleinshDetail.vue
+++ b/src/pages/repleinsh/job/repleinshDetail.vue
@@ -298,8 +298,8 @@
let record = {};
record.handleQty = r.qty;
- record.fromPackingNumber = r
- .packingNumber;
+ // record.fromPackingNumber = r
+ // .packingNumber;
record.fromBatch = r.batch;
record.fromContainerNumber = r
.ContainerNumber;
@@ -311,25 +311,40 @@
record.toLocationCode = this
.toLocationCode;
record.supplierCode = r.supplierCode;
-
- //使用在途库不改变管理模式
- if (this.jobContent
- .useOnTheWayLocation ==
- 'TRUE') {
+
+ if(record.parentPackingNumber!='')
+ {
+ record.fromPackingNumber = record.parentPackingNumber;
record.toPackingNumber = r
.packingNumber;
- record.toBatch = r.batch;
- } else {
- var info =
- getPackingNumberAndBatch(
- this.managementList, r
- .itemCode,
- r.packingNumber, r
- .batch);
- record.toPackingNumber = info
+ }
+ else
+ {
+ record.fromPackingNumber = record.packingNumber;
+ record.toPackingNumber = r
.packingNumber;
- record.toBatch = info.batch;
}
+ record.toBatch = r.batch;
+
+
+ // //使用在途库不改变管理模式
+ // if (this.jobContent
+ // .useOnTheWayLocation ==
+ // 'TRUE') {
+ // record.toPackingNumber = r
+ // .packingNumber;
+ // record.toBatch = r.batch;
+ // } else {
+ // var info =
+ // getPackingNumberAndBatch(
+ // this.managementList, r
+ // .itemCode,
+ // r.packingNumber, r
+ // .batch);
+ // record.toPackingNumber = info
+ // .packingNumber;
+ // record.toBatch = info.batch;
+ // }
subItem.recordList.push(record);
})
commitSubList.push(subItem);