From dc16ec019889784f524b1739d209b63918532089 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Wed, 1 Apr 2026 19:00:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=87=BA=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                |   7 +
 pages/hdyy/ccgl/xuni-outstore-kcquery.vue | 141 ++++++++++++++++++
 pages/hdyy/ccgl/xuni-outstore.vue         | 167 ++++++----------------
 utils/getData3.js                         |  12 ++
 4 files changed, 201 insertions(+), 126 deletions(-)
 create mode 100644 pages/hdyy/ccgl/xuni-outstore-kcquery.vue

diff --git a/pages.json b/pages.json
index b77b528..0e1f3cc 100644
--- a/pages.json
+++ b/pages.json
@@ -321,6 +321,13 @@
                 "navigationStyle": "custom"
             }
         }
+        ,{
+            "path" : "pages/hdyy/ccgl/xuni-outstore-kcquery",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+        }
         ,{
             "path" : "pages/hdyy/zpgl/mater-zudai",
             "style" :                                                                                    
diff --git a/pages/hdyy/ccgl/xuni-outstore-kcquery.vue b/pages/hdyy/ccgl/xuni-outstore-kcquery.vue
new file mode 100644
index 0000000..8d871e6
--- /dev/null
+++ b/pages/hdyy/ccgl/xuni-outstore-kcquery.vue
@@ -0,0 +1,141 @@
+<template>
+	<view class="zd_container">
+		<!-- 库存查询（虚拟出库） -->
+		<nav-bar :title="title" :inner="true"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">物料编码</span>
+					</view>
+					<!-- <view class="zd-col-18">
+						<input type="text" v-model="pcsn" class="filter_input">
+					</view> -->
+					<view class="zd-col-18">
+						<search-box v-model="mcode"/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">批次</span>
+					</view>
+					<view class="zd-col-18">
+						<input type="text" v-model="pcsn" class="filter_input">
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th @tap="toAllCheck"><uni-icons :type="allCheck ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></th>
+								<th>虚拟托盘</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>批次</th>
+								<th>出库数量</th>
+								<th>质量代码</th>
+								<th>供应商</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<td @tap="toCheck(e)"><uni-icons :type="e.checked ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></td>
+								<td>{{e.storagevehicle_code}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.canuse_qty}}</td>
+								<td>{{e.quality_code}}</td>
+								<td>{{e.produce_name}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-11 button-primary" @tap="_hyQueryIvt">查询</button>
+			<button class="zd-col-11 button-primary" :class="{'button-info': !(this.checkedArr.length)}" @tap="toSure">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {hyQueryIvt} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				mcode: '',
+				pcsn: '',
+				dataList: [],
+				// dataList: [{storagevehicle_code: 'm001', qty: 100, checked: false, initialQty: 100}, {storagevehicle_code: 'm002', qty: 200, checked: false, initialQty: 200}, {storagevehicle_code: 'm003', qty: 300, checked: false, initialQty: 300}, {storagevehicle_code: 'm004', qty: 400, checked: false, initialQty: 400}],
+				allCheck: false,
+				checkedArr: []
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			async _hyQueryIvt () {
+				try {
+					let res = await hyQueryIvt(this.mcode, this.pcsn)
+					if (res && res.data.length > 0) {
+						this.dataList = [...res.data]
+					} else {
+						this.dataList = []
+					}
+				} catch (e) {
+					this.dataList = []
+				}
+			},
+			toAllCheck () {
+				this.allCheck = !this.allCheck
+				this.dataList.map(el => {
+					el.checked = this.allCheck
+				})
+				this.checkedArr = this.dataList.filter(el => el.checked === true)
+			},
+			toCheck (e) {
+				e.checked = !e.checked
+				this.checkedArr = this.dataList.filter(el => el.checked === true)
+				this.allCheck = this.checkedArr.length === this.dataList.length
+			},
+			// 检查数组中的 storagevehicle_code 是否重复
+			checkDuplicate(checkedArr) {
+				const codes = new Set();
+				for (const item of checkedArr) {
+					const code = item.storagevehicle_code;
+					if (codes.has(code)) {
+						// 存在重复，提示用户
+						uni.showToast({
+							title: '虚拟载具不能相同',
+							icon: 'none'
+						})
+						return false;
+					}
+					codes.add(code);
+				}
+				return true;
+			},
+			toSure () {
+				if (this.checkedArr.length) {
+					if (this.checkDuplicate(this.checkedArr)) {
+						// 没有重复，执行提交逻辑
+						this.$store.dispatch('setPublicArr', this.checkedArr)
+						uni.navigateBack()
+					}
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/hdyy/ccgl/xuni-outstore.vue b/pages/hdyy/ccgl/xuni-outstore.vue
index 91959f0..6b5a73e 100644
--- a/pages/hdyy/ccgl/xuni-outstore.vue
+++ b/pages/hdyy/ccgl/xuni-outstore.vue
@@ -1,61 +1,31 @@
 <template>
 	<view class="zd_container">
-		<!-- 直接出库 -->
+		<!-- 虚拟出库 -->
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
-			<view class="zd_wrapper">
-				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label filter_input_disabled">总数量</span>
-					</view>
-					<view class="zd-col-24">
-						<input type="number" v-model="num" class="filter_input filter_input_disabled" disabled>
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label">袋码</span>
-					</view>
-					<view class="zd-col-24 filter_select">
-						<search-box
-						v-model="bagCode"
-						/>
-					</view>
-				</view>
-				<view class="zd-row">
-					<button class="zd-col-11 button-primary ftsize1" @tap="toScanAdd">扫码插入</button>
-					<button class="zd-col-11 button-primary ftsize1" @tap="toDel">删除行</button>
-				</view>
-			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
 					<table>
 						<thead>
 							<tr>
-								<th>序号</th>
-								<th>袋号</th>
+								<th>虚拟托盘</th>
 								<th>物料编码</th>
 								<th>物料名称</th>
-								<th>批号</th>
+								<th>批次</th>
 								<th>出库数量</th>
-								<th>单位</th>
+								<th>质量代码</th>
 								<th>供应商</th>
-								<th>类别</th>
-								<th>点位</th>
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.bag_code === pkId}" @tap="toCheck(e)">
-								<td>{{i+1}}</td>
-								<td>{{e.bag_code}}</td>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<td>{{e.storagevehicle_code}}</td>
 								<td>{{e.material_code}}</td>
 								<td>{{e.material_name}}</td>
 								<td>{{e.pcsn}}</td>
 								<td><input type="number" class="sin_input" v-model="e.canuse_qty"  @blur="handleBlur(e)"></td>
-								<td>{{e.qty_unit_name}}</td>
-								<td>{{e.supp_name}}</td>
-								<td>{{e.material_type_id}}</td>
-								<td>{{e.struct_code}}</td>
+								<td>{{e.quality_code}}</td>
+								<td>{{e.produce_name}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -63,8 +33,8 @@
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
-			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-18 button-primary" :class="{'button-info': !num || !dataList.length}" :disabled="disabled" @tap="_directlyOutConfirm">确认出库</button>
+			<button class="zd-col-11 button-primary" @tap="toKccx">库存查询</button>
+			<button class="zd-col-11 button-primary" :class="{'button-info': !dataList.length}" :disabled="disabled" @tap="_hyConfirmOut">确认出库</button>
 		</view>
 	</view>
 </template>
@@ -72,7 +42,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryPointInDownload, directlyOutCodeInsert, directlyOutConfirm} from '@/utils/getData3.js'
+	import {hyConfirmOut} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -81,12 +51,6 @@
 		data() {
 			return {
 				title: '',
-				options: [],
-				bagCode: '',
-				num: null,
-				index: '',
-				pkId: '',
-				pkObj: {},
 				dataList: [],
 				// dataList: [{material_code: 'm001', qty: 100, checked: false, initialQty: 100}, {material_code: 'm002', qty: 200, checked: false, initialQty: 200}],
 				disabled: false
@@ -94,7 +58,22 @@
 		},
 		onLoad (options) {
 			this.title = options.title
-			// this._queryPointInDownload()
+		},
+		onShow () {
+			if (this.$store.getters.publicArr.length) {
+				const combined = [...this.dataList, ...this.$store.getters.publicArr];
+				const map = new Map();
+				combined.forEach(item => {
+				const key = `${item.storagevehicle_code}}`;
+				// 仅当键不存在时才添加，这样先出现的记录会被保留
+				if (!map.has(key)) {
+					map.set(key, item);
+				}
+				});
+				this.dataList = Array.from(map.values());
+
+				this.$store.dispatch('setPublicArr', '')
+			}
 		},
 		methods: {
 			handleBlur (e) {
@@ -104,10 +83,6 @@
 					} else {
 						e.canuse_qty = e.canuse_qty.replace(/[^0-9]/g, '')
 						e.canuse_qty = e.canuse_qty.replace(/^0+/, '') || '0'
-						if (e.canuse_qty > e.initialQty) {
-							e.canuse_qty = e.initialQty
-						}
-						this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
 					}
 				} else {
 					// uni.showToast({
@@ -116,87 +91,27 @@
 					// })
 				}
 			},
-			toScanAdd () {
-				if (this.bagCode) {
-					this._directlyOutCodeInsert2(this.bagCode)
-				}
-			},
-			toDel () {
-				if (!this.pkId) {
-					return
-				}
-				this.dataList = this.dataList.filter(item => item.bag_code !== this.pkObj.bag_code)
-			},
-			toCheck (e) {
-				this.pkId = this.pkId === e.bag_code ? '' : e.bag_code
-				this.pkObj = this.pkId === e.bag_code ? e : {}
-			},
 			toEmpty () {
-				this.val1 = ''
 				this.dataList = []
 				this.disabled = false
 			},
-			async _queryPointInDownload () {
-				try {
-					let res = await queryPointInDownload()
-					if (res) {
-						this.options = res.data
-					} else {
-						this.options = []
-					}
-				} catch (e) {
-					this.options = []
+			toKccx () {
+				uni.navigateTo({
+					url: '/pages/hdyy/ccgl/xuni-outstore-kcquery?title=库存查询'
+				})
+			},
+			async _hyConfirmOut () {
+				const hasEmpty = this.dataList.some(item => item.canuse_qty === '');
+				if (hasEmpty) {
+					uni.showToast({
+						title: '请填写出库数量',
+						icon: 'none'
+					})
+					return false
 				}
-			},
-			selectChange (e) {
-				this.index = e
-			},
-			async _directlyOutCodeInsert (e) {
-				try {
-					let res = await directlyOutCodeInsert(e)
-					if (res) {
-						this.dataList = [...this.dataList, ...res.data]
-						this.dataList.forEach(e => {
-							e.initialQty = e.canuse_qty
-						})
-						this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
-					} else {
-						this.dataList = []
-					}
-				} catch (e) {
-					this.dataList = []
-				}
-			},
-			async _directlyOutCodeInsert2 (e) {
-				try {
-					let res = await directlyOutCodeInsert(this.bagCode)
-					if (res) {
-						const existingItem = this.dataList.find(item => item.bag_code === res.data.bag_code)
-						if (!existingItem) {
-							this.dataList.push(res.data)
-						} else {
-							uni.showToast({
-								title: '袋码已存在，不能重复插入',
-								icon: 'none'
-							})
-						}
-						this.dataList.forEach(e => {
-							e.initialQty = e.canuse_qty
-						})
-						this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
-					} else {
-					}
-				} catch (e) {
-				}
-			},
-			async _directlyOutConfirm () {
 				this.disabled = true
-				if (!this.num || !this.dataList.length) {
-					this.disabled = false
-					return
-				}
 				try {
-					let res = await directlyOutConfirm(this.num, this.dataList)
+					let res = await hyConfirmOut(this.dataList)
 					if (res) {
 						uni.showToast({
 							title: res.message,
diff --git a/utils/getData3.js b/utils/getData3.js
index 6ebdf32..440595d 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -279,6 +279,18 @@ export const hyConfirmIn = (rows) => request({
 	data: {rows: rows}
 })
 
+// 虚拟出库（仓储管理）共 (2) 个
+// 查询库存信息
+export const hyQueryIvt = (mcode, pcsn) => request({
+	url:'api/pdaWarehouse/hyQueryIvt',
+	data: {material_code: mcode, pcsn: pcsn}
+})
+// 确认出库
+export const hyConfirmOut = (rows) => request({
+	url:'api/pdaWarehouse/hyConfirmOut',
+	data: {rows: rows}
+})
+
 /**
  * 生产管理
  */