From 4529bd647613aa8534839a728f207e66aeabc420 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Thu, 30 Mar 2023 16:14:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/management/HcxErrorHandle.vue | 65 +++++++++++++++++---------
 pages/management/HcxOutError.vue    | 71 +++++++++++++++++++++++------
 pages/management/ZlOperate.vue      | 22 ++++-----
 utils/getData1.js                   | 42 ++++++-----------
 4 files changed, 126 insertions(+), 74 deletions(-)

diff --git a/pages/management/HcxErrorHandle.vue b/pages/management/HcxErrorHandle.vue
index 7a48608..e1fcdcd 100644
--- a/pages/management/HcxErrorHandle.vue
+++ b/pages/management/HcxErrorHandle.vue
@@ -4,15 +4,21 @@
 		<view class="search-confirm-wrap">
 			<view class="search-wrap">
 				<view class="search-item">
-					<label class="search-label">缓存线</label>
+					<label class="search-label">生产区域</label>
 					<view class="filter_input_wraper">
 						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
 					</view>
 				</view>
+				<view class="search-item">
+					<label class="search-label">缓存线</label>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+					</view>
+				</view>
 			</view>
 			<view class="confirm-button-wrap">
-				<button class="confirm-button" :disabled="disabled" @tap="toSure()">暂停</button>
-				<button class="confirm-button" :disabled="disabled" @tap="toSure()">启动</button>
+				<button class="confirm-button" :disabled="disabled" @tap="toSure('1')">暂停</button>
+				<button class="confirm-button" :disabled="disabled" @tap="toSure('2')">启动</button>
 			</view>
 		</view>
 	</view>
@@ -21,7 +27,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {cacheLineExcepOpt} from '@/utils/getData1.js'
+	import {getCacheLine, cacheLineExcepOpt} from '@/utils/getData1.js'
 	export default {
 		components: {
 			NavBar,
@@ -29,35 +35,52 @@
 		},
 		data() {
 			return {
-				options1: [],
-				index1: '',
+				options1: [{text: 'A1', value: 'A1'}, {text: 'A2', value: 'A2'}],
+				index1: 'A1',
+				options2: [],
+				index2: '',
 				disabled: false
 			};
 		},
+		created() {
+			this._getCacheLine('A1')
+		},
 		methods: {
 			/** 选择器1 */
 			selectChange1(e) {
 				this.index1 = e
+				if (this.index1) {
+					this._getCacheLine(e)
+				}
+				this.index2 = ''
+			},
+			/** 选择器2 */
+			selectChange2(e) {
+				this.index2 = e
+			},
+			async _getCacheLine (id) {
+				let res = await getCacheLine(id)
+				this.options2 = [...res]
 			},
 			async toSure (type) {
 			  this.disabled = true
-			  if (!this.index1) {
-				uni.showToast({
-					title: '请选择',
-					icon: 'none'
-				})
-				this.disabled = false
-				return
-			  }
+			  if (!this.index2) {
+					uni.showToast({
+						title: '请选择',
+						icon: 'none'
+					})
+					this.disabled = false
+					return
+				}
 			  try {
-				let res = await _cacheLineExcepOpt()
-				this.disabled = false
-				uni.showToast({
-					title: res.message,
-					icon: 'none'
-				})
+					let res = await cacheLineExcepOpt(this.index2, type)
+					this.disabled = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
 			  } catch (e) {
-				this.disabled = false
+					this.disabled = false
 			  }
 			}
 		}
diff --git a/pages/management/HcxOutError.vue b/pages/management/HcxOutError.vue
index 32f3799..3fb7ca0 100644
--- a/pages/management/HcxOutError.vue
+++ b/pages/management/HcxOutError.vue
@@ -4,17 +4,31 @@
 		<view class="search-confirm-wrap">
 			<view class="search-wrap">
 				<view class="search-item">
-					<label class="search-label">缓存线</label>
+					<label class="search-label">生产区域</label>
 					<view class="filter_input_wraper">
 						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
 					</view>
 				</view>
 				<view class="search-item">
-					<label class="search-label">车号</label>
+					<label class="search-label">缓存线</label>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">缓存线位置</label>
 					<view class="filter_input_wraper">
 						<input type="text" class="search-input-l" v-model="val1">
 					</view>
 				</view>
+				<view class="search-item">
+					<label class="search-label">料箱码</label>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
 			</view>
 			<view class="confirm-button-wrap">
 				<button class="confirm-button" @tap="toSearch()">查询</button>
@@ -28,6 +42,7 @@
 						<th>选择</th>
 						<th>指令编号</th>
 						<th>设备编号</th>
+						<th>条码</th>
 						<th>起点</th>
 						<th>目的</th>
 						<th>目的2</th>
@@ -40,6 +55,7 @@
 						</td>
 						<td>{{e.instructorder_no}}</td>
 						<td>{{e.wcsdevice_code}}</td>
+						<td>{{e.vehicle_code}}</td>
 						<td>{{e.startpoint_code}}</td>
 						<td>{{e.nextpoint_code}}</td>
 						<td>{{e.nextpoint_code2}}</td>
@@ -53,7 +69,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryInstraction, instOperation} from '@/utils/getData2.js'
+	import {getCacheLine, cacheLineOutBoxExceptionQuery, cacheLineOutBoxExceptionConfirm} from '@/utils/getData1.js'
 	export default {
 		components: {
 			NavBar,
@@ -61,28 +77,47 @@
 		},
 		data() {
 			return {
-				options1: [],
-				index1: '',
+				options1: [{text: 'A1', value: 'A1'}, {text: 'A2', value: 'A2'}],
+				index1: 'A1',
+				options2: [],
+				index2: '',
 				val1: '',
+				val2: '',
 				dataList: [],
 				pkId: '',
 				disabled: false
 			};
 		},
+		created() {
+			this._getCacheLine('A1')
+		},
 		methods: {
 			/** 选择器1 */
 			selectChange1(e) {
 				this.index1 = e
+				if (this.index1) {
+					this._getCacheLine(e)
+				}
+				this.index2 = ''
+			},
+			/** 选择器2 */
+			selectChange2(e) {
+				this.index2 = e
 			},
 			toSearch () {
 			  this.dataList = []
-			  this._queryInstraction()
+			  this.pkId = ''
+			  this._cacheLineOutBoxExceptionQuery()
 			},
-			async _queryInstraction () {
-				let res = await queryInstraction()
-				this.dataList = [...res.data]
+			async _getCacheLine (id) {
+				let res = await getCacheLine(id)
+				this.options2 = [...res]
 			},
-			toSure () {
+			async _cacheLineOutBoxExceptionQuery () {
+				let res = await cacheLineOutBoxExceptionQuery(this.index2, this.val1)
+				this.dataList = [...res]
+			},
+			async toSure () {
 			  this.disabled = true
 			  if (!this.pkId) {
 				uni.showToast({
@@ -92,11 +127,17 @@
 				this.disabled = false
 				return
 			  }
-			  this._instOperation()
-			},
-			async _instOperation () {
-				let res = await instOperation()
-				this.dataList = [...res.data]
+			  try {
+				let res = await cacheLineOutBoxExceptionConfirm(this.index2,this.pkId, '2', this.val2, this.index1, this.val1) 
+				this.disabled = false
+				this.toSearch()
+				uni.showToast({
+					title: res.message,
+					icon: 'none'
+				})
+			  } catch (e) {
+				this.disabled = false
+			  }
 			},
 			toRadio (e) {
 			  this.pkId = this.pkId === e.instruct_uuid ? '' : e.instruct_uuid
diff --git a/pages/management/ZlOperate.vue b/pages/management/ZlOperate.vue
index 393980a..a67505e 100644
--- a/pages/management/ZlOperate.vue
+++ b/pages/management/ZlOperate.vue
@@ -57,9 +57,9 @@
 			</view>
 			<view class="confirm-button-wrap">
 				<button class="confirm-button" @tap="toSearch()">查询</button>
-				<button class="confirm-button" :disabled="disabled" @tap="toSure('1')">取消</button>
-				<button class="confirm-button" :disabled="disabled" @tap="toSure('2')">完成</button>
-				<button class="confirm-button" :disabled="disabled" @tap="toSure('3')">重发</button>
+				<button class="confirm-button" :disabled="disabled" @tap="toSure('8')">取消</button>
+				<button class="confirm-button" :disabled="disabled" @tap="toSure('7')">完成</button>
+				<button class="confirm-button" :disabled="disabled" @tap="toSure('5')">重发</button>
 				<button class="confirm-button" :disabled="disabled" @tap="toSure('4')">WCS取消</button>
 			</view>
 		</view>
@@ -86,8 +86,8 @@
 						</td>
 						<td>{{e.instructoperate_num}}</td>
 						<td>{{e.mes_no}}</td>
-						<td>{{e.startwcsdevice_code}}</td>
-						<td>{{e.nextwcsdevice_code}}</td>
+						<td>{{e.startpoint_code}}</td>
+						<td>{{e.nextpoint_code}}</td>
 						<td>{{e.invehicle_code}}</td>
 						<td>{{e.outvehicle_code}}</td>
 						<td>{{e.status_name}}</td>
@@ -182,7 +182,7 @@
 			},
 			async _instStatusQuery (id) {
 				let res = await instStatusQuery(id)
-				this.options1 = [...res.result]
+				this.options1 = [...res]
 			},
 			toSearch () {
 				this.dataList = []
@@ -204,9 +204,9 @@
 					end_date: this.endDate || ''
 				}
 				let res = await instPageQuery(form)
-				this.totalCount = res.size
-				if (res.size > 0) {
-					const dataMap = res.data
+				this.totalCount = res.totalElements
+				if (res.totalElements > 0) {
+					const dataMap = res.content
 					this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
 					this.reload = false
 				} else {
@@ -243,7 +243,7 @@
 			},
 			async _instOperation (type) {
 				let res = await instOperation(type)
-				this.dataList = [...res.data]
+				this.dataList = [...res]
 			},
 			toRadio (e) {
 			  this.pkId = this.pkId === e.instruct_uuid ? '' : e.instruct_uuid
@@ -255,5 +255,5 @@
 <style lang="stylus" scoped>
 @import '../../common/style/mixin.styl';
 .grid-wrap
-	height calc(100% - 526rpx)
+	height: calc(100% - 337px); /** 42+ 15*8+ 35*5 */
 </style>
\ No newline at end of file
diff --git a/utils/getData1.js b/utils/getData1.js
index 6e8ea6d..0e69580 100644
--- a/utils/getData1.js
+++ b/utils/getData1.js
@@ -12,9 +12,7 @@ export const getCacheLine = (area) => request({
 export const instStatusQuery = (searchbar) => request({
 	url:'/api/cacheLineHand/instStatusQuery',
 	data: {
-		form: {
-			search_bar: searchbar
-		}
+        search_bar: searchbar
 	}
 })
 
@@ -23,10 +21,8 @@ export const instStatusQuery = (searchbar) => request({
 export const cacheLineExcepOpt = (wcode, opttype) => request({
 	url:'/api/cacheLineHand/cacheLineExcepOpt',
 	data: {
-		form: {
-			wcsdevice_code: wcode,
-			opt_type: opttype
-		}
+        wcsdevice_code: wcode,
+		opt_type: opttype
 	}
 })
 
@@ -35,43 +31,35 @@ export const cacheLineExcepOpt = (wcode, opttype) => request({
 export const cacheLineOutBoxExceptionQuery = (wcode, pcode) => request({
 	url:'/api/cacheLineHand/cacheLineOutBoxExceptionQuery',
 	data: {
-		form: {
-			wcsdevice_code: wcode,
-			position_code: pcode
-		}
+        wcsdevice_code: wcode,
+		position_code: pcode
 	}
 })
 // 1.2缓存线出箱异常-确认：
 export const cacheLineOutBoxExceptionConfirm = (wcode, uuid, itype, vcode, parea, pcode) => request({
 	url:'/api/cacheLineHand/cacheLineOutBoxExceptionConfirm',
 	data: {
-		form: {
-			wcsdevice_code: wcode,
-			instruct_uuid: uuid,
-			inOut_type: itype,
-            vehicle_code: vcode,
-            product_area: parea,
-			position_code: pcode
-		}
+        wcsdevice_code: wcode,
+        instruct_uuid: uuid,
+        inOut_type: itype,
+        vehicle_code: vcode,
+        product_area: parea,
+        position_code: pcode
 	}
 })
 
 /** 指令操作 */
 // 1.1指令分页查询：
-export const instPageQuery = (form) => request({
+export const instPageQuery = (data) => request({
 	url:'/api/cacheLineHand/instPageQuery',
-	data: {
-		form: form
-	}
+	data: data
 })
 
 // 1.2指令操作：
 export const instOperation = (uuid, otype) => request({
 	url:'/api/cacheLineHand/instOperation',
 	data: {
-		form: {
-			instruct_uuid: uuid,
-			opt_type: otype
-		}
+        instruct_uuid: uuid,
+		opt_type: otype
 	}
 })