From 65461ced79919ed87cc32ec2e01a123243d0cf4e 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, 20 Nov 2024 16:33:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=8E=A5=E5=8F=A3=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E9=87=8D=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/workorder/index.js                        | 61 +++++++++++++++++++
 config.js                                     |  2 +-
 manifest.json                                 |  6 +-
 .../reportWorkOrder/reportWorkOrder.vue       | 23 ++-----
 .../scanWorkOrder/scanWorkOrder.vue           | 15 ++---
 .../produceManagement/workorder/workorder.vue | 24 ++++----
 6 files changed, 89 insertions(+), 42 deletions(-)
 create mode 100644 api/workorder/index.js

diff --git a/api/workorder/index.js b/api/workorder/index.js
new file mode 100644
index 0000000..756ab32
--- /dev/null
+++ b/api/workorder/index.js
@@ -0,0 +1,61 @@
+import request from '@/utils/request'
+// 获取全部工艺路线
+export function getAllRoute(params) {
+	return request({
+		url: '/mes/Mobile/ReportWork/get_all_route',
+		method: 'get',
+		params
+	})
+}
+
+// 获取全部工艺路线
+export function getAllGroup(params) {
+	return request({
+		url: '/mes/Mobile/ReportWork/get_groups',
+		method: 'get',
+		params
+	})
+}
+
+// 获取报工工单列表
+export function getWorkOrderList(params) {
+	return request({
+		url: '/mes/Mobile/ReportWork/get_workorder_status_list',
+		method: 'get',
+		params
+	})
+}
+
+// 开始工单
+export function doStartWorkOrder(params) {
+	return request({
+		url: '/mes/Mobile/ReportWork/start_workorder',
+		method: 'get',
+		params
+	})
+}
+
+// 结束工单
+export function doFinishWorkOrder(params) {
+	return request({
+		url: '/mes/Mobile/ReportWork/finish_workorder',
+		method: 'get',
+		params
+	})
+}
+// 工单详情
+export function getWorkOrderDetail(params) {
+	return request({
+		url: '/mes/Mobile/ReportWork/get_workorder_detail',
+		method: 'get',
+		params
+	})
+}
+// 无需防错就报工（修改报工表数据）
+export function updateReport(params) {
+	return request({
+		url: '/mes/Mobile/ReportWork/no_errorProofingAndReportingReport',
+		method: 'get',
+		params
+	})
+}
\ No newline at end of file
diff --git a/config.js b/config.js
index efa78af..a80fcf0 100644
--- a/config.js
+++ b/config.js
@@ -7,7 +7,7 @@ module.exports = {
     // 应用名称
     name: "DOAN-PDA",
     // 应用版本
-    version: "1.1.4",
+    version: "1.2.0",
     // 应用logo
     logo: "/static/logo.png",
     // 官方网站
diff --git a/manifest.json b/manifest.json
index ce9cc70..dc1e36b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,9 +1,9 @@
 {
     "name" : "DOAN总装车间PDA",
     "appid" : "__UNI__EFA389B",
-    "description" : "",
-    "versionName" : "1.1.4",
-    "versionCode" : 114,
+    "description" : "DOAN总装车间PDA",
+    "versionName" : "1.2.0",
+    "versionCode" : 120,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,
diff --git a/pages/produceManagement/reportWorkOrder/reportWorkOrder.vue b/pages/produceManagement/reportWorkOrder/reportWorkOrder.vue
index 235ef8b..16a6cf9 100644
--- a/pages/produceManagement/reportWorkOrder/reportWorkOrder.vue
+++ b/pages/produceManagement/reportWorkOrder/reportWorkOrder.vue
@@ -30,26 +30,11 @@
 </template>
 
 <script>
-	import { reportWorkOrderFinishNum,manualGenerationOfReportWork,updateProReportwork } from '@/api/workorder/proreportwork.js';
+	import { manualGenerationOfReportWork,updateReport } from '@/api/workorder/index.js';
 export default {
 	onLoad: function (option) {
 		this.$nextTick(()=>{
 			this.formData = JSON.parse(JSON.stringify(option));
-			if(this.formData.id === null || this.formData.id === ''){
-				this.loading = true
-				manualGenerationOfReportWork({workorder:this.formData.fkWorkorder}).then(res=>{
-					if(res.code === 200){
-						this.formData.id = res.data
-						this.loading = false
-					}else{
-						uni.showToast({
-							icon: 'error',
-							title: '数据异常',
-						});
-						this.loading = false
-					}
-				})
-			}
 		})
 	},
 	data() {
@@ -69,10 +54,10 @@ export default {
 				title:'报工中……'
 			})
 			const params = {
-				id:this.formData.id,
-				finishedNum:this.formData.finishedNum
+				workorder:this.formData.fkWorkorder,
+				reportNum:this.formData.finishedNum
 			}
-			updateProReportwork(params).then(res=>{
+			updateReport(params).then(res=>{
 				if(res.code === 200){
 					this.loading = false;
 					uni.showToast({
diff --git a/pages/produceManagement/scanWorkOrder/scanWorkOrder.vue b/pages/produceManagement/scanWorkOrder/scanWorkOrder.vue
index 6e1f32e..cd57ecf 100644
--- a/pages/produceManagement/scanWorkOrder/scanWorkOrder.vue
+++ b/pages/produceManagement/scanWorkOrder/scanWorkOrder.vue
@@ -98,6 +98,7 @@
 <script>
 import { errorProofingAndReportingWork,updateProReportwork,noErrorProofingAndReportingReport } from '@/api/workorder/proreportwork.js';
 import { GetWorkOrderDetail, startWorkOrder, finishWorkOrder } from '@/api/workorder/proworkorder.js';
+import { getWorkOrderDetail,doStartWorkOrder,updateReport,doFinishWorkOrder } from '@/api/workorder/index.js';
 export default {
 	onLoad: function (option) {
 		this.lineCode = option.lineCode;
@@ -137,7 +138,7 @@ export default {
 			const params = {
 				workorder: strArray[0]
 			};
-			let res1 = await GetWorkOrderDetail(params);
+			let res1 = await getWorkOrderDetail(params);
 			if (res1 === null || res1.code !== 200) {
 				uni.showToast({
 					icon: 'error',
@@ -174,7 +175,7 @@ export default {
 			const params = {
 				workorder: this.formData.workorder
 			};
-			startWorkOrder(params).then((res) => {
+			doStartWorkOrder(params).then((res) => {
 				if (res.code === 200) {
 					uni.showToast({
 						icon: 'success',
@@ -249,7 +250,7 @@ export default {
 				reportNum:this.finishedNum
 			}
 			
-			noErrorProofingAndReportingReport(params).then(res=>{
+			updateReport(params).then(res=>{
 				if(res.code === 200){
 					uni.showToast({
 						icon: 'success',
@@ -259,7 +260,7 @@ export default {
 							const params2 = {
 								workorder: that.formData.workorder
 							};
-							finishWorkOrder(params2).then((res) => {
+							doFinishWorkOrder(params2).then((res) => {
 								if (res.code === 200) {
 									uni.showToast({
 										icon: 'success',
@@ -285,7 +286,7 @@ export default {
 			const params = {
 				workorder: this.formData.workorder
 			};
-			finishWorkOrder(params).then((res) => {
+			doFinishWorkOrder(params).then((res) => {
 				if (res.code === 200) {
 					uni.showToast({
 						icon: 'success',
@@ -313,7 +314,7 @@ export default {
 				reportNum:this.finishedNum
 			}
 			
-			noErrorProofingAndReportingReport(params).then(res=>{
+			updateReport(params).then(res=>{
 				if(res.code === 200){
 					uni.showToast({
 						icon: 'success',
@@ -323,7 +324,7 @@ export default {
 							const params2 = {
 								workorder: that.formData.workorder
 							};
-							finishWorkOrder(params2).then((res) => {
+							doFinishWorkOrder(params2).then((res) => {
 								if (res.code === 200) {
 									uni.showToast({
 										icon: 'success',
diff --git a/pages/produceManagement/workorder/workorder.vue b/pages/produceManagement/workorder/workorder.vue
index 05d5e97..0373d13 100644
--- a/pages/produceManagement/workorder/workorder.vue
+++ b/pages/produceManagement/workorder/workorder.vue
@@ -44,9 +44,9 @@
 
 <script>
 // 基础数据
-import { GetAllRoute, GetAllGroup } from '@/api/workorder/proworkorder.js';
+import { getAllRoute, getAllGroup, getWorkOrderList } from '@/api/workorder/index.js';
 // 工单信息
-import { getReportWorkOrderList,getWorkOrderStatusList } from '@/api/workorder/proreportwork.js';
+// import { getReportWorkOrderList,getWorkOrderStatusList } from '@/api/workorder/proreportwork.js';
 import { tansParams } from '@/utils/common';
 export default {
 	data() {
@@ -58,7 +58,7 @@ export default {
 				status: 1,
 				dateTime: this.$dayjs().format('YYYY-MM-DD')
 			},
-			current:0,
+			current: 0,
 			selectItems: ['未开始', '进行中', '已完成'],
 			value: '',
 			// 线别
@@ -76,7 +76,7 @@ export default {
 	},
 	onShow: function () {
 		this.getSessionStorage();
-		this.current = this.query.status - 1
+		this.current = this.query.status - 1;
 		//this.getList();
 	},
 	methods: {
@@ -97,11 +97,11 @@ export default {
 		},
 		onClickSelect(e) {
 			this.query.status = e.currentIndex + 1;
-			this.getList()
+			this.getList();
 		},
 		async getSelectOptions() {
 			uni.showLoading();
-			const res1 = await GetAllRoute();
+			const res1 = await getAllRoute();
 			if (res1.code === 200) {
 				this.lineOptions = res1.data.map((item) => {
 					return {
@@ -112,7 +112,7 @@ export default {
 				});
 			}
 
-			const res2 = await GetAllGroup();
+			const res2 = await getAllGroup();
 			if (res2.code === 200) {
 				this.groupOptions = res2.data.map((item) => {
 					return {
@@ -147,15 +147,15 @@ export default {
 		getList() {
 			this.dataList = [];
 			const params = {
-				groupCode: this.query.groupCode,
+				group_code: this.query.groupCode,
 				status: this.query.status,
-				timeRange: [this.query.dateTime,this.query.dateTime]
+				handleDate: this.query.dateTime
 			};
-			getReportWorkOrderList(params).then((res) => {
+			getWorkOrderList(params).then((res) => {
 				let that = this;
 				if (res.code === 200) {
 					this.setSessionStorage(this.query);
-					this.dataList = res.data.result.map((item) => {
+					this.dataList = res.data.map((item) => {
 						let statusStr = that.getWorkOrderStatus(item.status);
 						return {
 							id: item.id,
@@ -233,4 +233,4 @@ export default {
 .bg-green {
 	background-color: rgb(209.4, 236.7, 195.9) !important;
 }
-</style>
+</style>
\ No newline at end of file