From d8a6b7193e77c5087ea460f55319705164f70d99 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 15 Nov 2024 15:17:12 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=95=B4=E5=8D=95=E6=94=B6=E8=B4=A7?=
=?UTF-8?q?=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/purchaseReceipt/job/receiptDetail.vue | 2 +-
src/pages/putaway/job/putawayDetail.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index 7f684684..45dfdd52 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -5,7 +5,7 @@
-
整单收货
diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue
index 2ee771c1..192f50cd 100644
--- a/src/pages/putaway/job/putawayDetail.vue
+++ b/src/pages/putaway/job/putawayDetail.vue
@@ -655,7 +655,7 @@
str1 += `物料号【${item.itemCode}】批次【${cur.batch}】实际提交数量【${cur.handleQty}】不可以大于任务数量【${cur.qty}】\n`
}
if(parseFloat(cur.handleQty)>parseFloat(cur.balanceQty)){
- str2 += `物料号【${item.itemCode}】批次【${cur.batch}】实际提交数量【${cur.handleQty}】不可以大于库存数量【${cur.qty}】\n`
+ str2 += `物料号【${item.itemCode}】批次【${cur.batch}】实际提交数量【${cur.handleQty}】不可以大于库存数量【${cur.balanceQty}】\n`
}
}
})
From c1227af623785806360fa835f2707bde602ca1d9 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 15 Nov 2024 17:00:53 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
=?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../coms/comReceiptDetailCardBacth.vue | 2 +-
.../purchaseReceipt/job/receiptDetail.vue | 20 ++++++++++---------
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue b/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue
index 7013495f..830e13cf 100644
--- a/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue
+++ b/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue
@@ -11,7 +11,7 @@
-
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index 45dfdd52..6e80ce4e 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -507,7 +507,8 @@
pack.qty = batchDetailList[i].qty
pack.toLocationCode = this.toLocationCode;
- pack.labelQty = Number(qty);
+ console.log(999,result.package)
+ pack.labelQty = Number(result.package.packQty);
pack.scaned = true;
// 当前批次剩余可以扫进的数量大于当前扫描的标签数量的时候直接插入当前的批次
if(handleQtySub >= parseFloat(qty)){
@@ -691,15 +692,16 @@
let str = ''
let str1 = ''
var scanCount=0;
+ this.jobContent.allowBiggerQty = "FALSE"
this.detailSource.forEach((item) => {
item.subList.forEach(cur=>{
if(cur.scaned){
scanCount++;
if(parseFloat(cur.qty)>parseFloat(cur.handleQty)){
- str += `物料号【${item.itemCode}】批次【${cur.batch}】实际提交数量【${cur.handleQty}】不可以小于任务数量【${cur.qty}】\n`
+ str += `物料号【${item.itemCode}】批次【${cur.batch}】扫描数量【${cur.handleQty}】小于任务推荐数量【${cur.qty}】,\n请修改后再提交`
}
if(parseFloat(cur.qty)
Date: Fri, 15 Nov 2024 17:15:52 +0800
Subject: [PATCH 3/6] =?UTF-8?q?YT-1022da=E7=89=A9=E6=96=99=E9=9A=94?=
=?UTF-8?q?=E7=A6=BB=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=89=AB=E6=8F=8F=E5=90=8E?=
=?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../inventoryMove/job/inventoryMoveDetail.vue | 29 ++++++++++---------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
index 61d85710..9a17e858 100644
--- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -551,20 +551,21 @@
let str1 = ''
this.detailSource.forEach((item) => {
item.subList.forEach(cur => {
- if (cur.qty != cur.handleQty) {
- var tempHandleQty = 0
- if (cur.handleQty) {
- tempHandleQty = cur.handleQty
- } else {
- tempHandleQty = 0
- }
- str +=
- `物料号【${item.itemCode}】批次【${cur.batch}】提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致\n`
- if( cur.handleQty > cur.balance.balanceQty){
- console.log(2333,cur.handleQty)
- console.log(2333,cur.balance.balanceQty)
- str1 +=
- `物料号【${item.itemCode}】批次【${cur.batch}】提交数量【${ cur.handleQty}】不可以大于库存数量【${cur.balance.balanceQty}】`
+
+ if(cur.scaned){
+ if (cur.qty != cur.handleQty) {
+ var tempHandleQty = 0
+ if (cur.handleQty) {
+ tempHandleQty = cur.handleQty
+ } else {
+ tempHandleQty = 0
+ }
+ str +=
+ `物料号【${item.itemCode}】批次【${cur.batch}】提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致\n`
+ if(cur.handleQty > cur.balance.balanceQty){
+ str1 +=
+ `物料号【${item.itemCode}】批次【${cur.batch}】提交数量【${ cur.handleQty}】不可以大于库存数量【${cur.balance.balanceQty}】`
+ }
}
}
})
From 7c4665cf0ce4cab77ca09aa3ef803210654d0a3e Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 15 Nov 2024 17:28:09 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E5=90=88=E6=A0=BC?=
=?UTF-8?q?=E8=BD=AC=E9=9A=94=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/inventoryMove/coms/comMoveRecord.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue
index 53118cf2..e780a050 100644
--- a/src/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecord.vue
@@ -418,6 +418,7 @@
newDetail.managementTypeParams = managementTypeParams;
newDetail.fromLocationCode = result.fromLocationCode
newDetail.handleQty = Number(result.label.qty)
+ newDetail.batch = result.label.batch
newDetail.packQty = balance.packQty;
newDetail.packUnit = balance.packUnit;
itemp.subList.push(newDetail);
@@ -460,6 +461,7 @@
newDetail.toLocationCode = this.toLocationCode;
newDetail.managementTypeParams = managementTypeParams;
newDetail.fromLocationCode = result.fromLocationCode
+ newDetail.batch = result.label.batch
newDetail.handleQty = result.label.qty
newDetail.packQty = balance.packQty;
newDetail.packUnit = balance.packUnit;
From 20fe89d13f417cba2423ababc0d22105bd5ba734 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 15 Nov 2024 17:52:50 +0800
Subject: [PATCH 5/6] =?UTF-8?q?YT-999pda=E5=8F=91=E6=96=99=EF=BC=8C?=
=?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=B8=8D=E5=87=86=E7=A1=AE=EF=BC=8C=E6=9C=89?=
=?UTF-8?q?=E5=A4=9A=E4=B8=AA=E6=89=B9=E6=AC=A1=EF=BC=8C=E6=8F=90=E7=A4=BA?=
=?UTF-8?q?=E5=BA=94=E5=8A=A0=E6=89=B9=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/issue/job/issueDetailBatch.vue | 56 ++++++++++++------------
1 file changed, 29 insertions(+), 27 deletions(-)
diff --git a/src/pages/issue/job/issueDetailBatch.vue b/src/pages/issue/job/issueDetailBatch.vue
index 090066d4..0ad14d29 100644
--- a/src/pages/issue/job/issueDetailBatch.vue
+++ b/src/pages/issue/job/issueDetailBatch.vue
@@ -621,6 +621,7 @@
let str=""
let str1=""
let str2=""
+ let str3=""
var totalQty =0;
var taskQty =0;
console.log(877,this.detailSource)
@@ -628,56 +629,57 @@
detail.subList.forEach(item => {
if(item.scaned){
taskQty =calc.add(taskQty,item.qty)
- totalQty =calc.add(totalQty,item.handleQty)
- if (this.jobContent.allowSmallerQty == "FALSE") {
- if(parseFloat(item.handleQty) parseFloat(item.qty)){
- str1 += `批次【${item.batch}】提交数量【${parseFloat(item.handleQty)}】不允许大于任务数量【${item.qty}】`
- }
+ totalQty =calc.add(totalQty,item.handleQty)
+ if(parseFloat(item.handleQty) parseFloat(item.qty)){
+ str1 += `批次【${item.batch}】提交数量【${parseFloat(item.handleQty)}】不允许大于任务数量【${item.qty}】`
}
+
if(parseFloat(item.handleQty)>parseFloat( item.balance.qty)){
str2 += `批次【${item.batch}】提交数量【${parseFloat(item.handleQty)}】不可以大于库存数量【${item.balance.qty}】`
}
+
}
})
})
- console.log(877,str)
- if (str) {
- str1 = '不允许提交\n' + str
- this.showErrorMessage(str)
- return
+ if (this.jobContent.allowSmallerQty == "FALSE") {
+ if (str) {
+ str = '不允许提交\n' + str
+ this.showErrorMessage(str)
+ return
+ }
}
- if (str1) {
- str1 = '不允许提交\n' + str1
- this.showErrorMessage(str1)
- return
+ if (this.jobContent.allowBiggerQty == 'FALSE') {
+ if (str1) {
+ str1 = '不允许提交\n' + str1
+ this.showErrorMessage(str1)
+ return
+ }
}
+
if (str2) {
str2 = '不允许提交\n' + str2
this.showErrorMessage(str2)
return
}
- if(str){
- str = '任务明细未全部完成,是否提交?\n' + str
- }
- if(totalQty!=taskQty){
- str ="扫描数量["+totalQty+"]与任务数量不一致["+taskQty+"],是否提交"
- this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
+ console.log(str3)
+ if(str3){
+ str3 = str3+",是否提交"
+ this.$refs.comMessage.showQuestionMessage1(str3, 'red', res => {
if (res) {
//防止重复点击
- this.$throttle(this.submit, 2000, this)()
+ // this.$throttle(this.submit, 2000, this)()
} else {
this.scanPopupGetFocus()
}
});
}else {
//防止重复点击
- this.$throttle(this.submit, 2000, this)()
+ // this.$throttle(this.submit, 2000, this)()
}
},
From 5e0b531a2c21dfd9803474cdd1e7a49e82a30a44 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 18 Nov 2024 09:46:28 +0800
Subject: [PATCH 6/6] =?UTF-8?q?YT-1037=E5=8F=91=E6=96=99=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=EF=BC=8C=E7=82=B9=E6=8F=90=E4=BA=A4=E6=B2=A1=E6=9C=89=E5=8F=8D?=
=?UTF-8?q?=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/issue/job/issueDetailBatch.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pages/issue/job/issueDetailBatch.vue b/src/pages/issue/job/issueDetailBatch.vue
index 0ad14d29..cd4a2765 100644
--- a/src/pages/issue/job/issueDetailBatch.vue
+++ b/src/pages/issue/job/issueDetailBatch.vue
@@ -672,14 +672,14 @@
this.$refs.comMessage.showQuestionMessage1(str3, 'red', res => {
if (res) {
//防止重复点击
- // this.$throttle(this.submit, 2000, this)()
+ this.$throttle(this.submit, 2000, this)()
} else {
this.scanPopupGetFocus()
}
});
}else {
//防止重复点击
- // this.$throttle(this.submit, 2000, this)()
+ this.$throttle(this.submit, 2000, this)()
}
},