From df97e66f99cf081abf212a8d97fc32afe9c6e7a7 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 17 一月 2025 13:46:32 +0800
Subject: [PATCH] 更新配置文件PDA版本

---
 代码管理/淮安PDA/pages/stash/pickingMat.vue |  112 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 98 insertions(+), 14 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/pickingMat.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/pickingMat.vue"
index bcc6231..5de35a0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/pickingMat.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/pickingMat.vue"
@@ -15,24 +15,22 @@
 						</uni-forms-item>
 					</uni-forms>
 					<uni-list>
-						<uni-list-item direction="column" v-for="item in matInfos" :key="item.sn">
+						<uni-list-item direction="column" v-for="item in matInfos" :key="item.palletCode">
 							<template v-slot:body>
-								<view class="uni-list-box">
 									<!-- <uni-icons type="trash" size="22" style="position: absolute;right: 5%;"
 										@click="deleteList(item.sn)">
 									</uni-icons> -->
 									<view class="uni-content">
-										<view class="uni-title-sub uni-ellipsis-2">鍗曟嵁缂栧彿锛歿{item.orderNo}}</view>
-										<view class="uni-note">鎵樼洏缂栧彿锛歿{item.palletCode}}</view>
-										<view class="uni-note">鐗╂枡鎵规锛歿{item.batchNo}}</view>
-										<view class="uni-note">鐗╂枡缂栫爜锛歿{item.materielCode}}</view>
-										<view class="uni-note">鐗╂枡鍚嶇О锛歿{item.materielName}}</view>
-										<view class="uni-note">鍗曟嵁鏁伴噺锛歿{item.orderQuantity}}</view>
-										<view class="uni-note">鍘熷搴撳瓨锛歿{item.originalQuantity}}</view>
-										<view class="uni-note">鍒嗛厤搴撳瓨锛歿{item.assignQuantity}}</view>
-										<view class="uni-note">鍓╀綑搴撳瓨锛歿{item.originalQuantity-item.assignQuantity}}</view>
+										<view>鍗曟嵁缂栧彿锛歿{item.orderNo}}</view>
+										<view>鎵樼洏缂栧彿锛歿{item.palletCode}}</view>
+										<view>鐗╂枡鎵规锛歿{item.batchNo}}</view>
+										<view>鐗╂枡缂栫爜锛歿{item.materielCode}}</view>
+										<view>鐗╂枡鍚嶇О锛歿{item.materielName}}</view>
+										<view>鍗曟嵁鏁伴噺锛歿{item.orderQuantity}}</view>
+										<view>鍘熷搴撳瓨锛歿{item.originalQuantity}}</view>
+										<view>鍒嗛厤搴撳瓨锛歿{item.assignQuantity}}</view>
+										<view>鍓╀綑搴撳瓨锛歿{item.originalQuantity-item.assignQuantity}}</view>
 									</view>
-								</view>
 							</template>
 						</uni-list-item>
 					</uni-list>
@@ -63,13 +61,41 @@
 								placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' @input="inputChangebarcode3" />
 						</uni-forms-item>
 						<uni-forms-item label="鍦板潃鏉$爜">
-							<uni-easyinput type="text" v-model="address" placeholder="璇锋壂鎻忓湴鍧�鏉$爜" ref='midInput'
+							<uni-easyinput type="text" v-model="address" :disabled = "addressdisabled" placeholder="璇锋壂鎻忓湴鍧�鏉$爜" ref='midInput'
 								:focus="addressFocus" />
 						</uni-forms-item>
 						<uni-forms-item>
 							<button @click="inbound" type="primary" size="default" style="margin-top: 2%;">鍏ュ簱纭</button>
 						</uni-forms-item>
 					</uni-forms>
+				</view>
+				<view>
+					<uni-list>
+						<uni-list-item direction="column" v-if="inboundBarcode">
+							<template v-slot:body>
+								<view class="uni-list-box">
+									<view class="uni-content">
+										<view class="uni-title-sub uni-ellipsis-2">鎬绘暟閲忥細{{Summmary}}</view>
+									</view>
+								</view>
+							</template>
+						</uni-list-item>
+						<uni-list-item direction="column" v-for="(item,index) in stockInfoDetail" :key="index">
+							<template v-slot:body>
+								<view class="uni-list-box">
+									<view class="uni-content">
+										<view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栧彿锛歿{item.materielCode}}</view>
+										<view class="uni-note">鐗╂枡鍚嶇О锛歿{item.materielName}}</view>
+										<view class="uni-note">鐗╂枡鎵规锛歿{item.batchNo}}</view>
+										<view class="uni-note">搴撳瓨鏁伴噺锛歿{item.stockQuantity}}</view>
+										<view class="uni-note">鍑哄簱鏁伴噺锛歿{item.outboundQuantity}}</view>
+										<view class="uni-note">鐢熶骇鏃ユ湡锛歿{item.productionDate}}</view>
+										<view class="uni-note">鏈� 鏁� 鏈燂細{{item.effectiveDate}}</view>
+									</view>
+								</view>
+							</template>
+						</uni-list-item>
+					</uni-list>
 				</view>
 			</view>
 		</view>
@@ -108,12 +134,22 @@
 				inboundBarcode: "",
 				address: "",
 				warehouseId: 0,
+				Summmary: 0,
+				stockInfoDetail: [],
+				addressdisabled: false
 			}
 		},
 		onLoad(res) {
 			this.barcodefocus = false;
 			this.warehouseId = res.warehouseId;
+			if (this.warehouseId == 5) {
+				this.address = "8005"
+			}else if (this.warehouseId == 3) {
+				this.address = "1011";
+				this.addressdisabled = true;
+			}
 			this.istrue = false;
+			this.addressFocus = false;
 		},
 		methods: {
 			onClickItem(e) {
@@ -150,7 +186,6 @@
 					if (res.status) {
 						uni.$showMsg(res.message);
 						this.inboundBarcode = "";
-						this.address = "";
 						setTimeout(() => {
 							this.addressFocus = false;
 						}, 200);
@@ -174,6 +209,34 @@
 						this.addressFocus = true;
 					}
 				})
+				this.$nextTick(function(x) {
+					if (this.inboundBarcode != '') {
+						var postData = {
+							MainData: {
+								"barcode": this.inboundBarcode,
+								"warehouseId": this.warehouseId,
+							}
+						};
+						this.$u.post('/api/StockInfo/StockQueryData', postData).then(res => {
+							// this.stockInfo = [];
+							this.stockInfoDetail = [];
+							if (res.status) {
+									// this.stockInfo = res.data,
+									this.stockInfoDetail = res.data.details
+									//鑾峰彇鎬绘暟閲�
+									this.stockInfoDetail.forEach(item => {
+										this.Summmary+= item.stockQuantity;
+									});
+							} else {
+								this.$refs.uToast.show({
+									// title: "鏈壘鍒版墭鐩樹俊鎭�",
+									title: res.message,
+									type: "error"
+								})
+							}
+						})
+					}
+				})
 			},
 			picking() {
 				if (this.barcode == "") {
@@ -185,6 +248,10 @@
 				}
 				this.$u.post('/api/OutStockLockInfo/MaterialPick?palletCode=' + this.barcode, {}).then(res => {
 					if (res.status) {
+						// if(this.warehouseId==5){
+						// 	this.Finish("8005");
+						// }
+
 						uni.$showMsg('鎷i�夋垚鍔�!')
 						this.barcode = "";
 						this.matInfos = [];
@@ -196,6 +263,23 @@
 					}
 				})
 			},
+			Finish(code) {
+				this.$u.post('http://127.0.0.1:9291/api/CTU_AGV/PutFinish?&code=' + code).then(
+					res => {
+						if (res.status) {
+							// this.$refs.uToast.show({
+							// 	title: "瀹屾垚鎴愬姛",
+							// 	type: "success"
+							// })
+							// this.barcode = "";
+						} else {
+							// this.$refs.uToast.show({
+							// 	title: res.message,
+							// 	type: "error"
+							// })
+						}
+					})
+			},
 			inputChange(e) {
 				this.$nextTick(() => {
 					this.istrue = false;

--
Gitblit v1.9.3