From d38e15f9211ad6e2c708bf099b477db057841449 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Sun, 8 Oct 2023 16:00:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=BC=E5=8F=AB=E6=9C=A8=E7=9B=98=EF=BC=8C?=
 =?UTF-8?q?=E7=A9=BA=E7=9B=98=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/modules/call-full-mater.vue | 89 +++++++++++++++++++++++++++++++
 pages/modules/call-mupan.vue      | 89 +++++++++++++++++++++++++++++++
 pages/modules/empty-instore.vue   | 12 ++---
 utils/getData1.js                 | 30 ++++++++++-
 4 files changed, 212 insertions(+), 8 deletions(-)
 create mode 100644 pages/modules/call-full-mater.vue
 create mode 100644 pages/modules/call-mupan.vue

diff --git a/pages/modules/call-full-mater.vue b/pages/modules/call-full-mater.vue
new file mode 100644
index 0000000..0667fbf
--- /dev/null
+++ b/pages/modules/call-full-mater.vue
@@ -0,0 +1,89 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="呼叫满料"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>起点</th>
+								<th>终点</th>
+								<th>任务状态</th>
+								<th>备注</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @tap="toCheck(e)" :class="{'checked': e.group_id === pkId}">
+								<td>{{e.point_name1}}</td>
+								<td>{{e.point_name2}}</td>
+								<td>{{e.task_status}}</td>
+								<td>{{e.remark}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" @tap="_callingMaterialTaskShow">刷新</button>
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure">呼叫满料</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import {callingMaterialTaskShow, callingMaterialTask} from '@/utils/getData1.js'
+	export default {
+		components: {
+			NavBar
+		},
+		data() {
+			return {
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled: false
+			};
+		},
+		created () {
+			this._callingMaterialTaskShow()
+		},
+		methods: {
+			/** grid查询 */
+			async _callingMaterialTaskShow () {
+				let res = await callingMaterialTaskShow()
+				this.dataList = [...res]
+			},
+			/** 呼叫满料 */
+			async toSure () {
+				this.disabled = true
+				if (!this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await callingMaterialTask()
+					this.disabled = false
+					this.pkId = ''
+					this.pkObj = {}
+					this._callingMaterialTaskShow()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.group_id ? '' : e.group_id
+				this.pkObj = this.pkId === e.group_id ? e : {}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/pages/modules/call-mupan.vue b/pages/modules/call-mupan.vue
new file mode 100644
index 0000000..919744d
--- /dev/null
+++ b/pages/modules/call-mupan.vue
@@ -0,0 +1,89 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="呼叫木盘"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>起点</th>
+								<th>终点</th>
+								<th>任务状态</th>
+								<th>备注</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @tap="toCheck(e)" :class="{'checked': e.group_id === pkId}">
+								<td>{{e.point_name1}}</td>
+								<td>{{e.point_name2}}</td>
+								<td>{{e.task_status}}</td>
+								<td>{{e.remark}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" @tap="_callingWoodenPalletTaskShow">刷新</button>
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure">呼叫木盘</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import {callingWoodenPalletTaskShow, callingWoodenPalletTask} from '@/utils/getData1.js'
+	export default {
+		components: {
+			NavBar
+		},
+		data() {
+			return {
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled: false
+			};
+		},
+		created () {
+			this._callingWoodenPalletTaskShow()
+		},
+		methods: {
+			/** grid查询 */
+			async _callingWoodenPalletTaskShow () {
+				let res = await callingWoodenPalletTaskShow()
+				this.dataList = [...res]
+			},
+			/** 呼叫木盘 */
+			async toSure () {
+				this.disabled = true
+				if (!this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await callingWoodenPalletTask()
+					this.disabled = false
+					this.pkId = ''
+					this.pkObj = {}
+					this._callingWoodenPalletTaskShow()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.group_id ? '' : e.group_id
+				this.pkObj = this.pkId === e.group_id ? e : {}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/pages/modules/empty-instore.vue b/pages/modules/empty-instore.vue
index adb4134..bce5e7b 100644
--- a/pages/modules/empty-instore.vue
+++ b/pages/modules/empty-instore.vue
@@ -15,10 +15,10 @@
 						</thead>
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i" @tap="toCheck(e)" :class="{'checked': e.group_id === pkId}">
-								<td>{{e.point_code}}</td>
-								<td>{{e.device_code}}</td>
-								<td>{{e.standing_time}}</td>
-								<td>{{e.timeDifferenceMinutes}}</td>
+								<td>{{e.point_name1}}</td>
+								<td>{{e.point_name2}}</td>
+								<td>{{e.task_status}}</td>
+								<td>{{e.remark}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -27,7 +27,7 @@
 		</view>
 		<view class="submit-bar">
 			<button class="submit-button" @tap="_emptyDiskIntoStorageShow">刷新</button>
-			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure">确认</button>
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure">空盘入库</button>
 		</view>
 	</view>
 </template>
@@ -56,7 +56,7 @@
 				let res = await emptyDiskIntoStorageShow()
 				this.dataList = [...res]
 			},
-			/** 确认 */
+			/** 空盘入库 */
 			async toSure () {
 				this.disabled = true
 				if (!this.pkId) {
diff --git a/utils/getData1.js b/utils/getData1.js
index 5262f87..5ccb436 100644
--- a/utils/getData1.js
+++ b/utils/getData1.js
@@ -42,8 +42,34 @@ export const sendTask = (vcode, spcode) => request({
 })
 
 /**
- * 人工分拣-空盘入库
+ * 人工分拣
  */
+// 呼叫木盘
+// 呼叫木盘刷新
+export const callingWoodenPalletTaskShow = () => request({
+	url:'api/pda/manualSorting/callingWoodenPalletTaskShow',
+	data: {}
+})
+// 呼叫木盘任务
+export const callingWoodenPalletTask = () => request({
+	url:'api/pda/manualSorting/callingWoodenPalletTask',
+	data: {}
+})
+
+
+// 呼叫满料
+// 呼叫满料刷新
+export const callingMaterialTaskShow = () => request({
+	url:'api/pda/manualSorting/callingMaterialTaskShow',
+	data: {}
+})
+// 呼叫满料确认
+export const callingMaterialTask = () => request({
+	url:'/api/pda/manualSorting/callingMaterialTask',
+	data: {}
+})
+
+// 空盘入库
 // 空盘入库刷新
 export const emptyDiskIntoStorageShow = () => request({
 	url:'api/pda/manualSorting/emptyDiskIntoStorageShow',
@@ -51,6 +77,6 @@ export const emptyDiskIntoStorageShow = () => request({
 })
 // 空盘入库确认
 export const emptyDiskIntoStorageTask = () => request({
-	url:'/api/pda/manualSorting/emptyDiskIntoStorageTask',
+	url:'api/pda/manualSorting/emptyDiskIntoStorageTask',
 	data: {}
 })