From b41ebbef0cb3b714d1d8b82acb795498ba2d3d1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Tue, 30 Apr 2024 14:29:44 +0800
Subject: [PATCH] =?UTF-8?q?AGV=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E7=AB=99=E7=82=B9=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/materialManagement/MaterialRequsition.js  | 24 +++++++++++
 .../MaterialRequisition.vue                   | 43 ++++++++++++++++---
 .../MaterialWarehousing.vue                   | 23 ++++++++--
 3 files changed, 81 insertions(+), 9 deletions(-)

diff --git a/api/materialManagement/MaterialRequsition.js b/api/materialManagement/MaterialRequsition.js
index 11d473e..49b3c4d 100644
--- a/api/materialManagement/MaterialRequsition.js
+++ b/api/materialManagement/MaterialRequsition.js
@@ -55,4 +55,28 @@ export function FinisBatchingTask(params) {
 		method: 'get',
 		params
 	})
+}
+// 返程起点下拉
+export function getStartOptions(params) {
+	return request({
+		url: '/mes/mm/materialinput/emptycarreturn_start',
+		method: 'get',
+		params
+	})
+}
+// 返程终点下拉
+export function getEndOptions(params) {
+	return request({
+		url: '/mes/mm/materialinput/emptycarreturn_end',
+		method: 'get',
+		params
+	})
+}
+// 所有点位下拉
+export function getAllOptions(params) {
+	return request({
+		url: '/mes/mm/MmFinishedwarehouse/finish_point',
+		method: 'get',
+		params
+	})
 }
\ No newline at end of file
diff --git a/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue b/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue
index cb83fcc..7b6c11e 100644
--- a/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue
+++ b/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue
@@ -94,13 +94,13 @@
 						<u-text text="起点" size="48"></u-text>
 					</u-col>
 					<u-col span="4">
-						 <u-input v-model="start_point" placeholder="请输入起点" clearable></u-input>
+						<uni-data-select v-model="start_point" :localdata="startOptions"></uni-data-select>
 					</u-col>
 					<u-col span="2">
 						<u-text text="终点" size="48"></u-text>
 					</u-col>
 					<u-col span="4">
-						 <u-input v-model="end_point" placeholder="请输入终点" clearable></u-input>
+						<uni-data-select v-model="end_point" :localdata="endOptions"></uni-data-select>
 					</u-col>
 				</u-row>
 				<u-gap height="20"></u-gap>
@@ -124,7 +124,9 @@
 		getIngredientTask_son,
 		getfabgopoints,
 		go_workshop,
-		emergency_stop_agv
+		emergency_stop_agv,
+		getStartOptions,
+		getEndOptions
 	} from '@/api/materialManagement/MaterialRequsition.js';
 	export default {
 		data() {
@@ -148,7 +150,10 @@
 				start_point: '',
 				end_point: '',
 				fab_go_points: [],
-				reqCode: ''
+				reqCode: '',
+				// 空车返程
+				startOptions: [],
+				endOptions: []
 			};
 		},
 		watch: {},
@@ -167,6 +172,7 @@
 		},
 		mounted() {
 			this.getInitList();
+			this.getSelectOptions();
 		},
 		methods: {
 			// todo 分页查询
@@ -194,6 +200,32 @@
 					}
 				});
 			},
+			getSelectOptions() {
+				getStartOptions().then(res => {
+					if (res.code === 200) {
+						let _list = [];
+						res.data.forEach(item => {
+							_list.push({
+								value: item,
+								text: item
+							})
+						})
+						this.startOptions = _list;
+					}
+				})
+				getEndOptions().then(res => {
+					if (res.code === 200) {
+						let _list = [];
+						res.data.forEach(item => {
+							_list.push({
+								value: item,
+								text: item
+							})
+						})
+						this.endOptions = _list;
+					}
+				})
+			},
 			sectionChange(index) {
 				this.current = index;
 				this.start_point = '';
@@ -234,6 +266,7 @@
 			//todo 确认起点
 			confirm_startpoint(point) {
 				this.start_point = point;
+				this.get_fab_go_points();
 			},
 			//todo获取车间点
 			get_fab_go_points() {
@@ -259,7 +292,7 @@
 					});
 					return;
 				}
-				
+
 				const query = {
 					start_point: this.start_point,
 					end_point: this.end_point
diff --git a/pages/materialManagement/MaterialWarehousing/MaterialWarehousing.vue b/pages/materialManagement/MaterialWarehousing/MaterialWarehousing.vue
index 9d8dc78..ee9f569 100644
--- a/pages/materialManagement/MaterialWarehousing/MaterialWarehousing.vue
+++ b/pages/materialManagement/MaterialWarehousing/MaterialWarehousing.vue
@@ -7,13 +7,13 @@
 						<u-text text="起点" size="48"></u-text>
 					</u-col>
 					<u-col span="4">
-						<u-input v-model="start_point" placeholder="请输入起点" clearable></u-input>
+						<uni-data-select v-model="start_point" :localdata="startOptions" placeholder="请选择起点"></uni-data-select>
 					</u-col>
 					<u-col span="2">
 						<u-text text="终点" size="48"></u-text>
 					</u-col>
 					<u-col span="4">
-						<u-input v-model="end_point" placeholder="请输入终点" clearable></u-input>
+						<uni-data-select v-model="end_point" :localdata="endOptions" placeholder="请选择终点"></uni-data-select>
 					</u-col>
 				</u-row>
 				<u-gap height="20"></u-gap>
@@ -34,14 +34,17 @@
 <script>
 	import {
 		go_workshop,
-		emergency_stop_agv
+		emergency_stop_agv,
+		getAllOptions
 	} from '@/api/materialManagement/MaterialRequsition.js';
 	export default {
 		data() {
 			return {
 				loading: false,
 				start_point: '',
+				startOptions:[],
 				end_point: '',
+				endOptions:[],
 				reqCode: ''
 			};
 		},
@@ -54,7 +57,19 @@
 		},
 		methods: {
 			init() {
-
+				getAllOptions().then(res=>{
+					if(res.code===200){
+						let _list = [];
+						res.data.forEach(item => {
+							_list.push({
+								value: item,
+								text: item
+							})
+						})
+						this.startOptions = _list;
+						this.endOptions = _list;
+					}
+				})
 
 			},
 			start_agv() {