Browse Source

bug 修复

lilei 3 năm trước cách đây
mục cha
commit
dfeb368232

+ 1 - 1
libs/printTools.js

@@ -96,7 +96,7 @@ export const printTempl = function(tsc,data){
 	// 货位号
 	const qrtop = textFormat(command,data.shelfPlaceCode,maxFontNums-leftMaxFnums-1.2,rightLeft,rightTop,lightHeight,"center",2)
 	// 二维码
-	command.setQR(rightLeft, qrtop, "M", 6, "A", data.barCode)
+	command.setQR(rightLeft, qrtop, "M", 5, "A", data.barCode)
 	command.setPagePrint(1,data.currentInven) // 打印分数1,每个标签重发打印2次
 	console.log("开始打印了",command.getData())
 	return command

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "iSCM智慧供应链",
     "appid" : "__UNI__5B57B68",
     "description" : "iSCM智慧供应链系统",
-    "versionName" : "1.0.4",
-    "versionCode" : 104,
+    "versionName" : "1.0.5",
+    "versionCode" : 105,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

+ 2 - 2
pages/common/printTag/printTag.vue

@@ -77,7 +77,7 @@
 						currentInven: _this.printNum,
 						printDate: nowDate,
 						printUser: _this.$store.state.vuex_userData.userNameCN,
-						barCode: `${_this.infoData.shelfSn}&${_this.infoData.productEntity&&_this.infoData.productEntity.code}`
+						barCode: `${_this.infoData.shelfSn}&${_this.infoData.productEntity&&_this.infoData.productEntity.code}&${_this.infoData.productEntity&&_this.infoData.productEntity.productSn}&${_this.infoData.shelfPlaceSn}`
 						// barCode: `dealerSn=${_this.$store.state.vuex_userData.orgSn}&shelfSn=${_this.infoData.shelfSn}&productSn=${_this.infoData.productEntity&&_this.infoData.productEntity.productSn}&productCode=${_this.infoData.productEntity&&_this.infoData.productEntity.code}&shelfPlaceCode=${_this.infoData.shelfPlaceCode}&shelfPlaceSn=${_this.infoData.shelfPlaceSn}`
 					}
 				}else if(_this.fromPage == 'smdy'){
@@ -90,7 +90,7 @@
 						currentInven: _this.printNum,
 						printDate: nowDate,
 						printUser: _this.$store.state.vuex_userData.userNameCN,
-						barCode: `${_this.infoData.shelfSn}&${_this.infoData.productCode}`
+						barCode: `${_this.infoData.shelfSn}&${_this.infoData.productCode}&${_this.infoData.productSn}&${_this.infoData.shelfPlaceSn}`
 						// barCode: `dealerSn=${_this.$store.state.vuex_userData.orgSn}&shelfSn=${_this.infoData.shelfSn}&productSn=${_this.infoData.productSn}&productCode=${_this.infoData.productCode}&shelfPlaceCode=${_this.infoData.shelfPlaceCode}&shelfPlaceSn=${_this.infoData.shelfPlaceSn}`
 					}
 				}

+ 2 - 1
pages/replenishmentManage/manualPrint.vue

@@ -93,7 +93,8 @@
 					currentInven: data.printQty,
 					printDate: this.$u.timeFormat(this.timestamp, 'yyyy-mm-dd hh:MM'),
 					printUser: dealer.userNameCN,
-					barCode: `${data.shelfSn}&${data.productCode}`
+					barCode: `${data.shelfSn}&${data.productCode}&${data.productSn}&${data.shelfPlaceSn}`
+					// barCode: `dealerSn=${dealer.orgSn}&shelfSn=${data.shelfSn}&productSn=${data.productSn}&productCode=${data.productCode}&shelfPlaceCode=${data.shelfPlaceCode}&shelfPlaceSn=${data.shelfPlaceSn}`
 				})
 				// 开始批量打印 
 				blesdk.senBlData(

+ 14 - 6
pages/replenishmentManage/sendOutGoods.vue

@@ -141,21 +141,28 @@
 			// 扫码结果
 			scanResult(qrCode){
 				const _this = this
+				const pa = qrCode.split("&")
+				console.log(qrCode,pa)
 				shelfReplenishDetailOutScan({
 					replenishBillSn: _this.replenishBillSn,
-					shelfSn: getQueryString('&'+qrCode, 'shelfSn'),
-					shelfPlaceSn: getQueryString('&'+qrCode, 'shelfPlaceSn'),
-					productSn: getQueryString('&'+qrCode, 'productSn')
+					// shelfSn: getQueryString('&'+qrCode, 'shelfSn'),
+					// shelfPlaceSn: getQueryString('&'+qrCode, 'shelfPlaceSn'),
+					// productSn: getQueryString('&'+qrCode, 'productSn')
+					shelfSn: pa[0],
+					shelfPlaceSn: pa[3],
+					productSn: pa[2]
 				}).then(res => {
 					console.log(res)
 					if(res.status == 200){
 						_this.toashMsg("扫码成功!")
-						_this.getPartList()
+						setTimeout(()=>{
+							_this.barcode.start()
+							// 刷新列表
+							_this.getPartList()
+						},2000)
 						if(res.data && res.data.totalConfirmQty && res.data.totalScanQty && res.data.totalConfirmQty == res.data.totalScanQty){
 							_this.isAll = true
 							_this.handleOutGoods()
-						}else{
-							_this.barcode.start()
 						}
 					}else{
 						this.contModal = res.message
@@ -189,6 +196,7 @@
 				 
 				// 扫码成功后
 				this.barcode.onmarked = function(type, result) {
+					console.log(type,result)
 					_this.scanResult(result)
 				}
 				// 扫码识别出错