From 387731cab892804912e68cb91e6fb804411c4756 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期一, 27 十月 2025 23:32:16 +0800
Subject: [PATCH] 优化与ERP出库单逻辑,增加打印程序

---
 项目代码/PDA/pages/task/Inbound.vue |  106 ++++++++++++++++++++++++++++++++---------------------
 1 files changed, 64 insertions(+), 42 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/task/Inbound.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/task/Inbound.vue"
index 06ed47d..6aaf79b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/task/Inbound.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/task/Inbound.vue"
@@ -37,16 +37,31 @@
 						<uni-easyinput type="text" placeholder="璇锋壂鎻忓绠辨爣绛�" ref='midInput' :focus="focus" v-model="materSn"
 							@input="snInput" />
 					</uni-forms-item>
-					<uni-list>
-						<!-- <uni-list-item direction="column" v-for="item in InBoundOrder" :key="item.matCode">
-							<template v-slot:body>
-								<view class="uni-list-box">
-									<view class="uni-content">
-										<view class="uni-title-sub uni-ellipsis-2">璁㈠崟鍞竴缂栫爜锛歿{item.orderNo}}</view>
-									</view>
+					<view v-if="group.length" class="scan-result">
+						<uni-card v-for="(item, index) in group" :key="item.orderNo">
+							<view class="info-grid">
+								<view class="info-row">
+									<text class="label">璁㈠崟缂栫爜锛�</text>
+									<text>{{ item.orderNo }}</text>
 								</view>
-							</template>
-						</uni-list-item> -->
+								<br>
+								<view class="info-row">
+									<text class="label">浠撳簱鍚嶇О锛�</text>
+									<text>{{ item.warehouseName }}</text>
+								</view><br>
+								<view class="info-row">
+									<text class="label">鐗╂枡缂栫爜锛�</text>
+									<text>{{ item.materialNo }}</text>
+								</view><br>
+								<uni-forms-item label="缁勭洏鏁伴噺">
+									<uni-easyinput v-model="item.quantity" type="number" />
+								</uni-forms-item>
+							</view>
+							<uni-icons type="trash" class="delete-icon" @click="removeScanItem(item.orderNo)" />
+						</uni-card>
+					</view>
+
+					<!-- <uni-list>
 						<uni-list-item direction="column" v-for="(item,index) in InBoundOrder" :key="item.sn">
 							<template v-slot:body>
 								<view class="uni-list-box">
@@ -56,10 +71,20 @@
 									<view class="uni-content">
 										<view class="uni-title-sub uni-ellipsis-2">璁㈠崟鍞竴缂栫爜锛歿{item.orderNo}}</view>
 									</view>
+									<view class="uni-content">
+										<view class="uni-title-sub uni-ellipsis-2">浠撳簱锛歿{item.warehouseName}}</view>
+									</view>
+									<view class="uni-content">
+										<view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栫爜锛歿{item.materialNo}}</view>
+									</view>
+									<uni-forms-item label="鏁伴噺">
+										<uni-easyinput type="text" :focus="barcodefocus" @input="quantity"
+											v-model="PalletCode2" placeholder="鏁伴噺" ref='midInput' />
+									</uni-forms-item>
 								</view>
 							</template>
 						</uni-list-item>
-					</uni-list>
+					</uni-list> -->
 				</uni-forms>
 				<button @click="GroupPlate" type="primary" size="default" style="margin-top: 2%;">缁勭洏</button>
 			</view>
@@ -92,15 +117,15 @@
 				istrue: false,
 				barcodefocus: false,
 				range: [],
+				group: [],
 				AreaId: 0,
+				quantity: "",
 				SourceAddress: "",
 				TargetAddress: "",
 				PalletCode1: "",
 				PalletCode2: "",
 				PalletCode3: "",
 				materSn: "",
-				InBoundOrder: [],
-				OrderNos: [],
 				items: ['鍏ュ簱', '缁勭洏', '瑙g洏'],
 				current: 0
 			}
@@ -132,7 +157,6 @@
 					"TargetAddress": this.TargetAddress,
 					"AreaId": this.AreaId,
 				}
-				console.log(param);
 				this.$u.post('/api/Task/RequestInboundTaskAsync', param).then(res => {
 					if (res.status) {
 						this.$refs.luToast.show({
@@ -162,17 +186,16 @@
 				}
 				var param = {
 					"PalletCode": this.PalletCode2,
-					"OrderNos": this.OrderNos
+					"groups": this.group
 				}
-				this.$u.post('/api/BoxingInfo/AddBoxingInfo', param).then(res => {
+				this.$u.post('/api/BoxingInfo/AddGroupPlateAsync', param).then(res => {
 					if (res.status) {
 						this.$refs.luToast.show({
 							title: res.message,
 							type: "success"
 						})
 						this.PalletCode2 = "";
-						this.InBoundOrder = [];
-						this.OrderNos = [];
+						this.group = [];
 						this.barcodefocus = false;
 					} else {
 						this.$refs.luToast.show({
@@ -182,8 +205,8 @@
 					}
 				})
 			},
-			
-			SolvePlate(){
+
+			SolvePlate() {
 				if (this.PalletCode3.length <= 0) {
 					this.$refs.luToast.show({
 						title: "璇疯緭鍏ユ墭鐩樻潯鐮�",
@@ -194,7 +217,7 @@
 				var param = {
 					"PalletCode": this.PalletCode3,
 				}
-				this.$u.post('/api/BoxingInfo/DeleteBoxingInfoAsync', param).then(res => {
+				this.$u.post('/api/StockInfo/DeleteGroupPlateAsync', param).then(res => {
 					if (res.status) {
 						this.$refs.luToast.show({
 							title: res.message,
@@ -223,16 +246,26 @@
 					var matObj = {
 						orderNo: this.materSn,
 					}
-					var temp = this.InBoundOrder.find(x => x.orderNo == matObj.orderNo);
+					var temp = this.group.find(x => x.orderNo == matObj.orderNo);
 					if (!temp) {
-						this.InBoundOrder.push(matObj);
-						this.OrderNos.push(this.materSn);
-						setTimeout(this.updateFocus, 200);
-						setTimeout(() => {
-							this.voiceSpeech('../../static/success.mp3');
-						}, 100);
+						this.$u.post('/api/InboundOrder/GetInboundOrderInfo?orderNo=' + this.materSn, "").then(
+							res => {
+								if (res.status) {
+									this.group.push(res.data);
+									setTimeout(this.updateFocus, 200);
+									setTimeout(() => {
+										this.voiceSpeech('../../static/success.mp3');
+									}, 100);
+								} else {
+									this.$refs.luToast.show({
+										title: res.message,
+										type: "error"
+									})
+								}
+							})
+
 					} else {
-						this.$refs.uToast.show({
+						this.$refs.luToast.show({
 							title: "鎵爜閲嶅",
 							type: "error"
 						})
@@ -244,20 +277,9 @@
 
 				})
 			},
-			deleteList(res) {
-				this.InBoundOrder.map((item, index) => {
-					console.log(res, item);
-					if (item.orderNo == res) {
-						this.InBoundOrder.splice(index, 1);
-					}
-				})
-				this.OrderNos.map((item, index) => {
-					if (item == res) {
-						this.OrderNos.splice(index, 1);
-					}
-				})
-			},
-
+			removeScanItem(orderNo) {
+				this.group = this.group.filter(item => item.orderNo !== orderNo);
+			}
 		}
 	}
 </script>

--
Gitblit v1.9.3