From 12382519bc9130ecc5aeadaf6e04541727cddebe Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 05 四月 2024 16:58:49 +0800
Subject: [PATCH] #

---
 pages/phyz/order/orderList2.vue          |    3 ++-
 pages/phyz/stationManage/stationDetl.vue |   43 +++++++++++++++++++++++++++++++++++++------
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/pages/phyz/order/orderList2.vue b/pages/phyz/order/orderList2.vue
index 1af0b77..cca8fda 100644
--- a/pages/phyz/order/orderList2.vue
+++ b/pages/phyz/order/orderList2.vue
@@ -170,7 +170,8 @@
 				let _this = this
 				let combList = []
 				for (let k of _this.dataList) {
-					k['csocode'] = k.threeCode
+					k['csocode'] = k.threeCode 
+					k['isoseq'] = k.deadTime
 					if (k.checked) {
 						combList.push(k)
 					}
diff --git a/pages/phyz/stationManage/stationDetl.vue b/pages/phyz/stationManage/stationDetl.vue
index 0b6a9ac..aa56d75 100644
--- a/pages/phyz/stationManage/stationDetl.vue
+++ b/pages/phyz/stationManage/stationDetl.vue
@@ -20,19 +20,20 @@
 		<view class="wrkMast">
 			<view class="wrkMast-wrkNo">
 				<view style="flex:3">宸ヤ綔鍙�: {{wrkMast.wrkNo}}</view>
-				<view style="flex:1">{{wrkMast.ioTitle}}</view>
+				<view style="flex:2">{{wrkMast.ioTitle}}</view>
 			</view>
 			<view>宸ヤ綔绫诲瀷: {{wrkMast.ioType$}}</view>
 			<view>婧愬簱浣�: {{wrkMast.sourceLocNo}}</view>
 		</view>
 		
 		<!-- 鏄庣粏 -->
-		<view class="wrkDetls">
+		<view class="wrkDetls" v-if="wrkDetls.length > 0">
 			<view class="wrkDetl" v-for="wrkDetl in wrkDetls">
-				<view>鍟嗗搧鍚嶇О</view>
-				<view>鍟嗗搧缂栫爜</view>
-				<view>鏁伴噺</view>
-				<view>閿�鍞鍗曞彿</view>
+				<view>鍟嗗搧鍚嶇О:{{wrkDetl.maktx}}</view>
+				<view>鍟嗗搧缂栫爜:{{wrkDetl.matnr}}</view>
+				<view>閿�鍞鍗曞彿:{{wrkDetl.threeCode ? wrkDetl.threeCode : ' --'}}</view>
+				<view>鑷敱椤�:{{wrkDetl.deadTime ? wrkDetl.deadTime : ' --'}}</view>
+				<view>鏁伴噺:{{wrkDetl.anfme}}</view>
 			</view>
 		</view>
 		
@@ -314,6 +315,11 @@
 								res.data.records[0]['ioTitle'] = '绌烘澘鍏ュ簱'
 							} else if (res.data.records[0].ioType == 53) {
 								res.data.records[0]['ioTitle'] = '鎷f枡鍐嶅叆搴�'
+							} else if (res.data.records[0].ioType == 101) {
+								res.data.records[0]['ioTitle'] = '鍏ㄦ澘鍑哄簱'
+								_this.btnType = 'out'
+							} else if (res.data.records[0].ioType == 103) {
+								res.data.records[0]['ioTitle'] = '鎷f枡鍑哄簱'
 							}
 							_this.wrkMast = res.data.records[0]
 							_this.getWrkDetl(_this.wrkMast.wrkNo)
@@ -341,6 +347,31 @@
 					}
 				})
 			},
+			containerMoveOut() {
+				let _this = this
+				let devNo = {devNo:[this.station.devNo]}
+				uni.request({
+					url: `${_this.baseUrl}/agv/basDevp/visualized/container/moveOut`,
+					data: JSON.stringify(devNo),
+					method: 'POST',
+					success(res) {
+						res = res.data
+						if (res.code === 200) {
+							setTimeout(()=> {
+								_this.barcode = ''
+								_this.reloadStation()
+							},1000)
+							uni.showToast({ title: '纭瀹屾垚', icon: "success", position: 'top' }) 
+						} else {
+							uni.showToast({ title: res.msg, icon: "error", position: 'top' }) 
+							setTimeout(()=> {
+								_this.searchValue = ''
+								_this.getBasDevp()
+							},2000)
+						}
+					}
+				})
+			},
 		}
 	}
 </script>

--
Gitblit v1.9.1