From 580ff867baa1c9b956fc078edc2d44f625840de7 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 6 Apr 2023 11:28:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                       |   6 --
 pages/management/hcxInfo.vue     | 147 -------------------------------
 pages/management/inscanerror.vue |  52 ++++++-----
 utils/getData2.js                |  14 +--
 4 files changed, 38 insertions(+), 181 deletions(-)
 delete mode 100644 pages/management/hcxInfo.vue

diff --git a/pages.json b/pages.json
index 3c200a8..3c67676 100644
--- a/pages.json
+++ b/pages.json
@@ -56,12 +56,6 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{
-			"path": "pages/management/hcxInfo",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
 		{
 			"path": "pages/management/agvinerror",
 			"style": {
diff --git a/pages/management/hcxInfo.vue b/pages/management/hcxInfo.vue
deleted file mode 100644
index 675c9ec..0000000
--- a/pages/management/hcxInfo.vue
+++ /dev/null
@@ -1,147 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar :inner2="true" @goIn="goIn" title="缓存线-详情"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="search-wrap">
-				<view class="search-item">
-					<label class="search-label">料箱码</label>
-					<view class="filter_input_wraper">
-						<search-box
-						v-model="val1"
-						/>
-					</view>
-				</view>
-				<view class="search-item">
-					<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">
-						<input type="text" class="search-input-l" v-model="val2">
-					</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="val3">
-					</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="val4">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">数量</label>
-					<view class="filter_input_wraper">
-						<input type="number" class="search-input-l" v-model="val5">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">重量</label>
-					<view class="filter_input_wraper">
-						<input type="number" class="search-input-l" v-model="val6">
-					</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 class="search-item">
-					<label class="search-label">位置</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index3" :localdata="options3" @change="selectChange3"></uni-data-select>
-					</view>
-				</view>
-			</view>
-			<view class="confirm-button-wrap">
-				<button class="confirm-button" @tap="toSearch()">设为满框</button>
-				<button class="confirm-button" :disabled="disabled" @tap="toSure()">设为空框</button>
-				<button class="confirm-button" :disabled="disabled" @tap="toSure()">设为空位</button>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {queryInstraction, instOperation} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				options1: [],
-				index1: '',
-				options2: [],
-				index2: '',
-				options3: [],
-				index3: '',
-				val1: '',
-				val2: '',
-				val3: '',
-				val4: '',
-				val5: '',
-				val6: '',
-				dataList: [],
-				pkId: '',
-				disabled: false
-			};
-		},
-		methods: {
-			/** 选择器1 */
-			selectChange1(e) {
-				this.index1 = e
-			},
-			/** 选择器3 */
-			selectChange2(e) {
-				this.index2 = e
-			},
-			/** 选择器3 */
-			selectChange3(e) {
-				this.index3 = e
-			},
-			goIn () {
-				uni.navigateTo({
-					url: `/pages/management/hcxcheck`
-				})
-			},
-			toSearch () {
-			  this.dataList = []
-			  this._queryInstraction()
-			},
-			async _queryInstraction () {
-				let res = await queryInstraction()
-				this.dataList = [...res.data]
-			},
-			toSure () {
-			  this.disabled = true
-			  if (!this.pkId) {
-				uni.showToast({
-					title: '请选择',
-					icon: 'none'
-				})
-				this.disabled = false
-				return
-			  }
-			  this._instOperation()
-			},
-			async _instOperation () {
-				let res = await instOperation()
-				this.dataList = [...res.data]
-			},
-			toRadio (e) {
-			  this.pkId = this.pkId === e.instruct_uuid ? '' : e.instruct_uuid
-			}
-		}
-	}
-</script>
diff --git a/pages/management/inscanerror.vue b/pages/management/inscanerror.vue
index 0339197..553cbe2 100644
--- a/pages/management/inscanerror.vue
+++ b/pages/management/inscanerror.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<nav-bar title="入箱扫码异常"></nav-bar>
+		<nav-bar title="扫码异常"></nav-bar>
 		<view class="search-confirm-wrap">
 			<view class="search-wrap">
 				<view class="search-item">
@@ -16,7 +16,7 @@
 					</view>
 				</view>
 				<view class="search-item">
-					<label class="search-label">料箱码</label>
+					<label class="search-label">满箱码</label>
 					<view class="filter_input_wraper">
 						<search-box
 						v-model="val1"
@@ -25,7 +25,7 @@
 				</view>
 				<view class="search-item search-item-btns">
 					<button class="confirm-button" @tap="toSearch">查询</button>
-					<button class="confirm-button" :class="{'confirm-button_disabled': !pkId}" :disabled="disabled" @tap="toSure">确认</button>
+					<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1}" :disabled="disabled" @tap="toSure">确认</button>
 				</view>
 			</view>
 			<!-- <view class="confirm-button-wrap">
@@ -38,23 +38,19 @@
 				<thead>
 					<tr>
 						<th>选择</th>
-						<th>指令编号</th>
-						<th>设备编号</th>
-						<th>起点</th>
-						<th>目的</th>
-						<th>目的2</th>
+						<th>缓存线编码</th>
+						<th>缓存线位置编码</th>
+						<th>料箱码</th>
 					</tr>
 				</thead>
 				<tbody>
-					<tr v-for="e in dataList" :key="e.instruct_uuid"  @click="toRadio(e)">
+					<tr v-for="e in dataList" :key="e.position_code"  @click="toRadio(e)">
 						<td>
-							<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.instruct_uuid}"></view>
+							<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.position_code}"></view>
 						</td>
-						<td>{{e.instructorder_no}}</td>
-						<td>{{e.wcsdevice_code}}</td>
-						<td>{{e.startpoint_code}}</td>
-						<td>{{e.nextpoint_code}}</td>
-						<td>{{e.nextpoint_code2}}</td>
+						<td>{{e.cacheLine_code}}</td>
+						<td>{{e.position_code}}</td>
+						<td>{{vehicle_code}}</td>
 					</tr>
 				</tbody>
 			</table>
@@ -80,7 +76,6 @@
 				val1: '',
 				dataList: [],
 				pkId: '',
-				pkObj: {},
 				disabled: false
 			};
 		},
@@ -103,7 +98,6 @@
 			toSearch () {
 			  this.dataList = []
 			  this.pkId = ''
-			  this.pkObj = {}
 			  this._inOutExceptionInstQuery()
 			},
 			async _getCacheLine (id) {
@@ -111,7 +105,7 @@
 				this.options2 = [...res]
 			},
 			async _inOutExceptionInstQuery () {
-				let res = await inOutExceptionInstQuery('1',this.index2,this.val1)
+				let res = await inOutExceptionInstQuery(this.index2)
 				this.dataList = [...res]
 			},
 			async toSure () {
@@ -124,9 +118,24 @@
 				this.disabled = false
 				return
 			  }
+			  if (!this.index2) {
+				uni.showToast({
+					title: '请选择缓存线',
+					icon: 'none'
+				})
+				this.disabled = false
+				return  
+			  }
+			  if (!this.val1) {
+				uni.showToast({
+					title: '请扫满箱码',
+					icon: 'none'
+				})
+				this.disabled = false
+				return  
+			  }
 			  try {
-				this.$set(this.pkObj, 'inOut_type', '1')
-				let res = await inOutExceptionInstConfirm(this.pkObj) 
+				let res = await inOutExceptionInstConfirm(this.index2, this.val1, this.pkId) 
 				this.disabled = false
 				this.toSearch()
 				uni.showToast({
@@ -138,8 +147,7 @@
 			  }
 			},
 			toRadio (e) {
-			  this.pkId = this.pkId === e.instruct_uuid ? '' : e.instruct_uuid
-			  this.pkObj = this.pkId === e.instruct_uuid ? e : {}
+			  this.pkId = this.pkId === e.position_code ? '' : e.position_code
 			}
 		}
 	}
diff --git a/utils/getData2.js b/utils/getData2.js
index 21b0447..f4ea97d 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -30,18 +30,20 @@ export const getCacheLine = (area) => request({
 	}
 })
 // 1.2指令查询
-export const inOutExceptionInstQuery = (type, wcode, vcode) => request({
+export const inOutExceptionInstQuery = (wcode) => request({
 	url:'api/cacheLineHand/inOutExceptionInstQuery',
 	data: {
-		inOut_type: type,
-		wcsdevice_code: wcode,
-		vehicle_code: vcode
+		wcsdevice_code: wcode
 	}
 })
 // 1.3确认
-export const inOutExceptionInstConfirm = (obj) => request({
+export const inOutExceptionInstConfirm = (wcode, vcode, pcode) => request({
 	url:'api/cacheLineHand/inOutExceptionInstConfirm',
-	data: obj
+	data: {
+		wcsdevice_code: wcode,
+		vehicle_code: vcode,
+		position_code: pcode
+	}
 })
 
 /** 缓存线盘点 */