diff --git a/src/pages/deliver/job/deliverDetail.vue b/src/pages/deliver/job/deliverDetail.vue
index 29182aa2..fa52c99e 100644
--- a/src/pages/deliver/job/deliverDetail.vue
+++ b/src/pages/deliver/job/deliverDetail.vue
@@ -18,6 +18,10 @@
客户寄售库
{{toLocationCode}}
+
+ 目标库位
+ {{toLocationCode}}
+
diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue
index 8039ea93..048411fc 100644
--- a/src/pages/package/job/overPackageJobDetail.vue
+++ b/src/pages/package/job/overPackageJobDetail.vue
@@ -11,19 +11,22 @@
-
-
- 原始包装规格 : {{subList[0].fromPackUnit}}
-
-
- 原始标包数量 : {{subList[0].fromPackQty}}
-
-
- 新包装规格 : {{subList[0].toPackUnit}}
-
-
- 新标包数量 : {{subList[0].toPackQty}}
+
+
+
+ 翻包前包装规格
+
+ {{subList[0].fromPackQty}}({{getUomInfo(subList[0].uom)}})/{{getPackUnitName(subList[0].fromPackUnit)}}
+
+
+
+ 翻包后包装规格
+
+ {{subList[0].toPackQty}}({{getUomInfo(subList[0].uom)}})/{{getPackUnitName(subList[0].toPackUnit)}}
+
+
+
{
uni.hideLoading()
if (res.data) {
- this.showCommitSuccessMessage("提交成功
生成发料记录
" + res.data)
+ this.showCommitSuccessMessage("提交成功
生成翻包记录
" + res.data)
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
@@ -534,6 +541,18 @@
closeScanPopup() {
this.updateCommitBtn();
},
+ getUomInfo(uom) {
+ let item = getUomInfo(uom);
+ if (item == '') {
+ return uom;
+ } else {
+ return item.label
+ }
+ },
+ getPackUnitName(packUnit) {
+ let unit = getPackUnitName(packUnit);
+ return unit;
+ }
}
};
diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue
index 41e29b80..5f97c3e0 100644
--- a/src/pages/productionReceipt/job/productionReceiptDetail.vue
+++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue
@@ -304,7 +304,7 @@
} else {
itemDetail.scaned = true;
- itemDetail.supplierCode = supplierCode
+ // itemDetail.supplierCode = supplierCode
itemDetail.handleQty = Number(result.balance.qty)
itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance;
@@ -321,18 +321,6 @@
}
},
- scanLocationCode(location, code) {
- // this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
-
- this.toLocationCode = code
- this.detailSource.forEach(item => {
- item.subList.forEach(detail => {
- detail.toLocationCode = code
- })
- // })
- })
- },
-
commit() {
this.scanCount = getScanCount(this.subList);
if (this.scanCount == 0) {
@@ -404,7 +392,7 @@
productionReceiptJobSubmit(params).then(res => {
uni.hideLoading()
if (res.data) {
- this.showCommitSuccessMessage("提交成功
生成发料接收记录" + res.data)
+ this.showCommitSuccessMessage("提交成功
生成发料接收记录
" + res.data)
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
@@ -487,14 +475,14 @@
},
scanLocationCode(location, code) {
- this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+ // this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
this.toLocationCode = code
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
detail.toLocationCode = code
})
})
- })
+ // })
},
showCommitSuccessMessage(hint) {
diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue
index a62c0719..f18172c3 100644
--- a/src/pages/repleinsh/coms/comScanReplishPack.vue
+++ b/src/pages/repleinsh/coms/comScanReplishPack.vue
@@ -296,8 +296,8 @@
let record = batch.Records.find(r => r.packingNumber == packingCode);
if (record == undefined) {
- //如果有推荐箱码
- if (batch.Recommends.length > 0) {
+ //如果有推荐箱码
+ if (batch.Recommends!=undefined && batch.Recommends.length > 0) {
let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
if (recommend != undefined) {
that.addRecord(batch, label, packageInfo)
@@ -325,8 +325,9 @@
}
} else {
if (this.jobContent.allowModifyBatch == "TRUE") {
- this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
- '】的发料明细,是否要继续发料?', res => {
+
+ this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,批次【' + lot +
+ '】不是推荐批次,是否要继续发料?', res => {
if (res) {
let batch = that.createBatchInfo(label, balance, packageInfo);
if (fromLocation.Batchs.length > 0) {