From d3d89424a0a4105b7fba02e1aee52a6609de45f5 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 22 May 2023 11:28:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=93=E5=AD=98=E7=BA=BF=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.css       | 42 +++++++++++++++-----
 pages/management/hcxcheck.vue | 73 ++++++++++++++++++++++++-----------
 utils/getData2.js             | 18 +++++++++
 3 files changed, 100 insertions(+), 33 deletions(-)

diff --git a/common/style/layout.css b/common/style/layout.css
index 645a669..47573bb 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -254,31 +254,53 @@ uni-button{
 	overflow-y: auto;
 }
 .material-item {
-	width: 8.2%;
-	margin-right: 2%;
+	position: relative;
+	z-index: 1;
+	width: 9.1%;
+	margin-right: 1%;
 	margin-bottom: 15px;
-	padding: 5px;
-	border-radius: 12px;
+	padding: 15px 5px 5px 5px;
+	border-radius: 6px;
 }
 .material-item:nth-child(10n) {
 	margin-right: 0;
 }
 .material-title {
-	font-size: 16px;
-	line-height: 35px;
-	height: 35px;
+	font-size: 15px;
+	line-height: 24px;
+	height: 24px;
 	text-align: center;
 	color: #fff;
+	word-break: break-all;
 	overflow: hidden;
 }
 .material-spec {
-	font-size: 16px;
-	line-height: 26px;
-	height: 52px;
+	font-size: 15px;
+	line-height: 18px;
+	height: 36px;
 	text-align: center;
 	color: #fff;
+	word-break: break-all;
+	margin-top: 5px;
 	overflow: hidden;
 }
+.badge__content {
+	position: absolute;
+	top: -5px;
+	left: 0;
+	z-index: 2;
+	background-color: #6798ef;
+	color: #fff;
+	display: inline-block;
+	font-size: 12px;
+	height: 18px;
+	line-height: 18px;
+	padding: 0 6px;
+	text-align: center;
+	white-space: nowrap;
+	border-top-right-radius: 10px;
+	border-bottom-right-radius: 10px;
+}
 .icon_unchecked {
 	color: #fff;
 	width: 24px;
diff --git a/pages/management/hcxcheck.vue b/pages/management/hcxcheck.vue
index 4875597..b0452da 100644
--- a/pages/management/hcxcheck.vue
+++ b/pages/management/hcxcheck.vue
@@ -16,7 +16,9 @@
 					</view>
 				</view>
 				<view class="search-item flexend">
-					<button class="confirm-button" @tap="toSearch()">刷&nbsp;&nbsp;新</button>
+					<button class="confirm-button" :disabled="disabled4" @tap="_cacheLineHandCheck">盘点开始</button>
+					<button class="confirm-button" :disabled="disabled5" @tap="_cacheLineHandCheckEnd">盘点结束</button>
+					<button class="confirm-button" @tap="toSearch()">刷新</button>
 				</view>
 			</view>
 		</view>
@@ -43,6 +45,7 @@
 				<view v-if="Number(e.vehicle_status) !== 5" class="material-item" v-for="(e, i) in dataList" :key="i" :class="['bg-gray', 'bg-green', 'bg-yellow','bg-red'][Number(e.vehicle_status) - 1]" @tap="toInfo(e)">
 					<view class="material-title">{{e.vehicle_code}}</view>
 					<view class="material-spec">{{e.material_spec}}</view>
+					<view v-show="e.layer_num === 1 && (e.seat_order_num === 1 || e.seat_order_num === 2)" class="badge__content">{{['准备位', '对接位'][Number(e.seat_order_num) - 1]}}</view>
 				</view>
 			</view>
 		</view>
@@ -57,12 +60,12 @@
 							/>
 						</view>
 					</view>
-					<view class="search-item">
+					<!-- <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="search-item">
 						<label class="search-label">物料</label>
 						<view class="filter_input_wraper" @tap="searchMater">
@@ -107,7 +110,7 @@
 					</view>
 				</view>
 				<view class="confirm-button-wrap">
-					<button class="confirm-button" :class="{'confirm-button_disabled': !val1 || !index3 || !val6 || !val7}" :disabled="disabled1" @tap="_setfullBox">设为满框</button>
+					<button class="confirm-button" :class="{'confirm-button_disabled': !val1 || !val6 || !val7}" :disabled="disabled1" @tap="_setfullBox">设为满框</button>
 					<button class="confirm-button" :class="{'confirm-button_disabled': !val1}" :disabled="disabled2" @tap="_setEmptyBox">设为空框</button>
 					<button class="confirm-button" :class="{'confirm-button_disabled': !val1}" :disabled="disabled3" @tap="_deleteBox">删除</button>
 				</view>
@@ -120,7 +123,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getCacheLine, workprocedureQuery, getCacheLineMaterialInfo, setfullBox, setEmptyBox, deleteBox} from '@/utils/getData2.js'
+	import {getCacheLine, workprocedureQuery, getCacheLineMaterialInfo, setfullBox, setEmptyBox, deleteBox, cacheLineHandCheck, cacheLineHandCheckEnd} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -146,19 +149,15 @@
 				obj: {},
 				disabled1: false,
 				disabled2: false,
-				disabled3: false
+				disabled3: false,
+				disabled4: false,
+				disabled5: false
 				
 			};
 		},
 		created () {
-			// for(let i = 1; i < 16; i++) {
-			// 	this.dataList.push({vehicle_code: i + '', material_spec: 'a', vehicle_status: '4'})
-			// 	if (i === 5) {
-			// 		this.dataList.push({vehicle_code: i + '', material_spec: 'a', vehicle_status: '5'})
-			// 	}
-			// }
 			this._getCacheLine('A1')
-			this._workprocedureQuery()
+			// this._workprocedureQuery()
 		},
 		destroyed () {
 			this.$store.dispatch('setPublicObj', '')
@@ -223,11 +222,11 @@
 				this.active = true
 				this.obj = e
 				this.val1 = this.obj.vehicle_code
-				this.options3.map(el => {
-					if (Number(el.workprocedure_code) === Number(e.workprocedure_code)) {
-						this.index3 = el.value
-					}
-				})
+				// this.options3.map(el => {
+				// 	if (Number(el.workprocedure_code) === Number(e.workprocedure_code)) {
+				// 		this.index3 = el.value
+				// 	}
+				// })
 				this.val2 = this.obj.material_code
 				this.val3 = this.obj.material_name
 				this.val4 = this.obj.material_spec
@@ -246,7 +245,7 @@
 			},
 			async _setfullBox () {
 			  this.disabled1 = true
-			  if (!this.val1 || !this.index3 || !this.val6 || !this.val7) {
+			  if (!this.val1 || !this.val6 || !this.val7) {
 				this.disabled1 = false
 				return
 			  }
@@ -301,6 +300,7 @@
 			  try {
 				let obj = {}
 				this.$set(obj, 'vehicle_code', this.val1)
+				this.$set(obj, 'position_code', this.obj.position_code)
 				let res = await deleteBox(obj) 
 				this.disabled3 = false
 				this.toSearch()
@@ -311,6 +311,32 @@
 			  } catch (e) {
 				this.disabled3 = false
 			  }
+			},
+			async _cacheLineHandCheck () {
+				this.disabled4 = true
+				try {
+					let res = await cacheLineHandCheck('0') 
+					this.disabled4 = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled4 = false
+				}
+			},
+			async _cacheLineHandCheckEnd () {
+				this.disabled5 = true
+				try {
+					let res = await cacheLineHandCheckEnd('1') 
+					this.disabled5 = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled5 = false
+				}
 			}
 		}
 	}
@@ -341,8 +367,9 @@
 .delHeight
 	transition height .2s linear
 	height 0
-// .search-item
-// 	width 42%
-// 	&:nth-child(1)
-// 		margin-right 10px
+.search-item
+	&:nth-child(1),&:nth-child(2)
+		width 30%
+	&:nth-child(3)
+		width 36%
 </style>
diff --git a/utils/getData2.js b/utils/getData2.js
index 7a10455..139c1af 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -91,6 +91,10 @@ export const getCacheLineMaterialInfo = (area, code) => request({
 		wcsdevice_code: code
 	}
 })
+// export const getCacheLineMaterialInfo = (area, code) => {
+// 	let res = [{"position_code":"HCX01_31","layer_num":3,"position_name":"三层条码10","seat_order_num":1,"vehicle_status":"1","cacheline_code":"A1_HCX_01","vehicle_code":""},{"position_code":"HCX01_32","layer_num":3,"position_name":"三层条码9","seat_order_num":2,"vehicle_status":"1","cacheline_code":"A1_HCX_01","vehicle_code":""},{"position_code":"HCX01_33","layer_num":3,"position_name":"三层条码8","seat_order_num":3,"vehicle_status":"1","cacheline_code":"A1_HCX_01","vehicle_code":""},{"position_code":"HCX01_34","layer_num":3,"position_name":"三层条码7","seat_order_num":4,"vehicle_status":"1","cacheline_code":"A1_HCX_01","vehicle_code":""},{"position_code":"HCX01_35","layer_num":3,"position_name":"三层条码6","seat_order_num":5,"vehicle_status":"1","cacheline_code":"A1_HCX_01","vehicle_code":""},{"position_code":"HCX01_36","layer_num":3,"position_name":"三层条码5","seat_order_num":6,"vehicle_status":"1","cacheline_code":"A1_HCX_01","vehicle_code":""},{"position_code":"HCX01_37","layer_num":3,"position_name":"三层条码4","seat_order_num":7,"vehicle_status":"1","cacheline_code":"A1_HCX_01","vehicle_code":""},{"position_code":"HCX01_38","layer_num":3,"position_name":"三层条码3","seat_order_num":8,"vehicle_status":"1","cacheline_code":"A1_HCX_01","vehicle_code":""},{"position_code":"HCX01_39","layer_num":3,"position_name":"三层条码2","seat_order_num":9,"vehicle_status":"1","cacheline_code":"A1_HCX_01","vehicle_code":""},{"position_code":"HCX01_310","layer_num":3,"position_name":"三层条码1","seat_order_num":10,"vehicle_status":"1","cacheline_code":"A1_HCX_01","vehicle_code":""},{"position_code":"HCX01_21","layer_num":2,"position_name":"二层条码1","seat_order_num":1,"vehicle_status":"4","cacheline_code":"A1_HCX_01","vehicle_code":"10049"},{"position_code":"HCX01_22","layer_num":2,"position_name":"二层条码2","seat_order_num":2,"vehicle_status":"4","cacheline_code":"A1_HCX_01","vehicle_code":"10047"},{"position_code":"HCX01_23","layer_num":2,"position_name":"二层条码3","seat_order_num":3,"vehicle_status":"4","cacheline_code":"A1_HCX_01","vehicle_code":"10046"},{"position_code":"HCX01_24","layer_num":2,"position_name":"二层条码4","seat_order_num":4,"vehicle_status":"4","cacheline_code":"A1_HCX_01","vehicle_code":"10045"},{"position_code":"HCX01_25","layer_num":2,"position_name":"二层条码5","seat_order_num":5,"vehicle_status":"1","cacheline_code":"A1_HCX_01","vehicle_code":""},{"position_code":"HCX01_26","layer_num":2,"position_name":"二层条码6","seat_order_num":6,"vehicle_status":"1","cacheline_code":"A1_HCX_01","vehicle_code":""},{"position_code":"HCX01_27","layer_num":2,"position_name":"二层条码7","seat_order_num":7,"vehicle_status":"1","cacheline_code":"A1_HCX_01","vehicle_code":""},{"position_code":"HCX01_28","layer_num":2,"position_name":"二层条码8","seat_order_num":8,"vehicle_status":"1","cacheline_code":"A1_HCX_01","vehicle_code":""},{"position_code":"HCX01_29","layer_num":2,"position_name":"二层条码9","seat_order_num":9,"vehicle_status":"1","cacheline_code":"A1_HCX_01","vehicle_code":""},{"position_code":"HCX01_210","layer_num":2,"position_name":"二层条码10","seat_order_num":10,"vehicle_status":"1","cacheline_code":"A1_HCX_01","vehicle_code":""},{"position_code":"HCX01_11","layer_num":1,"position_name":"一层条码1","seat_order_num":1,"vehicle_status":"4","cacheline_code":"A1_HCX_01","vehicle_code":"10041"},{"position_code":"HCX01_12","layer_num":1,"position_name":"一层条码2","seat_order_num":2,"vehicle_status":"1","cacheline_code":"A1_HCX_01","vehicle_code":""},{"position_code":"HCX01_13","layer_num":1,"position_name":"一层条码3","seat_order_num":3,"vehicle_status":"1","cacheline_code":"A1_HCX_01","vehicle_code":""},{"position_code":"HCX01_14","layer_num":1,"position_name":"一层条码4","seat_order_num":4,"vehicle_status":"1","cacheline_code":"A1_HCX_01","vehicle_code":""},{"position_code":"HCX01_15","layer_num":1,"position_name":"一层条码5","seat_order_num":5,"vehicle_status":"1","cacheline_code":"A1_HCX_01","vehicle_code":""},{"position_code":"HCX01_16","layer_num":1,"position_name":"一层条码6","seat_order_num":6,"vehicle_status":"1","cacheline_code":"A1_HCX_01","vehicle_code":""},{"position_code":"HCX01_17","layer_num":1,"position_name":"一层条码7","seat_order_num":7,"vehicle_status":"1","cacheline_code":"A1_HCX_01","vehicle_code":""},{"position_code":"HCX01_18","layer_num":1,"position_name":"一层条码8","seat_order_num":8,"vehicle_status":"4","cacheline_code":"A1_HCX_01","vehicle_code":"11224"},{"position_code":"HCX01_19","layer_num":1,"position_name":"一层条码9","seat_order_num":9,"vehicle_status":"4","cacheline_code":"A1_HCX_01","vehicle_code":"11224"},{"position_code":"HCX01_110","layer_num":1,"position_name":"一层条码10","seat_order_num":10,"vehicle_status":"4","cacheline_code":"A1_HCX_01","vehicle_code":"10043"}]
+// 	return res
+// }
 // 1.3物料查询
 export const materialQuery = (bar) => request({
 	url:'api/cacheLineHand/materialQuery',
@@ -113,6 +117,20 @@ export const deleteBox = (obj) => request({
 	url:'api/cacheLineHand/deleteBox',
 	data: obj
 })
+// 1.7缓存线盘点-盘点开始
+export const cacheLineHandCheck = (option) => request({
+	url:'api/cacheLineHand/check',
+	data: {
+		check_option: option
+	}
+})
+// 1.8缓存线盘点-盘点结束
+export const cacheLineHandCheckEnd = (option) => request({
+	url:'api/cacheLineHand/checkEnd',
+	data: {
+		check_option: option
+	}
+})
 
 /** 物料列表 */
 // 根据订单获取订单信息