From a0afbf3966c3e93292a2cd79f6c775bc7a3f1277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 18 Jun 2024 19:19:04 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
=?UTF-8?q?=E6=89=A7=E8=A1=8C=20=E6=89=93=E5=8D=B0=E4=BF=AE=E6=94=B9=20?=
=?UTF-8?q?=E6=95=B0=E9=87=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/pointPutawayJob/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue
index 8e121fee..0586b6ee 100644
--- a/src/pages/pointPutawayJob/index.vue
+++ b/src/pages/pointPutawayJob/index.vue
@@ -221,7 +221,7 @@
${cur.batch} |
${cur.packingNumber} |
${cur.packUnit} |
- ${cur.packQty} |
+ ${cur.qty} |
${cur.uom} |
`
From 54189f6128e12923401c0a3cfcc162024e86b7e1 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 18 Jun 2024 19:52:55 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=89=AB=E6=8F=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mycomponents/scan/winScanPack.vue | 10 +++--
.../scan/winScanPackAndLocation.vue | 12 ++++--
.../job/productPutawayDetail.vue | 38 ++++++++++-------
.../job/productReceiptDetail.vue | 38 ++++++++++-------
.../purchaseReceipt/job/receiptDetail.vue | 41 +++++++++++--------
src/pages/putaway/job/putawayDetail.vue | 5 ++-
6 files changed, 89 insertions(+), 55 deletions(-)
diff --git a/src/mycomponents/scan/winScanPack.vue b/src/mycomponents/scan/winScanPack.vue
index 1981c301..44a08fc3 100644
--- a/src/mycomponents/scan/winScanPack.vue
+++ b/src/mycomponents/scan/winScanPack.vue
@@ -73,15 +73,19 @@
},
scanClick() {
- this.$refs.comscan.clickScanMsg();
+ if(this.$refs.comscan){
+ this.$refs.comscan.clickScanMsg();
+ }
+
},
cancelClick() {
- this.$refs.comscan.clearScanValue();
+ if(this.$refs.comscan){
+ this.$refs.comscan.clearScanValue();
+ }
},
getScanResult(result) {
-
if (result.success) {
this.$emit("getResult", result);
} else {
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index 2a1ab0f6..fe64744a 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -201,8 +201,8 @@
if(timer){
clearTimeout(timer)
}
- // this.$refs.comscansimulate.setItemCodeSimulate(item.copyContent)
- // this.$refs.comscansimulate.clickScanMsg();
+ this.$refs.comscansimulate.setItemCodeSimulate(item.copyContent)
+ this.$refs.comscansimulate.clickScanMsg();
}, 500)
@@ -385,7 +385,9 @@
//盘点回调
countCallBack(datas) {
- this.$refs.comscan.clear();
+ if(this.$refs.comscan){
+ this.$refs.comscan.clear();
+ }
//返回标签信息、库存信息和管理模式
let data = {
label: this.scanResult.label,
@@ -399,7 +401,9 @@
},
packCallBack(item) {
- this.$refs.comscan.clear();
+ if(this.$refs.comscan){
+ this.$refs.comscan.clear();
+ }
//返回标签信息、库存信息和管理模式
let data = {
label: this.scanResult.label,
diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue
index 54b45e4a..4f08a2f2 100644
--- a/src/pages/productPutaway/job/productPutawayDetail.vue
+++ b/src/pages/productPutaway/job/productPutawayDetail.vue
@@ -114,13 +114,15 @@
type: "",
isCheckLocation: false,
switchCode: "",
- scanedPackingNumber: ''
+ scanedPackingNumber: '',
+ status:''
};
},
onLoad(option) {
this.id = option.id;
this.type = option.type;
- this.scanedPackingNumber = option.scaned || '';
+ this.scanedPackingNumber = option.scaned || '';
+ this.status = option.status || ''
if (this.type == 'predict') {
this.switchCode = "SemiPutawayLocationCodeValidate"
updateTitle("预生产上架任务");
@@ -128,16 +130,19 @@
this.switchCode = "FgPutawayLocationCodeValidate"
updateTitle("装配上架任务");
}
- if (this.id != undefined) {
- //新建的任务自动接收
- if (option.status == "1") {
- this.receive((callback => {
- this.getDetail();
- }));
- } else {
- this.getDetail();
- }
- }
+
+ },
+ onShow(){
+ if (this.id != undefined) {
+ //新建的任务自动接收
+ if (this.status == "1") {
+ this.receive((callback => {
+ this.getDetail();
+ }));
+ } else {
+ this.getDetail();
+ }
+ }
},
//返回首页
onNavigationBarButtonTap(e) {
@@ -211,6 +216,7 @@
if (this.scanedPackingNumber && this.scanedPackingNumber == s
.packingNumber) {
s.scaned = true
+ s.cancleScanedHiht = true
// s.handleQty =s.qty
this.openScanPopupSimulate(s)
}
@@ -295,7 +301,8 @@
this.$refs.scanPopup.closeScanPopup();
},
- getScanResult(result) {
+ getScanResult(result) {
+
try {
var packingNumber = result.balance.packingNumber;
var batch = result.balance.batch;
@@ -316,8 +323,9 @@
if (itemDetail == undefined) {
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
.fromLocationCode + "】不在列表中")
- } else {
- if (itemDetail.scaned) {
+ } else {
+
+ if (!itemDetail.cancleScanedHiht&&itemDetail.scaned) {
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
.fromLocationCode + "】已经扫描")
} else {
diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue
index 468d20fb..3b269100 100644
--- a/src/pages/productReceipt/job/productReceiptDetail.vue
+++ b/src/pages/productReceipt/job/productReceiptDetail.vue
@@ -134,23 +134,27 @@
managementList: [],
jobStatus: "",
jobToLocationCode: "",
- scanedPackingNumber: ''
-
+ scanedPackingNumber: '',
+ status:''
};
},
onLoad(option) {
this.id = option.id;
- this.scanedPackingNumber = option.scaned || '';
- if (this.id != undefined) {
- //新建的任务自动接收
- if (option.status == "1") {
- this.receive((callback => {
- this.getDetail();
- }));
- } else {
- this.getDetail();
- }
- }
+ this.scanedPackingNumber = option.scaned || '';
+ this.status = option.status || ''
+
+ },
+ onShow(){
+ if (this.id != undefined) {
+ //新建的任务自动接收
+ if (this.status == "1") {
+ this.receive((callback => {
+ this.getDetail();
+ }));
+ } else {
+ this.getDetail();
+ }
+ }
},
//返回首页
onNavigationBarButtonTap(e) {
@@ -224,6 +228,9 @@
if (this.scanedPackingNumber && this.scanedPackingNumber == s
.packingNumber){
s.scaned = true
+ s.cancleScanedHiht = true
+ s.copyContent = "HMQ;V1.0;I" + s.itemCode + ";P" + s.packingNumber + ";B" + s.batch + ";Q" + s.qty
+
this.$refs.scanPopup.simulateScan(s);
// s.handleQty =s.qty
}
@@ -239,7 +246,8 @@
})
},
- getScanResult(result) {
+ getScanResult(result) {
+
let label = result.label;
var packingNumber = label.packingNumber;
var batch = label.batch;
@@ -256,7 +264,7 @@
if (itemDetail == undefined) {
this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在任务列表中")
} else {
- if (itemDetail.scaned) {
+ if (!itemDetail.cancleScanedHiht&&itemDetail.scaned) {
this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]已经扫描")
} else {
itemDetail.scaned = true;
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index aa97f967..ab0eb84c 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -133,7 +133,8 @@
jobStatus: "",
isAllReceived: false,
operation: '',
- scanedPackingNumber: ''
+ scanedPackingNumber: '',
+ status:''
};
},
@@ -142,16 +143,20 @@
this.id = option.id;
this.scanedPackingNumber = option.scaned || '';
this.operation = option.operation;
- if (this.id != undefined) {
- //新建的任务自动接收
- if (option.status == "1") {
- this.receive((callback => {
- this.getDetail();
- }));
- } else {
- this.getDetail();
- }
- }
+ this.status = option.status;
+ },
+
+ onShow(){
+ if (this.id != undefined) {
+ //新建的任务自动接收
+ if (this.status == "1") {
+ this.receive((callback => {
+ this.getDetail();
+ }));
+ } else {
+ this.getDetail();
+ }
+ }
},
//返回首页
onNavigationBarButtonTap(e) {
@@ -229,7 +234,10 @@
if (this.scanedPackingNumber && this
.scanedPackingNumber == s
.packingNumber) {
- s.scaned = true
+ s.scaned = true
+ s.cancleScanedHiht = true
+
+ s.copyContent = "HPQ;V1.0;I" + s.itemCode + ";P" + s.packingNumber + ";B" + s.batch + ";Q" + s.qty
this.$refs.scanPopup.simulateScan(s);
}
})
@@ -246,7 +254,8 @@
},
- getScanResult(result) {
+ getScanResult(result) {
+
try {
var itemCode = result.label.itemCode;
var detail = this.detailSource.find(r => r.itemCode == itemCode);
@@ -260,7 +269,7 @@
if (itemDetail.length == 0) {
this.showErrorMessage("物料【" + itemCode + "】、托码【" + containerNumber + "】不在列表中")
} else {
- if (itemDetail[0].scaned) {
+ if (!itemDetail[0].cancleScanedHiht&&itemDetail[0].scaned) {
this.showErrorMessage("物料【" + itemCode + "】、托码【" + containerNumber + "】已经扫描")
} else {
itemDetail.forEach(item => {
@@ -307,7 +316,7 @@
if (isExit == undefined) {
this.showMessage("箱码【" + packingNumber + "】、批次【" + batch + "】不在列表中")
} else {
- if (isExit.scaned) {
+ if (!isExit.cancleScanedHiht&&isExit.scaned) {
this.showMessage("箱码【" + packingNumber + "】已经扫描")
} else {
isExit.scaned = true
@@ -325,7 +334,7 @@
scanedLength++;
}
})
- if (itemDetail.scaned && scanedLength == itemDetail.packList.length) {
+ if (!itemDetail.cancleScanedHiht&&itemDetail.scaned && scanedLength == itemDetail.packList.length) {
this.showMessage("箱码【" + packingNumber + "】已经扫描")
} else {
itemDetail.scaned = true;
diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue
index d90d36c2..0a2513c8 100644
--- a/src/pages/putaway/job/putawayDetail.vue
+++ b/src/pages/putaway/job/putawayDetail.vue
@@ -204,6 +204,7 @@
if (this.scanedPackingNumber && this.scanedPackingNumber == s
.packingNumber) {
s.scaned = true
+ s.cancleScanedHiht = true
s.packList.forEach(item=>item.scaned = true)
s.inventoryStatus = s.inspectResult; //更新检验结果状态
this.openScanPopupSimulate(s)
@@ -345,7 +346,7 @@
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
.fromLocationCode + "】不在列表中")
} else {
- if (isExit.scaned) {
+ if (!isExit.cancleScanedHiht&&isExit.scaned) {
this.showMessage("箱码【" + packingNumber + "】已经扫描")
} else {
isExit.scaned = true
@@ -372,7 +373,7 @@
//大哥让加的
itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
- if (itemDetail.scaned && scanedLength == itemDetail.packList.length) {
+ if (!itemDetail.cancleScanedHiht&&itemDetail.scaned && scanedLength == itemDetail.packList.length) {
this.showMessage("箱码【" + packingNumber + "】已经扫描")
} else {
itemDetail.scaned = true;
From 333427db6b8a2797b62aed87c6529f234d89379f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 18 Jun 2024 19:53:25 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=20?=
=?UTF-8?q?=E6=89=93=E5=8D=B0=20=E6=95=B0=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/pointPutawayJob/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue
index 0586b6ee..6b717b21 100644
--- a/src/pages/pointPutawayJob/index.vue
+++ b/src/pages/pointPutawayJob/index.vue
@@ -33,7 +33,7 @@
{{cur.batch}}
{{cur.packingNumber}}
{{cur.packUnit}}
- {{cur.packQty}}
+ {{cur.qty}}
{{cur.uom}}