From 205d38d57f3afb5cc40c4ebfdd6ca7a17f16fe17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Wed, 15 May 2024 11:08:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=87=E7=AD=BE=E6=89=AB?=
 =?UTF-8?q?=E7=A0=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |  8 ++
 pages/index/index.vue                         |  7 ++
 pages/scan/scan.vue                           | 96 +++++++++++++++++++
 .../warehoseActionList/warehoseActionList.vue | 30 +++++-
 pages/watchGoods/goodsdetail/goodsdetail.vue  |  2 +-
 pages/watchGoods/watchGoods.vue               | 30 +++++-
 6 files changed, 170 insertions(+), 3 deletions(-)
 create mode 100644 pages/scan/scan.vue

diff --git a/pages.json b/pages.json
index 1e8e22f..b7ef6da 100644
--- a/pages.json
+++ b/pages.json
@@ -224,6 +224,14 @@
 				"navigationBarTitleText" : "成品入库",
 				"enablePullDownRefresh" : false
 			}
+		},
+		{
+			"path" : "pages/scan/scan",
+			"style" : 
+			{
+				"navigationBarTitleText" : "扫码信息展示",
+				"enablePullDownRefresh" : false
+			}
 		}
 	]
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e63b9aa..1513292 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -126,6 +126,13 @@
 						type: 3,
 						index: 10
 					},
+					{
+						name: '标签扫码',
+						icon: 'scan',
+						url: '/pages/scan/scan',
+						type: 3,
+						index: 14
+					},
 					{
 						name: '拼箱',
 						icon: 'grid-fill',
diff --git a/pages/scan/scan.vue b/pages/scan/scan.vue
new file mode 100644
index 0000000..458bffc
--- /dev/null
+++ b/pages/scan/scan.vue
@@ -0,0 +1,96 @@
+<template>
+	<!-- 扫码查看信息 -->
+	<view class="common-nav-container">
+		<view style="padding: 10px;">
+			<u-input prefixIcon="scan" prefixIconStyle="font-size: 22px;color: #909399" placeholder="请扫箱标签"
+				border="surround" v-model.trim="formData.query" @change="queryChange" clearable></u-input>
+		</view>
+		<u-list height="500px">
+			<u-list-item v-for="(item, index) in packageData" :key="index">
+				<u-cell :title="packageTitle[index]">
+					<u--text slot="value" type="info" :text="item" bold size="36"></u--text>
+				</u-cell>
+			</u-list-item>
+		</u-list>
+	</view>
+</template>
+
+<script>
+	import * as WarehoseApi from '@/api/warehouse/warehose.js';
+	export default {
+		data() {
+			return {
+				formData: {
+					query: ""
+				},
+				// 扫码类型
+				type: 0,
+				packageTitle: {
+					"workoderID": "工单号:",
+					"patchCode": "批次号:",
+					"partNumner": "零件号:",
+					"productionDescribe": "描述:",
+					"productionTime": "生产日期:",
+					"quantity": "数量:",
+					"team": "组:",
+					"remark": "备注:",
+					"originalCode": "扫码结果:",
+				},
+				packageData: {
+					"workoderID": "",
+					"patchCode": "",
+					"partNumner": "",
+					"productionDescribe": "",
+					"productionTime": "",
+					"quantity": null,
+					"team": "",
+					"remark": "",
+					"originalCode": "",
+				}
+			}
+		},
+		methods: {
+			// 扫标签码时，自动进行翻译
+			async queryChange(value) {
+				if (value === null || value === "") {
+					return;
+				}
+				if (value.length < 40) {
+					return;
+				}
+				let package_code = value;
+				let resolutionData = {
+					code: package_code
+				};
+				const emitRes = await WarehoseApi.resolutionPackage(resolutionData);
+				if (emitRes.code !== 200 || emitRes.data === null) {
+					uni.showModal({
+						title: '提示',
+						content: '该箱号数据解析异常！',
+						showCancel: false,
+						confirmText: '确定'
+					});
+					return;
+				}
+				setTimeout(() => {
+					this.formData.query = "";
+					this.packageData = {
+						"workoderID": emitRes.data.workoderID,
+						"patchCode": emitRes.data.patchCode,
+						"partNumner": emitRes.data.partNumner,
+						"productionDescribe": emitRes.data.productionDescribe,
+						"productionTime": emitRes.data.productionTime,
+						"quantity": emitRes.data.quantity,
+						"team": emitRes.data.team,
+						"remark": emitRes.data.remark,
+						"originalCode": emitRes.data.originalCode,
+					}
+				}, 100)
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/pages/warehoseActionList/warehoseActionList.vue b/pages/warehoseActionList/warehoseActionList.vue
index 2c0d8c2..62b07c2 100644
--- a/pages/warehoseActionList/warehoseActionList.vue
+++ b/pages/warehoseActionList/warehoseActionList.vue
@@ -3,7 +3,7 @@
 		<u-subsection :list="typeOptions" :current="queryForm.type" key-name="label" @change="subsectionChange"
 			fontSize="36"></u-subsection>
 		<u-input v-model="queryForm.description" placeholder="请输入模糊批次号" clearable prefixIcon="search"
-			prefixIconStyle="font-size: 22px;color: #909399">
+			prefixIconStyle="font-size: 22px;color: #909399" @change="queryChange">
 			<template slot="suffix">
 				<u-button @click="getList" type="primary" size="mini">搜索</u-button>
 			</template>
@@ -57,6 +57,7 @@
 
 <script>
 	import * as goodsChangeLogApi from '@/api/warehouse/wmGoodsChangeLog.js';
+	import * as WarehoseApi from '@/api/warehouse/warehose.js';
 	export default {
 		data() {
 			return {
@@ -212,6 +213,33 @@
 				if (page * size < total) {
 					this.getList(true);
 				}
+			},
+			// 扫标签码时，自动进行翻译
+			async queryChange(value) {
+				if (value === null || value === "") {
+					return;
+				}
+				if (value.length < 40) {
+					return;
+				}
+				let package_code = value;
+				let resolutionData = {
+					code: package_code
+				};
+				const emitRes = await WarehoseApi.resolutionPackage(resolutionData);
+				if (emitRes.code !== 200 || emitRes.data === null) {
+					uni.showModal({
+						title: '提示',
+						content: '该箱号数据解析异常！',
+						showCancel: false,
+						confirmText: '确定'
+					});
+					return;
+				}
+				setTimeout(() => {
+					this.queryForm.description = emitRes.data.patchCode;
+					this.getList();
+				}, 100)
 			}
 		}
 	}
diff --git a/pages/watchGoods/goodsdetail/goodsdetail.vue b/pages/watchGoods/goodsdetail/goodsdetail.vue
index 66ef2ba..81fed76 100644
--- a/pages/watchGoods/goodsdetail/goodsdetail.vue
+++ b/pages/watchGoods/goodsdetail/goodsdetail.vue
@@ -3,7 +3,7 @@
 		<u-list height="640px">
 			<u-list-item v-for="(item, index) in dataList" :key="index">
 				<u-cell :title="'批次号:'+item.packageCodeClient"
-					:label="'零件号:'+item.partnumber + '\n库位:'+item.locationCode + '\n入库时间:'+item.entryWarehouseTime + '\n备注:'+item.remark"
+					:label="'零件号:'+item.partnumber + '\n描述:'+item.description + '\n库位:'+item.locationCode + '\n入库时间:'+item.entryWarehouseTime + '\n备注:'+item.remark"
 					:value="'零件数:'+item.goodsNumAction">
 				</u-cell>
 			</u-list-item>
diff --git a/pages/watchGoods/watchGoods.vue b/pages/watchGoods/watchGoods.vue
index e0f1146..41ddb43 100644
--- a/pages/watchGoods/watchGoods.vue
+++ b/pages/watchGoods/watchGoods.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="common-nav-container">
 		<u-search placeholder="请填写零件号或批次号" borderColor="#c8c9cc" v-model.trim="formData.query" bgColor="#f4f4f5"
-			shape="square" searchIconSize="48" @search="getList()" @custom="getList()"></u-search>
+			shape="square" searchIconSize="48" @search="getList()" @custom="getList()" @change="queryChange"></u-search>
 		<u-list @scrolltolower="scrolltolower" height="590px">
 			<u-list-item v-for="(item, index) in dataList" :key="index">
 				<u-cell :title="'批次号:'+item.shortPackageCode" :label="'零件号:'+item.partnumber"
@@ -51,6 +51,7 @@
 
 <script>
 	import * as watchGoodsApi from '@/api/watchGoods/watchGoods.js';
+	import * as WarehoseApi from '@/api/warehouse/warehose.js';
 	export default {
 		data() {
 			return {
@@ -127,6 +128,33 @@
 				uni.navigateTo({
 					url: '/pages/watchGoods/goodsdetail/goodsdetail?shortpatchcode=' + item.name
 				})
+			},
+			// 扫标签码时，自动进行翻译
+			async queryChange(value) {
+				if (value === null || value === "") {
+					return;
+				}
+				if (value.length < 40) {
+					return;
+				}
+				let package_code = value;
+				let resolutionData = {
+					code: package_code
+				};
+				const emitRes = await WarehoseApi.resolutionPackage(resolutionData);
+				if (emitRes.code !== 200 || emitRes.data === null) {
+					uni.showModal({
+						title: '提示',
+						content: '该箱号数据解析异常！',
+						showCancel: false,
+						confirmText: '确定'
+					});
+					return;
+				}
+				setTimeout(()=>{
+					this.formData.query = emitRes.data.patchCode;
+					this.getList();
+				},100)
 			}
 		}
 	};