From 1b4baf3ee0eefdd36f1300b85598e97ace9ddc2b Mon Sep 17 00:00:00 2001
From: zwq <zwq229436@163.com>
Date: Sun, 4 Jan 2026 13:32:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/asrs/buyRoll/add-or-updata.vue      |  5 ++
 src/views/asrs/deliveryHis/index.vue          |  1 +
 src/views/asrs/deliveryHis/indexb.vue         |  1 +
 .../asrs/goodSpecification/add-or-updata.vue  | 15 ++++--
 src/views/wcsAlarm/real1.vue                  | 46 +++++++++----------
 src/views/wcsAlarm/real2.vue                  | 46 +++++++++----------
 6 files changed, 64 insertions(+), 50 deletions(-)

diff --git a/src/views/asrs/buyRoll/add-or-updata.vue b/src/views/asrs/buyRoll/add-or-updata.vue
index 261ecdb..f2a8252 100644
--- a/src/views/asrs/buyRoll/add-or-updata.vue
+++ b/src/views/asrs/buyRoll/add-or-updata.vue
@@ -157,6 +157,11 @@ const tableProps = [
 		label: '膜卷编码',
 		subcomponent: inputArea,
 	},
+	{
+		prop: 'planQty',
+		label: '数量mes',
+		subcomponent: inputArea,
+	},
 	{
 		prop: 'number',
 		label: '数量',
diff --git a/src/views/asrs/deliveryHis/index.vue b/src/views/asrs/deliveryHis/index.vue
index 338635f..6f27b2c 100644
--- a/src/views/asrs/deliveryHis/index.vue
+++ b/src/views/asrs/deliveryHis/index.vue
@@ -76,6 +76,7 @@
 			</el-table-column>
 			<el-table-column prop="department" label="部门" />
 			<el-table-column prop="applicant" label="申请人" />
+			<el-table-column prop="outwhy" label="出库事由" />
 			<el-table-column prop="process" label="工序" />
 			<el-table-column prop="createTime" label="创建时间" width="150">
 				<template v-slot="scope">
diff --git a/src/views/asrs/deliveryHis/indexb.vue b/src/views/asrs/deliveryHis/indexb.vue
index 6c996b0..924fcd6 100644
--- a/src/views/asrs/deliveryHis/indexb.vue
+++ b/src/views/asrs/deliveryHis/indexb.vue
@@ -82,6 +82,7 @@
 			</el-table-column>
 			<el-table-column prop="department" label="部门" />
 			<el-table-column prop="applicant" label="申请人" />
+			<el-table-column prop="outwhy" label="出库事由" />
 			<el-table-column prop="process" label="工序" />
 			<el-table-column prop="createTime" label="创建时间" width="150">
 				<template v-slot="scope">
diff --git a/src/views/asrs/goodSpecification/add-or-updata.vue b/src/views/asrs/goodSpecification/add-or-updata.vue
index 1aefa50..4693749 100644
--- a/src/views/asrs/goodSpecification/add-or-updata.vue
+++ b/src/views/asrs/goodSpecification/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2023-10-11 16:30:10
+ * @LastEditTime: 2025-12-29 14:21:31
  * @Description:
 -->
 <template>
@@ -52,6 +52,15 @@
 						:min="0"></el-input-number>
 				</el-form-item>
 			</el-col>
+			<el-col :span="12">
+				<el-form-item label="数量" prop="planQty">
+					<el-input-number
+						v-model="dataForm.planQty"
+						controls-position="right"
+            :step="1" step-strictly
+						:min="0"></el-input-number>
+				</el-form-item>
+			</el-col>
 			<el-col :span="12">
 				<el-form-item label="是否需要熟化" prop="cure">
 					<el-select
@@ -109,6 +118,7 @@ export default {
 				goodSpecificationName: undefined,
 				specification: undefined,
 				cureTime: undefined,
+        planQty: undefined,
 				cure: 1,
 				deactivate: 1,
 			},
@@ -129,9 +139,6 @@ export default {
 				},
 			],
 			dataRule: {
-				goodSpecificationCode: [
-					{ required: true, message: '产品编码不能为空', trigger: 'blur' },
-				],
 				goodSpecificationName: [
 					{ required: true, message: '产品名称不能为空', trigger: 'blur' },
 				],
diff --git a/src/views/wcsAlarm/real1.vue b/src/views/wcsAlarm/real1.vue
index c30123e..da4f7a4 100644
--- a/src/views/wcsAlarm/real1.vue
+++ b/src/views/wcsAlarm/real1.vue
@@ -2,108 +2,108 @@
  * @Author: zwq
  * @Date: 2024-05-21 14:25:27
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-20 13:32:06
+ * @LastEditTime: 2025-12-31 09:58:18
  * @Description:
 -->
 <template>
 	<div class="main-body">
 		<el-divider content-position="left">堆垛机报警信息</el-divider>
 		<el-row :gutter="20">
-			<el-col v-for="i in 4" :key="i + 'ddj'" :span="6">
+			<el-col v-for="(item,i) in Info.filter(a=>a.name.startsWith('堆垛机'))" :key="i + 'ddj'" :span="6">
 				<el-card class="box-card" style="min-width: 240px">
 					<div slot="header" class="header-card">
 						堆垛机:
 						<div class="info">
-							{{ Info[i - 1].name }}
+							{{ item.name }}
 						</div>
 					</div>
 					<div>
 						报警信息:
 						<div class="info">
-							{{ Info[i - 1].msg }}
+							{{ item.msg }}
 						</div>
 					</div>
 					<div>
 						报警编码:
 						<div class="info">
-							{{ Info[i - 1].code }}
+							{{ item.code }}
 						</div>
 					</div>
-					<div class="blinking-warning" v-if="Info[i - 1].code !== 0" />
+					<div class="blinking-warning" v-if="item.code !== 0" />
 				</el-card>
 			</el-col>
 		</el-row>
 		<el-divider content-position="left">1-2巷道输送线报警信息</el-divider>
-		<el-row :gutter="20" v-for="l in 2" :key="l + 'line1'">
-			<el-col v-for="i in 6" :key="i + 'ssx1'" :span="4">
+		<el-row :gutter="20">
+			<el-col v-for="(item,i) in Info.filter(a=>a.name.startsWith('line3Status'))" :key="i + 'ssx1'" :span="4">
 				<el-card class="box-card" style="min-width: 240px">
 					<div slot="header" class="header-card">
 						输送线:
 						<div class="info">
-							{{ Info[i - 1 + 4 + (l - 1) * 6].name }}
+							{{ item.name }}
 						</div>
 					</div>
 					<div>
 						报警信息:
-						<div class="info">{{ Info[i - 1 + 4 + (l - 1) * 6].msg }}</div>
+						<div class="info">{{ item.msg }}</div>
 					</div>
 					<div>
 						报警编码:
-						<div class="info">{{ Info[i - 1 + 4 + (l - 1) * 6].code }}</div>
+						<div class="info">{{ item.code }}</div>
 					</div>
 					<div
 						class="blinking-warning"
-						v-if="Info[i - 1 + 4 + (l - 1) * 6].code > 30" />
+						v-if="item.code > 30" />
 				</el-card>
 			</el-col>
 		</el-row>
 		<el-divider content-position="left">3-4巷道输送线报警信息</el-divider>
-		<el-row :gutter="20" v-for="l in 2" :key="l + 'line2'">
-			<el-col v-for="i in 6" :key="i + 'ssx2'" :span="4">
+		<el-row :gutter="20">
+			<el-col v-for="(item,i) in Info.filter(a=>a.name.startsWith('line4Status'))" :key="i + 'ssx2'" :span="4">
 				<el-card class="box-card" style="min-width: 240px">
 					<div slot="header" class="header-card">
 						输送线:
 						<div class="info">
-							{{ Info[i - 1 + 4 + (l + 1) * 6].name }}
+							{{ item.name }}
 						</div>
 					</div>
 					<div>
 						报警信息:
-						<div class="info">{{ Info[i - 1 + 4 + (l + 1) * 6].msg }}</div>
+						<div class="info">{{ item.msg }}</div>
 					</div>
 					<div>
 						报警编码:
-						<div class="info">{{ Info[i - 1 + 4 + (l + 1) * 6].code }}</div>
+						<div class="info">{{ item.code }}</div>
 					</div>
 					<div
 						class="blinking-warning"
-						v-if="Info[i - 1 + 4 + (l + 1) * 6].code > 30" />
+						v-if="item.code > 30" />
 				</el-card>
 			</el-col>
 		</el-row>
 		<el-divider content-position="left">检尺门报警信息</el-divider>
 		<el-row :gutter="20">
-			<el-col v-for="i in 4" :key="i + 'jcm'" :span="6">
+			<el-col v-for="(item,i) in Info.filter(a=>a.name.startsWith('line3door')||a.name.startsWith('line4door'))" :key="i + 'jcm'" :span="6">
 				<el-card class="box-card" style="min-width: 240px">
 					<div slot="header" class="header-card">
 						检尺门:
 						<div class="info">
-							{{ Info[i - 1 + 4 + 24].name }}
+							{{ item.name }}
 						</div>
 					</div>
 					<div>
 						报警信息:
 						<div class="info">
-							{{ Info[i - 1 + 4 + 24].msg }}
+							{{ item.msg }}
 						</div>
 					</div>
 					<div>
 						报警编码:
 						<div class="info">
-							{{ Info[i - 1 + 4 + 24].code }}
+							{{ item.code }}
 						</div>
 					</div>
-					<div class="blinking-warning" v-if="Info[i - 1 + 4 + 24].code > 30" />
+					<div class="blinking-warning" v-if="item.code > 30" />
 				</el-card>
 			</el-col>
 		</el-row>
diff --git a/src/views/wcsAlarm/real2.vue b/src/views/wcsAlarm/real2.vue
index 7f8708e..fc42b15 100644
--- a/src/views/wcsAlarm/real2.vue
+++ b/src/views/wcsAlarm/real2.vue
@@ -2,108 +2,108 @@
  * @Author: zwq
  * @Date: 2024-05-21 14:25:27
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-20 13:32:14
+ * @LastEditTime: 2025-12-31 09:33:40
  * @Description:
 -->
 <template>
 	<div class="main-body">
 		<el-divider content-position="left">堆垛机报警信息</el-divider>
 		<el-row :gutter="20">
-			<el-col v-for="i in 4" :key="i + 'ddj'" :span="6">
+			<el-col v-for="(item,i) in Info.filter(a=>a.name.startsWith('堆垛机'))" :key="i + 'ddj'" :span="6">
 				<el-card class="box-card" style="min-width: 240px">
 					<div slot="header" class="header-card">
 						堆垛机:
 						<div class="info">
-							{{ Info[i - 1].name }}
+							{{ item.name }}
 						</div>
 					</div>
 					<div>
 						报警信息:
 						<div class="info">
-							{{ Info[i - 1].msg }}
+							{{ item.msg }}
 						</div>
 					</div>
 					<div>
 						报警编码:
 						<div class="info">
-							{{ Info[i - 1].code }}
+							{{ item.code }}
 						</div>
 					</div>
-					<div class="blinking-warning" v-if="Info[i - 1].code !== 0" />
+					<div class="blinking-warning" v-if="item.code !== 0" />
 				</el-card>
 			</el-col>
 		</el-row>
 		<el-divider content-position="left">1-2巷道输送线报警信息</el-divider>
-		<el-row :gutter="20" v-for="l in 2" :key="l + 'line1'">
-			<el-col v-for="i in 6" :key="i + 'ssx1'" :span="4">
+		<el-row :gutter="20">
+			<el-col v-for="(item,i) in Info.filter(a=>a.name.startsWith('line1Status'))" :key="i + 'ssx1'" :span="4">
 				<el-card class="box-card" style="min-width: 240px">
 					<div slot="header" class="header-card">
 						输送线:
 						<div class="info">
-							{{ Info[i - 1 + 4 + (l - 1) * 6].name }}
+							{{ item.name }}
 						</div>
 					</div>
 					<div>
 						报警信息:
-						<div class="info">{{ Info[i - 1 + 4 + (l - 1) * 6].msg }}</div>
+						<div class="info">{{ item.msg }}</div>
 					</div>
 					<div>
 						报警编码:
-						<div class="info">{{ Info[i - 1 + 4 + (l - 1) * 6].code }}</div>
+						<div class="info">{{ item.code }}</div>
 					</div>
 					<div
 						class="blinking-warning"
-						v-if="Info[i - 1 + 4 + (l - 1) * 6].code > 30" />
+						v-if="item.code > 30" />
 				</el-card>
 			</el-col>
 		</el-row>
 		<el-divider content-position="left">3-4巷道输送线报警信息</el-divider>
-		<el-row :gutter="20" v-for="l in 2" :key="l + 'line2'">
-			<el-col v-for="i in 6" :key="i + 'ssx2'" :span="4">
+		<el-row :gutter="20">
+			<el-col v-for="(item,i) in Info.filter(a=>a.name.startsWith('line2Status'))" :key="i + 'ssx2'" :span="4">
 				<el-card class="box-card" style="min-width: 240px">
 					<div slot="header" class="header-card">
 						输送线:
 						<div class="info">
-							{{ Info[i - 1 + 4 + (l + 1) * 6].name }}
+							{{ item.name }}
 						</div>
 					</div>
 					<div>
 						报警信息:
-						<div class="info">{{ Info[i - 1 + 4 + (l + 1) * 6].msg }}</div>
+						<div class="info">{{ item.msg }}</div>
 					</div>
 					<div>
 						报警编码:
-						<div class="info">{{ Info[i - 1 + 4 + (l + 1) * 6].code }}</div>
+						<div class="info">{{ item.code }}</div>
 					</div>
 					<div
 						class="blinking-warning"
-						v-if="Info[i - 1 + 4 + (l + 1) * 6].code > 30" />
+						v-if="item.code > 30" />
 				</el-card>
 			</el-col>
 		</el-row>
 		<el-divider content-position="left">检尺门报警信息</el-divider>
 		<el-row :gutter="20">
-			<el-col v-for="i in 4" :key="i + 'jcm'" :span="6">
+			<el-col v-for="(item,i) in Info.filter(a=>a.name.startsWith('line1door')||a.name.startsWith('line2door'))" :key="i + 'jcm'" :span="6">
 				<el-card class="box-card" style="min-width: 240px">
 					<div slot="header" class="header-card">
 						检尺门:
 						<div class="info">
-							{{ Info[i - 1 + 4 + 24].name }}
+							{{ item.name }}
 						</div>
 					</div>
 					<div>
 						报警信息:
 						<div class="info">
-							{{ Info[i - 1 + 4 + 24].msg }}
+							{{ item.msg }}
 						</div>
 					</div>
 					<div>
 						报警编码:
 						<div class="info">
-							{{ Info[i - 1 + 4 + 24].code }}
+							{{ item.code }}
 						</div>
 					</div>
-					<div class="blinking-warning" v-if="Info[i - 1 + 4 + 24].code > 30" />
+					<div class="blinking-warning" v-if="item.code > 30" />
 				</el-card>
 			</el-col>
 		</el-row>