From 24ba54bb326e5384b8a7201d69612abc18538edf Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 20 Nov 2024 09:10:14 +0800
Subject: [PATCH 1/6] =?UTF-8?q?YT-1106pda=E5=8F=91=E6=96=99=E4=BB=BB?=
=?UTF-8?q?=E5=8A=A1=EF=BC=8C=E6=8F=90=E4=BA=A4=E7=82=B9=E7=A1=AE=E8=AE=A4?=
=?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=8F=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/issue/job/issueDetailBatch.vue | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/pages/issue/job/issueDetailBatch.vue b/src/pages/issue/job/issueDetailBatch.vue
index d0f79487..1f5740d4 100644
--- a/src/pages/issue/job/issueDetailBatch.vue
+++ b/src/pages/issue/job/issueDetailBatch.vue
@@ -686,7 +686,6 @@
str3 = str3+",是否提交"
this.$refs.comMessage.showQuestionMessage1(str3, 'red', res => {
if (res) {
- return
//防止重复点击
this.$throttle(this.submit, 2000, this)()
} else {
@@ -694,7 +693,6 @@
}
});
}else {
- return
//防止重复点击
this.$throttle(this.submit, 2000, this)()
}
From 18fbcc83a974c22d3915056b324b58deeb5cc707 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 20 Nov 2024 11:22:42 +0800
Subject: [PATCH 2/6] =?UTF-8?q?YT-1077=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?=
=?UTF-8?q?=E5=BA=93=E4=BB=BB=E5=8A=A1PDA=E7=82=B9=E5=87=BB=E8=AF=A6?=
=?UTF-8?q?=E6=83=85=E6=B2=A1=E6=9C=89=E6=89=93=E5=BC=80=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=EF=BC=8C=E5=8F=AA=E6=98=AF=E6=8A=8A=E6=8C=89?=
=?UTF-8?q?=E9=92=AE=E6=94=B6=E8=B5=B7=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/unPlanned/coms/detailInfoPopup.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/unPlanned/coms/detailInfoPopup.vue b/src/pages/unPlanned/coms/detailInfoPopup.vue
index be4a5712..972be743 100644
--- a/src/pages/unPlanned/coms/detailInfoPopup.vue
+++ b/src/pages/unPlanned/coms/detailInfoPopup.vue
@@ -6,7 +6,7 @@
原因 :
- {{dataContent.Reason}}
+ {{dataContent.reason}}
From 864173480d50600dede9c58b84f045f2f1fcf6a4 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 20 Nov 2024 11:46:01 +0800
Subject: [PATCH 3/6] =?UTF-8?q?YT-1073=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?=
=?UTF-8?q?=E5=BA=93=E4=BB=BB=E5=8A=A1PDA=E6=89=AB=E6=8F=8F=E7=9A=84?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=B8=8E=E9=9C=80=E6=B1=82=E4=B8=8D=E7=AC=A6?=
=?UTF-8?q?=EF=BC=88=E8=AF=A6=E8=A7=81=E6=88=AA=E5=9B=BE=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/common/detail.js | 20 ++++++++++++++++++-
src/pages/unPlanned/job/receiptJobDetail.vue | 21 ++++++++------------
2 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/src/common/detail.js b/src/common/detail.js
index 3171ca38..ad26df7b 100644
--- a/src/common/detail.js
+++ b/src/common/detail.js
@@ -155,7 +155,25 @@ export function calcHandleQty(detailSource) {
}
}
}
-
+//计算计划外入库实际数量和任务数量
+export function calcHandleQtyPlanOut(detailSource) {
+ console.log(999,detailSource)
+ for (let item of detailSource) {
+ item.handleQty = new Decimal(0).toNumber();
+ item.qty = new Decimal(0).toNumber();
+ for (let detail of item.subList) {
+ if (detail != undefined) {
+ if (detail.scaned) {
+ item.handleQty = calc.add(item.handleQty, detail.handleQty);
+ }
+ console.log(detail.isRecommend)
+ if(detail.isRecommend){
+ item.qty = calc.add(item.qty, detail.qty);
+ }
+ }
+ }
+ }
+}
//计算推荐和扫描的不是用一个的数量
export function calcHandleNewQty(detailSource) {
for (let item of detailSource) {
diff --git a/src/pages/unPlanned/job/receiptJobDetail.vue b/src/pages/unPlanned/job/receiptJobDetail.vue
index 7bfddc96..0d5c7806 100644
--- a/src/pages/unPlanned/job/receiptJobDetail.vue
+++ b/src/pages/unPlanned/job/receiptJobDetail.vue
@@ -68,7 +68,8 @@
getDataSource,
createRecordInfo,
calcHandleQty,
- getScanCount
+ getScanCount,
+ calcHandleQtyPlanOut
} from '@/common/detail.js';
import {
@@ -242,7 +243,7 @@
}
}
}
- calcHandleQty(this.detailSource);
+ calcHandleQtyPlanOut(this.detailSource);
this.$forceUpdate()
},
@@ -289,7 +290,7 @@
batch:batch,
handleQty:Number(result.label.qty),
qty:detail.qty,
- toLocationCode:locationCode,
+ // toLocationCode:locationCode,
// inventoryStatus:inventoryStatus,
// toInventoryStatus:inventoryStatus,
balance:{},
@@ -308,20 +309,14 @@
} else {
itemDetail.scaned = true;
itemDetail.handleQty = Number(result.label.qty);
- itemDetail.toLocationCode = this.toLocationCode ? this.toLocationCode : itemDetail
- .toLocationCode;
+ // itemDetail.toLocationCode = this.toLocationCode ? this.toLocationCode : itemDetail
+ // .toLocationCode;
itemDetail.packQty = result.package.packQty
itemDetail.labelQty = Number(result.label.qty);
this.continueScan()
}
}
- let array = []
- this.detailSource.forEach((item=>{
- let obj = {...item}
- obj.subList=item.subList.filter(cur=>cur.isRecommend == true)
- array.push(obj)
- }))
- calcHandleQty(array);
+ calcHandleQtyPlanOut(this.detailSource);
}
} catch (e) {
@@ -352,7 +347,7 @@
.toLocationCode;
itemDetail.packQty = result.package.packQty
itemDetail.labelQty = Number(result.label.qty);
- calcHandleQty(this.detailSource);
+ calcHandleQtyPlanOut(this.detailSource);
this.continueScan()
}
}
From b3bcedf5d448a42e4e9542f9bfcb3314a080ccc0 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 20 Nov 2024 13:59:38 +0800
Subject: [PATCH 4/6] =?UTF-8?q?YT-1076=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?=
=?UTF-8?q?=E5=BA=93=E4=BB=BB=E5=8A=A1=EF=BC=8C=E7=BC=96=E8=BE=91=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E5=8C=85=E8=A3=85=E6=95=B0=E9=87=8F=EF=BC=8C=E6=A0=87?=
=?UTF-8?q?=E5=8C=85=E9=87=8F=EF=BC=8C=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?=
=?UTF-8?q?=EF=BC=8C=E5=BA=93=E5=AD=98=E6=95=B0=E9=87=8F=E4=B8=8D=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../detail/comRecommendDetailCard.vue | 16 +++++++++++-----
src/pages/unPlanned/job/receiptJobDetail.vue | 11 +++++++++--
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/mycomponents/detail/comRecommendDetailCard.vue b/src/mycomponents/detail/comRecommendDetailCard.vue
index ea32ef9b..2e1c29b3 100644
--- a/src/mycomponents/detail/comRecommendDetailCard.vue
+++ b/src/mycomponents/detail/comRecommendDetailCard.vue
@@ -38,7 +38,10 @@
-
+
+
+
@@ -48,7 +51,8 @@