From 46372985a6049a50a1c666fb264d07caf28fe89f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 21 八月 2025 19:50:41 +0800
Subject: [PATCH] #

---
 pages/stock/stockQuery.vue  |   15 ++++
 pages/home/home.vue         |   90 ++++++++++++++++-------------
 pages/order/orderPakin2.vue |   10 ++
 pages.json                  |   18 ++++++
 static/css/wms.css/wms.css  |    2 
 5 files changed, 90 insertions(+), 45 deletions(-)

diff --git a/pages.json b/pages.json
index ac88efa..804445a 100644
--- a/pages.json
+++ b/pages.json
@@ -252,6 +252,24 @@
 			"style": {
 				"navigationBarTitleText": "鍗曟嵁鏄庣粏鍒楄〃"
 			}
+		},
+		{
+		    "path" : "pages/AGV/AGVSiteList",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "浜х嚎鍙枡",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},
+		{
+		    "path" : "pages/AGV/AGVLineCall",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "浜х嚎鍙枡",
+		        "enablePullDownRefresh": false
+		    }
+		    
 		}
     ],
 	"globalStyle": {
diff --git a/pages/home/home.vue b/pages/home/home.vue
index e130293..cc670d8 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -24,13 +24,13 @@
 				icon: '',
 				elements: [],
 				elements2: [
-					{
-						title: '缁勬墭',
-						name: 'pakin',
-						color: 'cyan',
-						cuIcon: 'pullup',
-						url: '/pakin/pakin'
-					},
+					// {
+					// 	title: '缁勬墭',
+					// 	name: 'pakin',
+					// 	color: 'cyan',
+					// 	cuIcon: 'pullup',
+					// 	url: '/pakin/pakin'
+					// },
 					{
 						title: '璁㈠崟鍏ュ簱',
 						name: 'orderPakin',
@@ -38,28 +38,35 @@
 						cuIcon: 'pullup',
 						url: '/order/orderList'
 					},
-					// {
-					// 	title: '鎷f枡绔欏埌绔�',
-					// 	name: 'leftover',
-					// 	color: 'orange',
-					// 	cuIcon: 'pullup',
-					// 	url: '/pakin/leftovers'
-					// },					
+					{
+						title: '鎷f枡绔欏埌绔�',
+						name: 'leftover',
+						color: 'orange',
+						cuIcon: 'pullup',
+						url: '/pakin/leftovers'
+					},					
 					
-					{
-						title: '骞冲簱鍏ュ簱',
-						name: 'POrderPakin',
-						color: 'purple',
-						cuIcon: 'pullup',
-						url: '/pingku/POrderList'
-					},
-					{
-						title: '骞冲簱鍑哄簱',
-						name: 'POrderPakin',
-						color: 'cyan',
-						cuIcon: 'pullup',
-						url: '/pingku/POrderListOut'
-					},
+					// {
+					// 	title: '骞冲簱鍏ュ簱',
+					// 	name: 'POrderPakin',
+					// 	color: 'purple',
+					// 	cuIcon: 'pullup',
+					// 	url: '/pingku/POrderList'
+					// },
+					// {
+					// 	title: '骞冲簱鍑哄簱',
+					// 	name: 'POrderPakin',
+					// 	color: 'cyan',
+					// 	cuIcon: 'pullup',
+					// 	url: '/pingku/POrderListOut'
+					// },
+					// {
+					// 	title: '浜х嚎鍙枡',
+					// 	name: 'AGVSiteList',
+					// 	color: 'red',
+					// 	cuIcon: 'post',
+					// 	url: '/AGV/AGVSiteList'
+					// },
 					{
 						title: '鍛煎彨Agv',
 						name: 'AGVStart',
@@ -73,13 +80,14 @@
 						color: 'orange',
 						cuIcon: 'order',
 						url: '/AGV/AGVUnbind'
-					},{
-						title: '鐩樼偣',
-						name: 'stockCheck',
-						color: 'red',
-						cuIcon: 'post',
-						url: '/stock/stockCheck'
 					},
+					// {
+					// 	title: '鐩樼偣',
+					// 	name: 'stockCheck',
+					// 	color: 'red',
+					// 	cuIcon: 'post',
+					// 	url: '/stock/stockCheck'
+					// },
 					// {
 					// 	title: '缁勬墭涓婃灦',
 					// 	name: 'putOn',
@@ -108,13 +116,13 @@
 					// 	cuIcon: 'pulldown',
 					// 	url: '/order/orderPutDown'
 					// },
-					{
-						title: '搴撳瓨鏌ヨ',
-						name: 'stockQuery',
-						color: 'green',
-						cuIcon: 'check',
-						url: '/stock/stockQuery'
-					},
+					// {
+					// 	title: '搴撳瓨鏌ヨ',
+					// 	name: 'stockQuery',
+					// 	color: 'green',
+					// 	cuIcon: 'check',
+					// 	url: '/stock/stockQuery'
+					// },
 					// {
 					
 					// {
diff --git a/pages/order/orderPakin2.vue b/pages/order/orderPakin2.vue
index a6b34d3..47c55d2 100644
--- a/pages/order/orderPakin2.vue
+++ b/pages/order/orderPakin2.vue
@@ -175,8 +175,7 @@
 			let that = this
 			const eventChannel = this.getOpenerEventChannel();
 			
-			eventChannel.on('orderItem', function(data) {
-				console.log(data.item)
+			eventChannel.on('orderItem', function(data) {				
 				that.orderNo = data.item.orderNo
 				that.checkMat(data.item)
 			});
@@ -322,6 +321,7 @@
 			},
 			checkMat(mat) {
 				mat.review = "鏈鏍�"
+				mat.anfme = mat.enableQty
 				var len = this.dataList.length
 				var add = true ,sameItem = false
 				for (var i = 0; i < len; i++) {
@@ -557,4 +557,10 @@
 		text-align: center;
 		box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
 	}
+	.list:first-child {
+		margin-top: 420rpx;
+	}
+	.list:last-child {
+		margin-bottom: 120rpx;
+	}
 </style>
diff --git a/pages/stock/stockQuery.vue b/pages/stock/stockQuery.vue
index 998a932..984cd49 100644
--- a/pages/stock/stockQuery.vue
+++ b/pages/stock/stockQuery.vue
@@ -8,7 +8,7 @@
 			</view>
 			<view class="item">
 				<view class="code-decs">鐗╂枡鍙�:</view>
-				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr">
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" @input="findMat()">
 				<view class="item-right">
 				</view>
 			</view>
@@ -24,6 +24,10 @@
 					<view class="list-left-item">
 						<view class="desc">No锛�</view>
 						<view class="left-item">{{i + 1}}</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">搴撲綅锛�</view>
+						<view class="left-item">{{item.locNo}}</view>
 					</view>
 					<view class="list-left-item">
 						<view class="desc">缂栫爜锛�</view>
@@ -102,6 +106,15 @@
 			this.token = uni.getStorageSync('token');
 		},
 		methods: {
+			// 鎼滅储鐗╂枡
+			findMat() {
+				let that = this				
+				let m = that.matnr.split(";")	
+				let matnr1 = m[0].slice(3)				
+				setTimeout(() => { 
+					that.matnr = matnr1
+				}, 100);
+			},
 			search() {
 				let that = this
 				uni.request({
diff --git a/static/css/wms.css/wms.css b/static/css/wms.css/wms.css
index 34210d6..10a72c7 100644
--- a/static/css/wms.css/wms.css
+++ b/static/css/wms.css/wms.css
@@ -7,7 +7,7 @@
 	box-shadow: 0px 0px 30px 0px rgba(0,0,0,0.2);
 }
 .list:first-child {
-	margin-top: 420rpx;
+	margin-top: 320rpx;
 }
 .list:last-child {
 	margin-bottom: 120rpx;

--
Gitblit v1.9.1