From 0ea5ee8fda3b7f5a0a08dffe96d6841cd16c6685 Mon Sep 17 00:00:00 2001
From: zwq <zwq229436@163.com>
Date: Wed, 4 Feb 2026 15:18:17 +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

---
 .env.dev                                      |   4 +-
 .env.prod                                     |   2 +-
 src/api/oth/mainTask.js                       |  16 +++
 src/views/asrs/buyRoll/add-or-updata.vue      |   1 +
 src/views/asrs/delivery/add-or-updatab.vue    |   3 +-
 src/views/asrs/deliveryHis/indexb.vue         |   1 +
 src/views/asrs/dockTransfer/indexb.vue        |   3 +-
 src/views/asrs/jobMainTask/index.vue          |  85 ++++++++-----
 src/views/asrs/jobMainTask/indexb.vue         |  87 ++++++++-----
 .../asrs/warehouseLineMonitoring/indexb.vue   | 119 ++++++++++++------
 .../add-or-updata.vue                         |   1 +
 .../out-or-move.vue                           |   3 +-
 src/views/wcsAlarm/index.vue                  |  18 ++-
 src/views/wcsAlarm/real1.vue                  |   6 +-
 14 files changed, 244 insertions(+), 105 deletions(-)

diff --git a/.env.dev b/.env.dev
index 1b5fc8d..92c1b0d 100644
--- a/.env.dev
+++ b/.env.dev
@@ -2,7 +2,7 @@
  # @Author: zwq
  # @Date: 2023-08-17 15:10:53
  # @LastEditors: zwq
- # @LastEditTime: 2024-12-26 10:55:24
+ # @LastEditTime: 2025-06-20 10:35:36
  # @Description:
 ###
 # 开发环境配置
@@ -13,7 +13,7 @@ VUE_APP_TITLE = 南京锂膜管理系统
 
 # 南京锂膜管理系统/开发环境
 # VUE_APP_BASE_API = 'http://192.168.1.129:48081'
-VUE_APP_BASE_API = 'http://192.168.0.31:48081'
+VUE_APP_BASE_API = 'http://172.16.32.166:48081'
 # VUE_APP_BASE_API = 'http://172.16.32.169:48081'
 
 # 路由懒加载
diff --git a/.env.prod b/.env.prod
index dda5629..f1abeaf 100644
--- a/.env.prod
+++ b/.env.prod
@@ -2,7 +2,7 @@
  # @Author: zwq
  # @Date: 2023-08-17 15:10:53
  # @LastEditors: zwq
- # @LastEditTime: 2024-04-28 11:50:59
+ # @LastEditTime: 2024-08-21 15:54:58
  # @Description:
 ###
 # 生产环境配置
diff --git a/src/api/oth/mainTask.js b/src/api/oth/mainTask.js
index eaf324b..e1cdc95 100644
--- a/src/api/oth/mainTask.js
+++ b/src/api/oth/mainTask.js
@@ -1,3 +1,10 @@
+/*
+ * @Author: zwq
+ * @Date: 2023-09-07 14:01:22
+ * @LastEditors: zwq
+ * @LastEditTime: 2026-01-08 14:54:30
+ * @Description:
+ */
 import request from '@/utils/request'
 
 // 创建主任务
@@ -77,3 +84,12 @@ export function Radd(id) {
     method: 'get'
   })
 }
+
+//上报
+export function SBapi(data) {
+  return request({
+    url: '/asrs/job-main-task/finish',
+    method: 'put',
+    data: data
+  })
+}
diff --git a/src/views/asrs/buyRoll/add-or-updata.vue b/src/views/asrs/buyRoll/add-or-updata.vue
index f2a8252..91dac57 100644
--- a/src/views/asrs/buyRoll/add-or-updata.vue
+++ b/src/views/asrs/buyRoll/add-or-updata.vue
@@ -204,6 +204,7 @@ const regionArrb = [
 	{ name: '手动包装区', id: 23 },
 	{ name: '一次分拣区', id: 22 },
 	{ name: '二次分拣区', id: 20 },
+	{ name: '检验区域', id: 30 },
 ];
 export default {
 	components: { productAttrAdd, SmallTitle },
diff --git a/src/views/asrs/delivery/add-or-updatab.vue b/src/views/asrs/delivery/add-or-updatab.vue
index 5225e34..d06adc9 100644
--- a/src/views/asrs/delivery/add-or-updatab.vue
+++ b/src/views/asrs/delivery/add-or-updatab.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2025-11-26 11:07:40
+ * @LastEditTime: 2026-01-26 09:17:43
  * @Description:
 -->
 <template>
@@ -474,6 +474,7 @@ const regionArr = [
 	{ name: '手动包装区', id: 23 },
 	{ name: '一次分拣区', id: 22 },
 	{ name: '二次分拣区', id: 20 },
+	{ name: '检验区域', id: 30 },
 ];
 export default {
 	mixins: [basicAdd],
diff --git a/src/views/asrs/deliveryHis/indexb.vue b/src/views/asrs/deliveryHis/indexb.vue
index 924fcd6..5e23398 100644
--- a/src/views/asrs/deliveryHis/indexb.vue
+++ b/src/views/asrs/deliveryHis/indexb.vue
@@ -132,6 +132,7 @@ const regionArr = [
 	{ name: '手动包装区', id: 23 },
 	{ name: '一次分拣区', id: 22 },
 	{ name: '二次分拣区', id: 20 },
+	{ name: '检验区域', id: 30 },
 ];
 const region = [
 	'',
diff --git a/src/views/asrs/dockTransfer/indexb.vue b/src/views/asrs/dockTransfer/indexb.vue
index 778e879..c88e445 100644
--- a/src/views/asrs/dockTransfer/indexb.vue
+++ b/src/views/asrs/dockTransfer/indexb.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2024-02-27 14:43:14
  * @LastEditors: zwq
- * @LastEditTime: 2024-12-26 11:47:45
+ * @LastEditTime: 2026-01-26 09:15:27
  * @Description:
 -->
 <template>
@@ -94,6 +94,7 @@ const regionArr = [
 	{ name: '手动包装区', id: 23 },
 	{ name: '一次分拣区', id: 22 },
 	{ name: '二次分拣区', id: 20 },
+	{ name: '检验区域', id: 30 },
 ];
 export default {
 	data() {
diff --git a/src/views/asrs/jobMainTask/index.vue b/src/views/asrs/jobMainTask/index.vue
index faada5c..8df224f 100644
--- a/src/views/asrs/jobMainTask/index.vue
+++ b/src/views/asrs/jobMainTask/index.vue
@@ -14,7 +14,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="80"
+				:width="130"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -41,7 +41,7 @@ import AddOrUpdate from './add-or-updata';
 import basicPage from '../mixins/basic-page';
 import { parseTime } from '../mixins/code-filter';
 import codeFilter from '../mixins/code-filter';
-import { getMainTaskPage, deleteMainTask } from '@/api/oth/mainTask';
+import { getMainTaskPage, deleteMainTask, SBapi } from '@/api/oth/mainTask';
 import point from './point';
 
 const tableProps = [
@@ -299,6 +299,23 @@ export default {
 		if (this.$auth.hasPermi(`asrs:job-main-task:changeXD`)) {
 			this.tableBtn.push(obj);
 		}
+		const obj1 = {
+			type: 'changeSB',
+			btnName: '上报',
+			showParam: {
+				type: '&',
+				data: [
+					{
+						type: 'equal',
+						name: 'mainTaskState',
+						value: 6,
+					},
+				],
+			},
+		};
+		if (this.$auth.hasPermi(`asrs:job-main-task:changeSB`)) {
+			this.tableBtn.push(obj1);
+		}
 		this.setFormConfig();
 	},
 	methods: {
@@ -341,33 +358,43 @@ export default {
 			}
 		},
 		otherMethods(val) {
-			this.addOrEditTitle = '变更巷道';
-			this.addOrUpdateVisible = true;
-			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(val.data.id, val.data.barCode, this.bPage);
-			});
-			// this.$confirm(
-			// 	`确定对${'[任务编码=' + val.data.mainTaskCode + ']'}进行取消操作?`,
-			// 	'提示',
-			// 	{
-			// 		confirmButtonText: '确定',
-			// 		cancelButtonText: '取消',
-			// 		type: 'warning',
-			// 	}
-			// )
-			// 	.then(() => {
-			// 		this.urlOptions.deleteURL(val.data.id).then(({ data }) => {
-			// 			this.$message({
-			// 				message: '操作成功',
-			// 				type: 'success',
-			// 				duration: 1500,
-			// 				onClose: () => {
-			// 					this.getDataList();
-			// 				},
-			// 			});
-			// 		});
-			// 	})
-			// 	.catch(() => {});
+			if (val.type == 'changeXD') {
+				this.addOrEditTitle = '变更巷道';
+				this.addOrUpdateVisible = true;
+				this.$nextTick(() => {
+					this.$refs.addOrUpdate.init(
+						val.data.id,
+						val.data.barCode,
+						this.bPage
+					);
+				});
+			} else {
+				this.$confirm(
+					` 请确认托盘：[托盘编码${val.data.barCode}] 是否到输送线第三段 ?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+            console.log(11111,val.data)
+						SBapi({id:val.data.id}).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getDataList();
+								},
+							});
+						});
+					})
+					.catch(() => {
+            console.log(222222,val.data)
+            });
+			}
 		},
 	},
 };
diff --git a/src/views/asrs/jobMainTask/indexb.vue b/src/views/asrs/jobMainTask/indexb.vue
index 5c6b369..da67ac5 100644
--- a/src/views/asrs/jobMainTask/indexb.vue
+++ b/src/views/asrs/jobMainTask/indexb.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2024-02-27 15:32:56
  * @LastEditors: zwq
- * @LastEditTime: 2025-08-14 15:56:11
+ * @LastEditTime: 2026-01-12 09:26:45
  * @Description:
 -->
 <template>
@@ -21,7 +21,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="80"
+				:width="130"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -48,7 +48,7 @@ import AddOrUpdate from './add-or-updata';
 import basicPage from '../mixins/basic-page';
 import { parseTime } from '../mixins/code-filter';
 import codeFilter from '../mixins/code-filter';
-import { getMainTaskPage, deleteMainTask } from '@/api/oth/mainTask';
+import { getMainTaskPage, deleteMainTask,SBapi } from '@/api/oth/mainTask';
 import point from './point';
 
 const tableProps = [
@@ -307,6 +307,23 @@ export default {
 		if (this.$auth.hasPermi(`asrs:job-main-task:changeXDb`)) {
 			this.tableBtn.push(obj);
 		}
+		const obj1 = {
+			type: 'changeSB',
+			btnName: '上报',
+			showParam: {
+				type: '&',
+				data: [
+					{
+						type: 'equal',
+						name: 'mainTaskState',
+						value: 6,
+					},
+				],
+			},
+		};
+		if (this.$auth.hasPermi(`asrs:job-main-task:changeSBb`)) {
+			this.tableBtn.push(obj1);
+		}
 		this.listQuery.warehouseId = this.bId;
 		this.setFormConfig();
 	},
@@ -350,33 +367,43 @@ export default {
 			}
 		},
 		otherMethods(val) {
-			this.addOrEditTitle = '变更巷道';
-			this.addOrUpdateVisible = true;
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(val.data.id,val.data.barCode,this.bPage);
-      });
-			// this.$confirm(
-			// 	`确定对${'[任务编码=' + val.data.mainTaskCode + ']'}进行取消操作?`,
-			// 	'提示',
-			// 	{
-			// 		confirmButtonText: '确定',
-			// 		cancelButtonText: '取消',
-			// 		type: 'warning',
-			// 	}
-			// )
-			// 	.then(() => {
-			// 		this.urlOptions.deleteURL(val.data.id).then(({ data }) => {
-			// 			this.$message({
-			// 				message: '操作成功',
-			// 				type: 'success',
-			// 				duration: 1500,
-			// 				onClose: () => {
-			// 					this.getDataList();
-			// 				},
-			// 			});
-			// 		});
-			// 	})
-			// 	.catch(() => {});
+			if (val.type == 'changeXD') {
+				this.addOrEditTitle = '变更巷道';
+				this.addOrUpdateVisible = true;
+				this.$nextTick(() => {
+					this.$refs.addOrUpdate.init(
+						val.data.id,
+						val.data.barCode,
+						this.bPage
+					);
+				});
+			} else {
+				this.$confirm(
+					` 请确认托盘：[托盘编码${val.data.barCode}] 是否到输送线第三段 ?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+            console.log(111112222,val.data)
+						SBapi({id:val.data.id}).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getDataList();
+								},
+							});
+						});
+					})
+					.catch(() => {
+            console.log(222222,val.data)
+            });
+			}
 		},
 	},
 };
diff --git a/src/views/asrs/warehouseLineMonitoring/indexb.vue b/src/views/asrs/warehouseLineMonitoring/indexb.vue
index 4a6c9e1..bd843bc 100644
--- a/src/views/asrs/warehouseLineMonitoring/indexb.vue
+++ b/src/views/asrs/warehouseLineMonitoring/indexb.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2024-01-17 09:58:41
  * @LastEditors: zwq
- * @LastEditTime: 2025-06-20 10:54:21
+ * @LastEditTime: 2026-01-15 14:17:36
  * @Description:
 -->
 <template>
@@ -349,42 +349,89 @@
 					</el-popover>
 				</div>
 			</el-row>
-			<el-divider class="divider" content-position="left">
-				二次分切区
-			</el-divider>
-			<el-row style="margin-bottom: 10px" type="flex" class="flex-warp">
-				<div
-					class="dashboard-layout-item interval"
-					v-for="j in wareData.filter((item) => item.region == 28).reverse()"
-					:key="j.id"
-					:title="j.lineEdgeLibraryCode">
-					<el-popover
-						placement="top-start"
-						:title="j.lineEdgeLibraryCode"
-						width="200"
-						trigger="hover">
-						<div class="point" />
-						托盘编码: {{ j.trayCode }}
-						<br />
-						<div class="point" />
-						Agv地码: {{ j.agvGroundCode }}
-						<br />
-						<el-button
-							@click="lState(j.id)"
-							v-hasPermi="['asrs:warehouse-line-monitoring:change']"
-							type="text">
-							改变库位状态
-						</el-button>
+			<el-row :gutter="20">
+				<el-col :span="14">
+					<el-divider class="divider" content-position="left">
+						二次分切区
+					</el-divider>
+					<el-row style="margin-bottom: 10px" type="flex" class="flex-warp">
 						<div
-							slot="reference"
-							class="hoverDiv"
-							:style="{
-								cursor:
-									j.lineEdgeLibraryState === 1 ? 'not-allowed' : 'pointer',
-								background: bgColor[j.lineEdgeLibraryState],
-							}"></div>
-					</el-popover>
-				</div>
+							class="dashboard-layout-item interval"
+							v-for="j in wareData
+								.filter((item) => item.region == 28)
+								.reverse()"
+							:key="j.id"
+							:title="j.lineEdgeLibraryCode">
+							<el-popover
+								placement="top-start"
+								:title="j.lineEdgeLibraryCode"
+								width="200"
+								trigger="hover">
+								<div class="point" />
+								托盘编码: {{ j.trayCode }}
+								<br />
+								<div class="point" />
+								Agv地码: {{ j.agvGroundCode }}
+								<br />
+								<el-button
+									@click="lState(j.id)"
+									v-hasPermi="['asrs:warehouse-line-monitoring:change']"
+									type="text">
+									改变库位状态
+								</el-button>
+								<div
+									slot="reference"
+									class="hoverDiv"
+									:style="{
+										cursor:
+											j.lineEdgeLibraryState === 1 ? 'not-allowed' : 'pointer',
+										background: bgColor[j.lineEdgeLibraryState],
+									}"></div>
+							</el-popover>
+						</div>
+					</el-row>
+				</el-col>
+				<el-col :span="10">
+					<el-divider class="divider" content-position="left">
+						检验区
+					</el-divider>
+					<el-row style="margin-bottom: 10px" type="flex" class="flex-warp">
+						<div
+							class="dashboard-layout-item"
+							v-for="j in wareData
+								.filter((item) => item.region == 30)
+								.reverse()"
+							:key="j.id"
+							:title="j.lineEdgeLibraryCode">
+							<el-popover
+								placement="top-start"
+								:title="j.lineEdgeLibraryCode"
+								width="200"
+								trigger="hover">
+								<div class="point" />
+								托盘编码: {{ j.trayCode }}
+								<br />
+								<div class="point" />
+								Agv地码: {{ j.agvGroundCode }}
+								<br />
+								<el-button
+									@click="lState(j.id)"
+									v-hasPermi="['asrs:warehouse-line-monitoring:change']"
+									type="text">
+									改变库位状态
+								</el-button>
+								<div
+									slot="reference"
+									class="hoverDiv"
+									:style="{
+										cursor:
+											j.lineEdgeLibraryState === 1 ? 'not-allowed' : 'pointer',
+										background: bgColor[j.lineEdgeLibraryState],
+									}"></div>
+							</el-popover>
+						</div>
+					</el-row>
+				</el-col>
 			</el-row>
 			<el-divider class="divider" content-position="left">涂覆区</el-divider>
 			<div v-for="i in 8" :key="i + 'C'">
diff --git a/src/views/asrs/warehouseStorehouseStorage/add-or-updata.vue b/src/views/asrs/warehouseStorehouseStorage/add-or-updata.vue
index 50dc6eb..54d2a4f 100644
--- a/src/views/asrs/warehouseStorehouseStorage/add-or-updata.vue
+++ b/src/views/asrs/warehouseStorehouseStorage/add-or-updata.vue
@@ -246,6 +246,7 @@ const regionArrb = [
 	{ name: '手动包装区', id: 23 },
 	{ name: '一次分拣区', id: 22 },
 	{ name: '二次分拣区', id: 20 },
+	{ name: '检验区域', id: 30 },
 ];
 export default {
 	components: { productAttrAdd, SmallTitle },
diff --git a/src/views/asrs/warehouseStorehouseStorage/out-or-move.vue b/src/views/asrs/warehouseStorehouseStorage/out-or-move.vue
index de38b17..d82ecef 100644
--- a/src/views/asrs/warehouseStorehouseStorage/out-or-move.vue
+++ b/src/views/asrs/warehouseStorehouseStorage/out-or-move.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2024-12-26 14:38:40
+ * @LastEditTime: 2026-01-26 09:17:33
  * @Description:
 -->
 <template>
@@ -135,6 +135,7 @@ const regionArrb = [
 	{ name: '手动包装区', id: 23 },
 	{ name: '一次分拣区', id: 22 },
 	{ name: '二次分拣区', id: 20 },
+	{ name: '检验区域', id: 30 },
 ];
 export default {
 	mixins: [basicAdd],
diff --git a/src/views/wcsAlarm/index.vue b/src/views/wcsAlarm/index.vue
index d104668..97e602d 100644
--- a/src/views/wcsAlarm/index.vue
+++ b/src/views/wcsAlarm/index.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2024-04-22 09:48:26
  * @LastEditors: zwq
- * @LastEditTime: 2024-04-22 10:35:01
+ * @LastEditTime: 2026-01-12 09:05:00
  * @Description:
 -->
 <template>
@@ -71,6 +71,22 @@ const stackerArr = [
 		name: 'DDJ4',
 		id: 4,
 	},
+	{
+		name: 'DDJ5',
+		id: 5,
+	},
+	{
+		name: 'DDJ6',
+		id: 6,
+	},
+	{
+		name: 'DDJ7',
+		id: 7,
+	},
+	{
+		name: 'DDJ8',
+		id: 8,
+	},
 ];
 export default {
   mixins: [basicPage],
diff --git a/src/views/wcsAlarm/real1.vue b/src/views/wcsAlarm/real1.vue
index da4f7a4..35c565d 100644
--- a/src/views/wcsAlarm/real1.vue
+++ b/src/views/wcsAlarm/real1.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2024-05-21 14:25:27
  * @LastEditors: zwq
- * @LastEditTime: 2025-12-31 09:58:18
+ * @LastEditTime: 2026-01-15 14:09:03
  * @Description:
 -->
 <template>
@@ -33,7 +33,7 @@
 				</el-card>
 			</el-col>
 		</el-row>
-		<el-divider content-position="left">1-2巷道输送线报警信息</el-divider>
+		<el-divider content-position="left">5-6巷道输送线报警信息</el-divider>
 		<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">
@@ -57,7 +57,7 @@
 				</el-card>
 			</el-col>
 		</el-row>
-		<el-divider content-position="left">3-4巷道输送线报警信息</el-divider>
+		<el-divider content-position="left">7-8巷道输送线报警信息</el-divider>
 		<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">