Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

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: {
@@ -343,24 +346,23 @@
 					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, // 物品名称
 								packName: item.packName,// 包装名称
 								packageCode: item.toPackingNumber, // 包装号
-								batch:item.batch,//批次
+								batch:item.toBatch,//批次
 								parentNumber:item.parentNumber,//父包装号
 								itemType: item.itemType,//物料类型
 								asnNumber:item.asnNumber,//ASN
 								supplierCode: item.supplierCode, // 供应商
 								qty: item.qty, // 数量
-								printTimes:item.printTimes, // 打印时间
+								printTimes:getCurrDateTime(), // 打印时间
 								barcodeString: item.barcodeString, // 标签信息
 								barcodeBase64: '',
 							})
-						// })
+						})
 						this.showCommitSuccessMessage("提交成功<br>生成翻包记录<br>", list)
 					} else {
 						this.showErrorMessage("提交失败[" + res.msg + "]")

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",