From be08f3e5a99b3ecec9d96d861e2a83ee287af3e6 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Tue, 30 Apr 2024 11:03:10 +0800
Subject: [PATCH 1/3] 231

---
 api/materialManagement/MaterialRequsition.js  |  11 ++
 .../MaterialRequisition.vue                   | 125 ++++++++++++++++++
 2 files changed, 136 insertions(+)

diff --git a/api/materialManagement/MaterialRequsition.js b/api/materialManagement/MaterialRequsition.js
index 3985378..11d473e 100644
--- a/api/materialManagement/MaterialRequsition.js
+++ b/api/materialManagement/MaterialRequsition.js
@@ -44,4 +44,15 @@ export function emergency_stop_agv(params) {
 		method: 'get',
 		params
 	})
+}
+
+
+
+
+export function FinisBatchingTask(params) {
+	return request({
+		url: '/mes/mm/materialinput/finishBatchingTask',
+		method: 'get',
+		params
+	})
 }
\ No newline at end of file
diff --git a/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue b/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue
index 3b3c016..d50ffca 100644
--- a/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue
+++ b/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue
@@ -27,6 +27,7 @@
 							<view class="cartoon-list-item">
 								<u-row>
 									<u-col span="2">{{ item.id }}</u-col>
+<<<<<<< HEAD
 									<u-col span="1"><u-tag :text="item.agvPosition" size="mini"
 											type="primary"></u-tag></u-col>
 									<u-col span="3" offset="1"><u-icon name="arrow-right-double" color="#2979ff"
@@ -34,6 +35,12 @@
 									<u-col span="2"><u-button type="success" text="开始" size="mini"
 											@click="confirm_startpoint(item.agvPosition)"></u-button></u-col>
 									<u-col span="2"><u-button type="error" text="结束" size="mini"></u-button></u-col>
+=======
+									<u-col span="1"><u-tag :text="item.agvPosition" size="mini" type="primary"></u-tag></u-col>
+									<u-col span="3" offset="1"><u-icon name="arrow-right-double" color="#2979ff" size="50" @click="detail_item(item.taskId)"></u-icon></u-col>
+									<u-col span="2"><u-button type="success" text="开始" size="mini" @click="confirm_startpoint(item.agvPosition)"></u-button></u-col>
+									<u-col span="2"><u-button type="error" text="结束" size="mini" @click="final_task(item.taskId)"></u-button></u-col>
+>>>>>>> 9c7f6d2 (配料任务)
 								</u-row>
 							</view>
 						</u-list-item>
@@ -119,6 +126,7 @@
 </template>
 
 <script>
+<<<<<<< HEAD
 	import {
 		getIngredientTask,
 		getIngredientTask_son,
@@ -149,6 +157,99 @@
 				end_point: '',
 				fab_go_points: [],
 				reqCode: ''
+=======
+import { getIngredientTask, getIngredientTask_son, getfabgopoints, go_workshop, emergency_stop_agv, FinisBatchingTask } from '@/api/materialManagement/MaterialRequsition.js';
+export default {
+	data() {
+		return {
+			list: ['车间叫料', '空车返程'],
+			current: 0,
+			queryParams: {
+				workerorder_time: Number(new Date()),
+				pageNum: 1,
+				pageSize: 10,
+				sort: undefined,
+				sortType: undefined,
+				totalNum: 0
+			},
+			timeshow: false,
+			taskList: [],
+			show_popup: false,
+			title: '',
+			taskList_son: [],
+			loading: false,
+			start_point: '',
+			end_point: '',
+			fab_go_points: [],
+			reqCode: ''
+		};
+	},
+	watch: {},
+	filters: {
+		formatDate: function (value) {
+			// 创建一个 Date 对象，并使用时间戳初始化
+			const date = new Date(value);
+
+			// 提取年、月、日信息
+			const year = date.getFullYear();
+			const month = date.getMonth() + 1; // 月份从 0 开始，所以要加 1
+			const day = date.getDate();
+
+			return `${year}-${month < 10 ? '0' + month : month}-${day < 10 ? '0' + day : day}`;
+		}
+	},
+	mounted() {
+		this.getInitList();
+	},
+	methods: {
+		// todo 分页查询
+		getInitList() {
+			// 使用时间戳创建一个日期对象
+			let date = new Date(this.queryParams.workerorder_time);
+
+			// 获取上海时区的时间偏移量（以分钟为单位）
+			let offset = 8 * 60; // 上海时区为 UTC+8
+
+			// 计算上海时区的时间
+			let shanghaiTime = new Date(date.getTime() + offset * 60 * 1000);
+
+			let queryTask = { ...this.queryParams };
+			queryTask.datetimespan = shanghaiTime;
+			delete queryTask.workerorder_time;
+			getIngredientTask(queryTask).then((res) => {
+				if (res.code == 200) {
+					res.data.forEach((item, index) => {
+						item.id = index;
+					});
+					this.taskList = res.data;
+				}
+			});
+		},
+		sectionChange(index) {
+			this.current = index;
+		},
+		// scrolltolower() {
+		// 	this.loadmore();
+		// },
+		// loadmore() {
+		// 	for (let i = 0; i < 30; i++) {
+		// 		this.indexList.push({
+		// 			url: this.urls[uni.$u.random(0, this.urls.length - 1)]
+		// 		});
+		// 	}
+		// },
+		//todo  选择时间
+		confirm() {
+			this.timeshow = false;
+			this.$nextTick(() => {
+				this.getInitList();
+			});
+		},
+		//todo 查看详细信息
+		detail_item(taskId) {
+			const query = {
+				taskId: taskId
+>>>>>>> 9c7f6d2 (配料任务)
 			};
 		},
 		watch: {},
@@ -280,6 +381,7 @@
 					});
 					return;
 				}
+<<<<<<< HEAD
 				const query = {
 					reqCode: this.reqCode
 				};
@@ -293,6 +395,29 @@
 					}
 				});
 			}
+=======
+			});
+		},
+		//todo  完成任务
+		final_task(taskId) {
+			if (this.start_point == '' || this.end_point == '' || taskId == '') {
+				return;
+			}
+			const query = {
+				start_point: this.start_point,
+				end_point: this.end_point,
+				taskId: taskId
+			};
+			FinisBatchingTask(query).then((res) => {
+				if (res.code == 200) {
+					this.$refs.uToast.show({
+						type: 'success',
+						message: '完成成功' + res.data
+					});
+					this.getInitList();
+				}
+			});
+>>>>>>> 9c7f6d2 (配料任务)
 		}
 	};
 </script>

From 34b44e5fc8c03a2f8477974a6d5887c809fd9686 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Tue, 30 Apr 2024 13:17:18 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: qianhao.xu <qianhao.xu@doan-tech.com>
---
 pages.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pages.json b/pages.json
index 1e8e22f..64846f2 100644
--- a/pages.json
+++ b/pages.json
@@ -216,15 +216,15 @@
 				"navigationBarTitleText" : "车间叫料",
 				"enablePullDownRefresh" : false
 			}
-		},
-		{
-			"path" : "pages/materialManagement/MaterialWarehousing/MaterialWarehousing",
-			"style" : 
-			{
-				"navigationBarTitleText" : "成品入库",
-				"enablePullDownRefresh" : false
-			}
 		}
+		// {
+		// 	"path" : "pages/materialManagement/MaterialWarehousing/MaterialWarehousing",
+		// 	"style" : 
+		// 	{
+		// 		"navigationBarTitleText" : "成品入库",
+		// 		"enablePullDownRefresh" : false
+		// 	}
+		// }
 	]
 
 }
\ No newline at end of file

From 00ba779499c9c459ce3d991684de1d7644ef7ffb Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Tue, 30 Apr 2024 13:21:44 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: qianhao.xu <qianhao.xu@doan-tech.com>
---
 .../MaterialRequisition.vue                   | 283 ++++++------------
 1 file changed, 93 insertions(+), 190 deletions(-)

diff --git a/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue b/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue
index d50ffca..0b2e260 100644
--- a/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue
+++ b/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue
@@ -126,38 +126,7 @@
 </template>
 
 <script>
-<<<<<<< HEAD
-	import {
-		getIngredientTask,
-		getIngredientTask_son,
-		getfabgopoints,
-		go_workshop,
-		emergency_stop_agv
-	} from '@/api/materialManagement/MaterialRequsition.js';
-	export default {
-		data() {
-			return {
-				list: ['车间叫料', '空车返程'],
-				current: 0,
-				queryParams: {
-					workerorder_time: Number(new Date()),
-					pageNum: 1,
-					pageSize: 10,
-					sort: undefined,
-					sortType: undefined,
-					totalNum: 0
-				},
-				timeshow: false,
-				taskList: [],
-				show_popup: false,
-				title: '',
-				taskList_son: [],
-				loading: false,
-				start_point: '',
-				end_point: '',
-				fab_go_points: [],
-				reqCode: ''
-=======
+
 import { getIngredientTask, getIngredientTask_son, getfabgopoints, go_workshop, emergency_stop_agv, FinisBatchingTask } from '@/api/materialManagement/MaterialRequsition.js';
 export default {
 	data() {
@@ -201,19 +170,22 @@ export default {
 	mounted() {
 		this.getInitList();
 	},
+	
 	methods: {
 		// todo 分页查询
 		getInitList() {
 			// 使用时间戳创建一个日期对象
 			let date = new Date(this.queryParams.workerorder_time);
-
+	
 			// 获取上海时区的时间偏移量（以分钟为单位）
 			let offset = 8 * 60; // 上海时区为 UTC+8
-
+	
 			// 计算上海时区的时间
 			let shanghaiTime = new Date(date.getTime() + offset * 60 * 1000);
-
-			let queryTask = { ...this.queryParams };
+	
+			let queryTask = {
+				...this.queryParams
+			};
 			queryTask.datetimespan = shanghaiTime;
 			delete queryTask.workerorder_time;
 			getIngredientTask(queryTask).then((res) => {
@@ -249,176 +221,107 @@ export default {
 		detail_item(taskId) {
 			const query = {
 				taskId: taskId
->>>>>>> 9c7f6d2 (配料任务)
 			};
-		},
-		watch: {},
-		filters: {
-			formatDate: function(value) {
-				// 创建一个 Date 对象，并使用时间戳初始化
-				const date = new Date(value);
-
-				// 提取年、月、日信息
-				const year = date.getFullYear();
-				const month = date.getMonth() + 1; // 月份从 0 开始，所以要加 1
-				const day = date.getDate();
-
-				return `${year}-${month < 10 ? '0' + month : month}-${day < 10 ? '0' + day : day}`;
-			}
-		},
-		mounted() {
-			this.getInitList();
-		},
-		methods: {
-			// todo 分页查询
-			getInitList() {
-				// 使用时间戳创建一个日期对象
-				let date = new Date(this.queryParams.workerorder_time);
-
-				// 获取上海时区的时间偏移量（以分钟为单位）
-				let offset = 8 * 60; // 上海时区为 UTC+8
-
-				// 计算上海时区的时间
-				let shanghaiTime = new Date(date.getTime() + offset * 60 * 1000);
-
-				let queryTask = {
-					...this.queryParams
-				};
-				queryTask.datetimespan = shanghaiTime;
-				delete queryTask.workerorder_time;
-				getIngredientTask(queryTask).then((res) => {
-					if (res.code == 200) {
-						res.data.forEach((item, index) => {
-							item.id = index;
-						});
-						this.taskList = res.data;
-					}
-				});
-			},
-			sectionChange(index) {
-				this.current = index;
-			},
-			// scrolltolower() {
-			// 	this.loadmore();
-			// },
-			// loadmore() {
-			// 	for (let i = 0; i < 30; i++) {
-			// 		this.indexList.push({
-			// 			url: this.urls[uni.$u.random(0, this.urls.length - 1)]
-			// 		});
-			// 	}
-			// },
-			//todo  选择时间
-			confirm() {
-				this.timeshow = false;
-				this.$nextTick(() => {
-					this.getInitList();
-				});
-			},
-			//todo 查看详细信息
-			detail_item(taskId) {
-				const query = {
-					taskId: taskId
-				};
-				this.loading = true;
-				getIngredientTask_son(query).then((res) => {
-					if (res.code == 200) {
-						this.loading = false;
-						this.taskList_son = res.data;
-						this.show_popup = true;
-						this.title = '任务号：' + taskId;
-					}
-				});
-			},
-			//todo 确认起点
-			confirm_startpoint(point) {
-				this.start_point = point;
-			},
-			//todo获取车间点
-			get_fab_go_points() {
-				getfabgopoints().then((res) => {
-					if (res.code == 200) {
-						let array = [];
-						res.data.forEach((item) => {
-							array.push({
-								value: item,
-								text: item
-							});
-						});
-						this.fab_go_points = array;
-					}
-				});
-			},
-			//todo 开始agv
-			start_agv() {
-				if (this.start_point == '' || this.end_point == '') {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: '起点或者终点不能为空'
-					});
-					return;
+			this.loading = true;
+			getIngredientTask_son(query).then((res) => {
+				if (res.code == 200) {
+					this.loading = false;
+					this.taskList_son = res.data;
+					this.show_popup = true;
+					this.title = '任务号：' + taskId;
 				}
-				const query = {
-					start_point: this.start_point,
-					end_point: this.end_point
-				};
-				go_workshop(query).then((res) => {
-					if (res.code == 200) {
-						this.reqCode = res.data.data;
-						this.$refs.uToast.show({
-							type: 'error',
-							message: 'agv起动成功' + res.data
-						});
-					}
-				});
-			},
-			//todo  紧急终止agv
-			stop_agv() {
-				if (this.reqCode == '') {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: '无任务编号'
-					});
-					return;
-				}
-<<<<<<< HEAD
-				const query = {
-					reqCode: this.reqCode
-				};
-
-				emergency_stop_agv().then((res) => {
-					if (res.code == 200) {
-						this.$refs.uToast.show({
-							type: 'success',
-							message: '成功取消' + res.data
-						});
-					}
-				});
-			}
-=======
 			});
 		},
-		//todo  完成任务
-		final_task(taskId) {
-			if (this.start_point == '' || this.end_point == '' || taskId == '') {
+		//todo 确认起点
+		confirm_startpoint(point) {
+			this.start_point = point;
+		},
+		//todo获取车间点
+		get_fab_go_points() {
+			getfabgopoints().then((res) => {
+				if (res.code == 200) {
+					let array = [];
+					res.data.forEach((item) => {
+						array.push({
+							value: item,
+							text: item
+						});
+					});
+					this.fab_go_points = array;
+				}
+			});
+		},
+		//todo 开始agv
+		start_agv() {
+			if (this.start_point == '' || this.end_point == '') {
+				this.$refs.uToast.show({
+					type: 'error',
+					message: '起点或者终点不能为空'
+				});
 				return;
 			}
 			const query = {
 				start_point: this.start_point,
-				end_point: this.end_point,
-				taskId: taskId
+				end_point: this.end_point
 			};
-			FinisBatchingTask(query).then((res) => {
+			go_workshop(query).then((res) => {
+				if (res.code == 200) {
+					this.reqCode = res.data.data;
+					this.$refs.uToast.show({
+						type: 'error',
+						message: 'agv起动成功' + res.data
+					});
+				}
+			});
+		},
+		//todo  紧急终止agv
+		stop_agv() {
+			if (this.reqCode == '') {
+				this.$refs.uToast.show({
+					type: 'error',
+					message: '无任务编号'
+				});
+				return;
+			}
+	
+			const query = {
+				reqCode: this.reqCode
+			};
+	
+			emergency_stop_agv().then((res) => {
 				if (res.code == 200) {
 					this.$refs.uToast.show({
 						type: 'success',
-						message: '完成成功' + res.data
+						message: '成功取消' + res.data
 					});
-					this.getInitList();
 				}
 			});
->>>>>>> 9c7f6d2 (配料任务)
 		}
+
+	},
+	//todo  完成任务
+	final_task(taskId) {
+		if (this.start_point == '' || this.end_point == '' || taskId == '') {
+			return;
+		}
+		const query = {
+			start_point: this.start_point,
+			end_point: this.end_point,
+			taskId: taskId
+		};
+		FinisBatchingTask(query).then((res) => {
+			if (res.code == 200) {
+				this.$refs.uToast.show({
+					type: 'success',
+					message: '完成成功' + res.data
+				});
+				this.getInitList();
+			}
+		});
+	
+	}
+		
+		
 	};
 </script>