diff --git a/src/manifest.json b/src/manifest.json
index 5230d74c..45abd37f 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -3,8 +3,8 @@
"package" : "uni.UNI43932FE",
"appid" : "__UNI__C9CF4BF",
"description" : "",
- "versionName" : "1.0.64",
- "versionCode" : 64,
+ "versionName" : "1.0.65",
+ "versionCode" : 65,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/src/pages/fg/receiptNoPlan.vue b/src/pages/fg/receiptNoPlan.vue
index 8bb14470..25cb7dcb 100644
--- a/src/pages/fg/receiptNoPlan.vue
+++ b/src/pages/fg/receiptNoPlan.vue
@@ -395,12 +395,22 @@
calcFgQty() {
this.dataContent.handleQty = this.showList.length;
- if (this.dataContent.handleQty == this.dataContent.packQty) {
- if (this.$refs.scanPopup) {
- this.$refs.scanPopup.closeScanPopup();
+ if(parseFloat(this.dataContent.planQty) -parseFloat(this.scanedQty) <= parseFloat(this.dataContent.packQty)){
+ if(parseFloat(this.dataContent.handleQty) == parseFloat(this.dataContent.planQty) -parseFloat(this.scanedQty)){
+ if (this.$refs.scanPopup) {
+ this.$refs.scanPopup.closeScanPopup();
+ }
+ this.commit()
+ }
+ }else{
+ if (parseFloat(this.dataContent.handleQty) == parseFloat(this.dataContent.packQty)) {
+ if (this.$refs.scanPopup) {
+ this.$refs.scanPopup.closeScanPopup();
+ }
+ this.commit()
}
- this.commit()
}
+
},
scanPopupGetFocus() {
@@ -416,15 +426,22 @@
getH5BatchPrintingLable( number) {
let _this = this
batchPrintingLable(number).then(resLable => {
- console.log('batchPrintingLable', resLable)
const webUrl = `${import.meta.env.VITE_JMREPORT_BASE_URL}/jmreport/view/922734157577715712`
const webData = {
token: storage.getStorage(storage.constant.token),
asn_number: resLable.data
}
- uni.navigateTo({
- url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}`
- });
+
+ if ( this.scanedQty + this.showList.length == this.dataContent.planQty) {
+ uni.redirectTo({
+ url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}`
+ });
+ }else{
+ uni.navigateTo({
+ url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}`
+ });
+ }
+
})
},
@@ -432,7 +449,7 @@
let _this = this
// #ifdef APP
if (pointData.length > 0) {
- if (this.scanedQty + this.showList.length == this.dataContent.planQty) {
+ if ( this.scanedQty + this.showList.length == this.dataContent.planQty) {
uni.redirectTo({
url: `/pages/point/index?points=${JSON.stringify(pointData)}`
});
diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue
index 816e70bf..de0229f1 100644
--- a/src/pages/issue/coms/comScanIssuePack.vue
+++ b/src/pages/issue/coms/comScanIssuePack.vue
@@ -501,13 +501,22 @@
let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
that.fromLocationCode = balance.locationCode;
let fromLocation = item.Locations.find(l => l.fromLocationCode == that.fromLocationCode);
- if (fromLocation &&!fromLocation.isNewAdd) {
+ //扫描的库位在列表中存在
+ if (fromLocation){
+ //不是在任务列表中的，是新加的库位
+ // if(fromLocation.isNewAdd){
+
+ // }else {
+ // //在任务列表中。
+
+ // }
+
let batch = fromLocation.Batchs.find(r => r.batch == lot);
if (batch != undefined) {
if (batch.Records == undefined) {
batch.Records = [];
}
-
+
let record = batch.Records.find(r => r.packingNumber == packingCode);
if (record == undefined) {
//如果有推荐箱码
@@ -531,7 +540,7 @@
} else {
that.addRecord(batch, label, balance, packageInfo)
}
-
+
} else {
that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
res => {
@@ -539,7 +548,7 @@
}
)
}
-
+
} else {
if (this.jobContent.allowModifyBatch == "TRUE") {
this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
@@ -562,8 +571,9 @@
});
}
}
- } else {
-
+
+ }else {
+ //扫描的不在任务列表中，询问是否可以添加，
if (this.jobContent.allowModifyLocation == "TRUE") {
this.showQuestionMessage("扫描物料[" + itemCode + "]的库位【" + that.fromLocationCode +
"】与推荐的库位不一致,是否要继续发料?", res => {
@@ -574,12 +584,155 @@
that.$emit("afterScan");
}
})
-
+
} else {
this.showErrorMessage("扫描物料[" + itemCode + "]的库位【" + that.fromLocationCode +
"】与推荐的库位不一致,不允许继续发料?")
}
}
+
+ // if (fromLocation && !fromLocation.isNewAdd) {
+ // let batch = fromLocation.Batchs.find(r => r.batch == lot);
+ // if (batch != undefined) {
+ // if (batch.Records == undefined) {
+ // batch.Records = [];
+ // }
+
+ // let record = batch.Records.find(r => r.packingNumber == packingCode);
+ // if (record == undefined) {
+ // //如果有推荐箱码
+ // if (batch.Recommends != undefined && batch.Recommends.length > 0) {
+ // let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
+ // if (recommend != undefined) {
+ // that.addRecord(batch, label, balance, packageInfo)
+ // } else {
+ // //允许修改箱码
+ // if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
+ // that.addRecord(batch, label, balance, packageInfo);
+ // } else {
+ // that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
+ // res => {
+ // that.getfocus();
+ // return;
+ // }
+ // )
+ // }
+ // }
+ // } else {
+ // that.addRecord(batch, label, balance, packageInfo)
+ // }
+
+ // } else {
+ // that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
+ // res => {
+ // that.getfocus();
+ // }
+ // )
+ // }
+
+ // } else {
+ // if (this.jobContent.allowModifyBatch == "TRUE") {
+ // this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
+ // '】的发料明细,是否要继续发料?', res => {
+ // if (res) {
+ // let batch = that.createBatchInfo(label, balance, packageInfo);
+ // //新增加的批次赋值details
+ // if (fromLocation.Batchs.length > 0) {
+ // batch.detail = fromLocation.Batchs[0].detail;
+ // }
+ // fromLocation.Batchs.unshift(batch);
+ // this.getfocus();
+ // that.$emit("afterScan");
+ // }
+ // })
+ // } else {
+ // that.showErrorMessage('未查找到批次【' + lot + '】的发料明细',
+ // res => {
+ // that.getfocus();
+ // });
+ // }
+ // }
+ // } else {
+ // if (fromLocation&&fromLocation.isNewAdd) {
+ // let batch = fromLocation.Batchs.find(r => r.batch == lot);
+ // if (batch != undefined) {
+ // if (batch.Records == undefined) {
+ // batch.Records = [];
+ // }
+
+ // let record = batch.Records.find(r => r.packingNumber == packingCode);
+ // if (record == undefined) {
+ // //如果有推荐箱码
+ // if (batch.Recommends != undefined && batch.Recommends.length > 0) {
+ // let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
+ // if (recommend != undefined) {
+ // that.addRecord(batch, label, balance, packageInfo)
+ // } else {
+ // //允许修改箱码
+ // if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
+ // that.addRecord(batch, label, balance, packageInfo);
+ // } else {
+ // that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
+ // res => {
+ // that.getfocus();
+ // return;
+ // }
+ // )
+ // }
+ // }
+ // } else {
+ // that.addRecord(batch, label, balance, packageInfo)
+ // }
+
+ // } else {
+ // that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
+ // res => {
+ // that.getfocus();
+ // }
+ // )
+ // }
+
+ // } else {
+ // if (this.jobContent.allowModifyBatch == "TRUE") {
+ // this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
+ // '】的发料明细,是否要继续发料?', res => {
+ // if (res) {
+ // let batch = that.createBatchInfo(label, balance, packageInfo);
+ // //新增加的批次赋值details
+ // if (fromLocation.Batchs.length > 0) {
+ // batch.detail = fromLocation.Batchs[0].detail;
+ // }
+ // fromLocation.Batchs.unshift(batch);
+ // this.getfocus();
+ // that.$emit("afterScan");
+ // }
+ // })
+ // } else {
+ // that.showErrorMessage('未查找到批次【' + lot + '】的发料明细',
+ // res => {
+ // that.getfocus();
+ // });
+ // }
+ // }
+ // } else {
+ // if (this.jobContent.allowModifyLocation == "TRUE") {
+ // this.showQuestionMessage("扫描物料[" + itemCode + "]的库位【" + that.fromLocationCode +
+ // "】与推荐的库位不一致,是否要继续发料?", res => {
+ // if (res) {
+ // let locaion = that.createLocationInfo(label, balance, packageInfo);
+ // item.Locations.push(locaion);
+ // this.getfocus();
+ // that.$emit("afterScan");
+ // }
+ // })
+
+ // } else {
+ // this.showErrorMessage("扫描物料[" + itemCode + "]的库位【" + that.fromLocationCode +
+ // "】与推荐的库位不一致,不允许继续发料?")
+ // }
+ // }
+
+ // }
} catch (e) {
that.showErrorMessage(e.stack,
res => {
@@ -596,7 +749,7 @@
qty: balance.qty,
uom: balance.uom,
handleQty: 0,
- isNewAdd:true,
+ isNewAdd: true,
Batchs: []
}
let batch = this.createBatchInfo(label, balance, packageInfo);
@@ -656,12 +809,60 @@
},
addRecord(batch, label, balance, packageInfo) {
- let record = this.creatRecord(label, balance, packageInfo);
- batch.Records.push(record);
- this.issueRecord.unshift(record)
- this.calcBatchHandleQty(batch);
- this.getfocus();
- this.$emit("afterScan");
+ if (packageInfo.parentNumber) {
+ var checkData = batch.Records.find(r => {
+ if (r.packingNumber == packageInfo.parentNumber &&
+ r.batch == balance.batch) {
+ return r;
+ }
+ })
+ if (checkData) {
+ //提示已经扫描
+ this.showErrorMessage("箱码[" + packageInfo.number + "]批次[" + balance.batch +
+ "]的父包装已经扫描")
+ } else {
+ let record = this.creatRecord(label, balance, packageInfo);
+ batch.Records.push(record);
+ this.issueRecord.unshift(record)
+ this.calcBatchHandleQty(batch);
+ this.getfocus();
+ this.$emit("afterScan");
+ }
+ } else {
+ //扫描的是父包装
+ var checkData = batch.Records.find(r => {
+ if (r.parentPackingNumber == packageInfo.number &&
+ r.batch == balance.batch) {
+ return r;
+ }
+ })
+ if (checkData) {
+ //是否移除
+ this.$refs.comMessage.showQuestionMessage("扫描箱码[" + checkData.parentPackingNumber + "]" + "批次[" +
+ balance
+ .batch + "]是父包装，是否移除子包装", res => {
+ if (res) {
+ batch.Records = [];
+ let record = this.creatRecord(label, balance, packageInfo);
+ batch.Records.push(record);
+ this.issueRecord.unshift(record)
+ this.calcBatchHandleQty(batch);
+ this.getfocus();
+ this.$emit("afterScan");
+ }
+ })
+ console.log("扫描的是父包装，是否移除子包装")
+ } else {
+ let record = this.creatRecord(label, balance, packageInfo);
+ batch.Records.push(record);
+ this.issueRecord.unshift(record)
+ this.calcBatchHandleQty(batch);
+ this.getfocus();
+ this.$emit("afterScan");
+ }
+
+ }
+
},
getfocus() {
diff --git a/src/pages/putaway/record/putawayRecord.vue b/src/pages/putaway/record/putawayRecord.vue
index 5fc5f1d9..b1b5c250 100644
--- a/src/pages/putaway/record/putawayRecord.vue
+++ b/src/pages/putaway/record/putawayRecord.vue
@@ -410,6 +410,7 @@
submitItem.fromLocationCode = detail.locationCode;
submitItem.toLocationCode = detail.toLocationCode;
+ submitItem.itemName = item.itemName;
// detail.toInventoryStatus = detail.inventoryStatus
// detail.toLocationCode = detail.toLocationCode
diff --git a/src/pages/repleinsh/coms/comRepleishDetailCard.vue b/src/pages/repleinsh/coms/comRepleishDetailCard.vue
index ff845985..8903e9c0 100644
--- a/src/pages/repleinsh/coms/comRepleishDetailCard.vue
+++ b/src/pages/repleinsh/coms/comRepleishDetailCard.vue
@@ -35,7 +35,8 @@
{{record.parentPackingNumber}}
-->
+ :isShowStatus='true'
+ :isShowBatch="batch.packingNumber!=null">
diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue
index 37db779d..b0345e9e 100644
--- a/src/pages/repleinsh/coms/comScanReplishPack.vue
+++ b/src/pages/repleinsh/coms/comScanReplishPack.vue
@@ -26,6 +26,7 @@
@@ -433,7 +434,7 @@
that.fromLocationCode = balance.locationCode;
let fromLocation = item.Locations.find(l => l.fromLocationCode == that.fromLocationCode);
//如果库存余额中的库位与任务推荐的不一致
- if (fromLocation && !fromLocation.isNewAdd) {
+ if (fromLocation ) {
let batch = fromLocation.Batchs.find(r => r.batch == lot);
if (batch != undefined) {
if (batch.Records == undefined) {
@@ -479,6 +480,7 @@
batch.detail = fromLocation.Batchs[0].detail;
}
fromLocation.Batchs.unshift(batch);
+ this.getfocus();
}
})
} else {
@@ -539,6 +541,7 @@
batch: label.batch,
qty: 0,
uom: label.uom,
+ handleQty: Number(balance.qty),
Records: []
}
let record = {}
@@ -624,10 +627,61 @@
} else {
record = this.creatRecordByBalance(balance, packageInfo);
}
- batch.Records.push(record);
- this.issueRecord.unshift(record)
- this.calcBatchHandleQty(batch);
- this.getfocus();
+
+ if (packageInfo.parentNumber) {
+ var checkData = batch.Records.find(r => {
+ if (r.packingNumber == packageInfo.parentNumber &&
+ r.batch == packageInfo.batch) {
+ return r;
+ }
+ })
+ if (checkData) {
+ //提示已经扫描
+ this.showErrorMessage("箱码[" + packageInfo.number + "]批次[" + packageInfo.batch +
+ "]的父包装已经扫描")
+ } else {
+ batch.Records.push(record);
+ this.issueRecord.unshift(record)
+ this.calcBatchHandleQty(batch);
+ this.getfocus();
+ }
+ } else {
+ //扫描的是父包装
+ var checkData = batch.Records.find(r => {
+ if (r.parentPackingNumber == packageInfo.number &&
+ r.batch == packageInfo.batch) {
+ return r;
+ }
+ })
+ if (checkData) {
+ //是否移除
+ this.$refs.comMessage.showQuestionMessage("扫描箱码[" + checkData.parentPackingNumber + "]" + "批次[" +
+ packageInfo
+ .batch + "]是父包装，是否移除子包装", res => {
+ if (res) {
+ batch.Records=[]
+ batch.Records.push(record);
+ this.issueRecord.unshift(record)
+ this.calcBatchHandleQty(batch);
+ this.getfocus();
+ }
+ })
+ console.log("扫描的是父包装，是否移除子包装")
+ } else {
+ batch.Records.push(record);
+ this.issueRecord.unshift(record)
+ this.calcBatchHandleQty(batch);
+ this.getfocus();
+ }
+
+ }
+
+
+
+
+
+
+
},
getfocus() {
diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue
index 894906db..80d3bb6d 100644
--- a/src/pages/repleinsh/job/repleinshDetail.vue
+++ b/src/pages/repleinsh/job/repleinshDetail.vue
@@ -189,6 +189,7 @@
that.jobStatus = res.data.status
that.subList = res.data.subList;
that.toLocationCode = that.subList[0].toLocationCode
+
that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
that.detailSource = getDataSource(that.detailSource, that.subList)
if (that.scanMessage) {