From 22184528a61d12df5cee4a438b2e9b2d3d301e64 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Wed, 18 Oct 2023 14:12:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/modules/press-carry.vue | 13 ++++++-------
 utils/getData1.js             | 17 +++++++++++++++++
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/pages/modules/press-carry.vue b/pages/modules/press-carry.vue
index 56ac2c6..24f324a 100644
--- a/pages/modules/press-carry.vue
+++ b/pages/modules/press-carry.vue
@@ -39,7 +39,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getPressCode, groupmanual} from '@/utils/getData1.js'
+	import {pressPointList, pressTask} from '@/utils/getData1.js'
 	export default {
 		components: {
 			NavBar,
@@ -55,8 +55,7 @@
 			};
 		},
 		created () {
-			this._getPressCode()
-			this._getVehicleType()
+			this._pressPointList()
 		},
 		methods: {
 			change(e) {
@@ -68,9 +67,9 @@
 			// selectChange2(e) {
 			// 	this.index2 = e
 			// },
-			/** 获取点位编码下拉框 */
-			async _getPressCode () {
-				let res = await getPressCode()
+			/** 获取下拉框 */
+			async _pressPointList () {
+				let res = await pressPointList()
 				this.options2 = [...res]
 			},
 			/** 确定 */
@@ -81,7 +80,7 @@
 					return
 				}
 				try {
-					let res = await groupmanual(this.val1, this.index2, this.val2)
+					let res = await pressTask(this.val1, this.index2, this.val2)
 					this.disabled1 = false
 					this.val1 = ''
 					this.val2 = ''
diff --git a/utils/getData1.js b/utils/getData1.js
index 85b25d7..fca5dde 100644
--- a/utils/getData1.js
+++ b/utils/getData1.js
@@ -80,3 +80,20 @@ export const emptyDiskIntoStorageTask = () => request({
 	url:'api/pda/manualSorting/emptyDiskIntoStorageTask',
 	data: {}
 })
+
+// 压机搬运
+// 压机叫料
+export const pressTask = (dcode, vcode, qty, id) => request({
+	url:'api/pda/pressSendMaterial/pressTask',
+	data: {
+		device_code: dcode,
+		vehicle_code: vcode,
+		qty: qty,
+		user_id: id
+	}
+})
+// 搬运起点
+export const pressPointList = () => request({
+	url:'api/pda/pressSendMaterial/pressPointList',
+	data: {}
+})