From abae5057c33f6786cafc964facc097673e793e58 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 17 Jun 2024 14:07:02 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E7=BF=BB=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/package/record/overPackageRecord.vue | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue
index 6ca28151..63a486ce 100644
--- a/src/pages/package/record/overPackageRecord.vue
+++ b/src/pages/package/record/overPackageRecord.vue
@@ -343,8 +343,7 @@
uni.hideLoading()
if (res.data) {
let list = []
- let item = res.data;
- // res.data.forEach(item => {
+ res.data.forEach(item => {
list.push({
itemCode:item.itemCode, // 物品代码
itemName: item.itemName, // 物品名称
@@ -360,7 +359,7 @@
barcodeString: item.barcodeString, // 标签信息
barcodeBase64: '',
})
- // })
+ })
this.showCommitSuccessMessage("提交成功
生成翻包记录
", list)
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
From 7fc04491da214b1b861091e64bf472cebcb6ffa7 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 17 Jun 2024 15:55:17 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0type=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/productPutaway/job/productPutawayJob.vue | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue
index b68fdafe..f7475548 100644
--- a/src/pages/productPutaway/job/productPutawayJob.vue
+++ b/src/pages/productPutaway/job/productPutawayJob.vue
@@ -342,6 +342,11 @@
column: "itemCode",
action: "==",
value: result.label.itemCode
+ },
+ {
+ column: "type",
+ action: "==",
+ value: this.type
},
// {
// column: "fromLocationCode",
From 80788b560d5a1f11eef474a85e100286824b2d23 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 17 Jun 2024 16:09:01 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=E8=87=AA=E5=B7=B1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/package/record/overPackageRecord.vue | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue
index 63a486ce..3c28920d 100644
--- a/src/pages/package/record/overPackageRecord.vue
+++ b/src/pages/package/record/overPackageRecord.vue
@@ -101,6 +101,9 @@
import packageTarget from '@/mycomponents/package/packageTarget.vue'
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
import packUnit from '@/mycomponents/qty/packUnit.vue'
+ import {
+ getCurrDateTime
+ } from '@/common/basic.js';
export default {
components: {
@@ -355,7 +358,7 @@
asnNumber:item.asnNumber,//ASN
supplierCode: item.supplierCode, // 供应商
qty: item.qty, // 数量
- printTimes:item.printTimes, // 打印时间
+ printTimes:getCurrDateTime(), // 打印时间
barcodeString: item.barcodeString, // 标签信息
barcodeBase64: '',
})
From 02048a8413e064fff65e6caeac327399a91d2847 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 17 Jun 2024 16:48:07 +0800
Subject: [PATCH 4/4] toBatch
---
src/pages/package/record/overPackageRecord.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue
index 3c28920d..e335b7c1 100644
--- a/src/pages/package/record/overPackageRecord.vue
+++ b/src/pages/package/record/overPackageRecord.vue
@@ -352,7 +352,7 @@
itemName: item.itemName, // 物品名称
packName: item.packName,// 包装名称
packageCode: item.toPackingNumber, // 包装号
- batch:item.batch,//批次
+ batch:item.toBatch,//批次
parentNumber:item.parentNumber,//父包装号
itemType: item.itemType,//物料类型
asnNumber:item.asnNumber,//ASN