diff --git a/src/api/oth/delivery.js b/src/api/oth/delivery.js
index 4986eb4..4a474d6 100644
--- a/src/api/oth/delivery.js
+++ b/src/api/oth/delivery.js
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2024-04-16 15:08:37
  * @LastEditors: zwq
- * @LastEditTime: 2024-07-15 13:42:39
+ * @LastEditTime: 2025-11-26 11:15:22
  * @Description:
  */
 import request from '@/utils/request'
@@ -122,7 +122,8 @@ export function exportDeliveryHisExcel(query) {
     url: '/asrs/delivery-history-product/export-excel',
     method: 'get',
     params: query,
-    responseType: 'blob'
+    responseType: 'blob',
+    timeout: 60000,
   })
 }
 
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 65c1826..dda7f2a 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -129,7 +129,7 @@ export default {
 			this.timer = null;
 			this.timer = setInterval(() => {
 				this.getRealAlarm();
-			}, 10000);
+			}, 20000);
 		},
 		getRealAlarm() {
 			axios
diff --git a/src/views/asrs/buyRoll/index.vue b/src/views/asrs/buyRoll/index.vue
index 7e9f24a..fcbf6ff 100644
--- a/src/views/asrs/buyRoll/index.vue
+++ b/src/views/asrs/buyRoll/index.vue
@@ -5,20 +5,98 @@
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
-		<base-table
+		<el-table
+			:data="tableData"
+			:header-cell-style="{
+				background: '#F2F4F9',
+				color: '#606266',
+			}"
+			border
 			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="80"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
+			style="width: 100%"
+			ref="dataList">
+			<el-table-column type="expand">
+				<template slot-scope="scope">
+					<product
+						:warehouse-id="listQuery.warehouseId"
+						:warehouseStorehouseStorageId="
+							scope.row.warehouseStorehouseStorageId
+						"></product>
+				</template>
+			</el-table-column>
+			<el-table-column prop="mainTaskCode" label="任务编码" width="155" />
+			<el-table-column prop="inOutWarehouseName" label="出入移库库位" />
+			<el-table-column prop="relocationWarehouseName" label="移库终点库位" />
+			<el-table-column prop="mainTaskType" label="任务类型" width="100">
+				<template slot-scope="scope">
+					<span>
+						{{
+							{
+								1: '入库',
+								2: '出库',
+								3: '移库',
+								4: '出库+移库',
+								5: '不带agv入库',
+								6: '不带agv出库',
+								7: '入库+6臂空托盘出库',
+								8: '不带agv出库+移库',
+								9: '入库+12臂空托盘出库',
+								10: '平库移库',
+								11: '盘库出库',
+								12: '盘库入库',
+								13: '盘库出库+移库',
+							}[scope.row.mainTaskType]
+						}}
+					</span>
+				</template>
+			</el-table-column>
+			<el-table-column prop="stacker" label="堆垛机" />
+			<el-table-column prop="barCode" label="托盘编码" />
+			<el-table-column prop="agv" label="agv" />
+			<el-table-column prop="agvStartPoint" label="AGV起点" />
+			<el-table-column prop="agvEndPoint" label="AGV终点" />
+			<el-table-column prop="mainTaskState" label="状态">
+				<template slot-scope="scope">
+					{{
+						{
+							0: '开始',
+							1: '已发送agv',
+							2: 'agv运行中',
+							3: '已发送堆垛机',
+							4: '堆垛机运行中',
+							5: '完成',
+							6: '已发送传输线',
+							7: '传输线运行中',
+							8: '暂时无空托盘',
+						}[scope.row.mainTaskState]
+					}}
+					<el-button
+						v-if="scope.row.mainTaskState === 8"
+						type="text"
+						size="mini"
+						@click="Radd()">
+						重补
+					</el-button>
+				</template>
+			</el-table-column>
+			<el-table-column prop="taskSource" label="任务来源">
+				<template slot-scope="scope">
+					{{
+						{
+							1: 'mes下发',
+							2: 'wms手动',
+							3: '自动包装线',
+							4: 'wms外购',
+						}[scope.row.taskSource]
+					}}
+				</template>
+			</el-table-column>
+			<el-table-column prop="createTime" label="创建时间" width="150">
+				<template v-slot="scope">
+					<span>{{ parseTime(scope.row.createTime) }}</span>
+				</template>
+			</el-table-column>
+		</el-table>
 		<pagination
 			:limit.sync="listQuery.pageSize"
 			:page.sync="listQuery.pageNo"
@@ -33,71 +111,15 @@
 </template>
 
 <script>
+import product from './product-mini';
 import drawerAdd from './add-or-updata.vue';
 import basicPage from '../mixins/basic-page';
 import { parseTime } from '../mixins/code-filter';
 import codeFilter from '../mixins/code-filter';
 import { getMainTaskHistoryPage } from '@/api/oth/mainTaskHistory';
+import { Radd } from '@/api/oth/mainTask';
 import point from './point';
 
-const tableProps = [
-	{
-		prop: 'mainTaskCode',
-		label: '任务编码',
-	},
-	{
-		prop: 'inOutWarehouseName',
-		label: '出入移库库位',
-	},
-	{
-		prop: 'relocationWarehouseName',
-		label: '移库终点库位',
-	},
-	{
-		prop: 'mainTaskType',
-		label: '任务类型',
-		filter: codeFilter('mainTaskType'),
-		width: 100,
-	},
-	{
-		prop: 'stacker',
-		label: '堆垛机',
-		width: 110,
-	},
-	{
-		prop: 'barCode',
-		label: '托盘编码',
-	},
-	{
-		prop: 'agv',
-		label: 'agv',
-	},
-	{
-		prop: 'agvStartPoint',
-		label: 'AGV起点',
-	},
-	{
-		prop: 'agvEndPoint',
-		label: 'AGV终点',
-	},
-	{
-		prop: 'mainTaskState',
-		label: '状态',
-		subcomponent: point,
-	},
-	{
-		prop: 'taskSource',
-		label: '任务来源',
-		filter: codeFilter('taskSourceBuyIn'),
-		width: 100,
-	},
-	{
-		prop: 'createTime',
-		label: '创建时间',
-		filter: parseTime,
-		width: 150,
-	},
-];
 const mainTaskType = [
 	{
 		name: '入库',
@@ -194,6 +216,7 @@ export default {
 	mixins: [basicPage],
 	components: {
 		drawerAdd,
+		product,
 	},
 	data() {
 		return {
@@ -207,13 +230,6 @@ export default {
 				total: 1,
 			},
 			drawerVisible: false,
-			tableProps,
-			tableBtn: [
-				// {
-				// 	type: 'canlce',
-				// 	btnName: '取消',
-				// },
-			],
 			tableData: [],
 			formConfig: [
 				{
@@ -285,7 +301,7 @@ export default {
 		};
 	},
 	created() {
-    this.listQuery.taskSource = 4;
+		this.listQuery.taskSource = 4;
 		this.setFormConfig();
 	},
 	methods: {
@@ -334,6 +350,15 @@ export default {
 					console.log(val);
 			}
 		},
+		Radd() {
+			Radd(this.injectData.id).then((response) => {
+				this.$message({
+					message: '操作成功',
+					type: 'success',
+					duration: 1500,
+				});
+			});
+		},
 		otherMethods(val) {
 			this.$confirm(
 				`确定对${'[任务编码=' + val.data.mainTaskCode + ']'}进行取消操作?`,
diff --git a/src/views/asrs/buyRoll/indexb.vue b/src/views/asrs/buyRoll/indexb.vue
index 79e1be2..6e2e4cf 100644
--- a/src/views/asrs/buyRoll/indexb.vue
+++ b/src/views/asrs/buyRoll/indexb.vue
@@ -5,20 +5,98 @@
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
-		<base-table
+		<el-table
+			:data="tableData"
+			:header-cell-style="{
+				background: '#F2F4F9',
+				color: '#606266',
+			}"
+			border
 			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="80"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
+			style="width: 100%"
+			ref="dataList">
+			<el-table-column type="expand">
+				<template slot-scope="scope">
+					<product
+						:warehouse-id="listQuery.warehouseId"
+						:warehouseStorehouseStorageId="
+							scope.row.warehouseStorehouseStorageId
+						"></product>
+				</template>
+			</el-table-column>
+			<el-table-column prop="mainTaskCode" label="任务编码" width="155" />
+			<el-table-column prop="inOutWarehouseName" label="出入移库库位" />
+			<el-table-column prop="relocationWarehouseName" label="移库终点库位" />
+			<el-table-column prop="mainTaskType" label="任务类型" width="100">
+				<template slot-scope="scope">
+					<span>
+						{{
+							{
+								1: '入库',
+								2: '出库',
+								3: '移库',
+								4: '出库+移库',
+								5: '不带agv入库',
+								6: '不带agv出库',
+								7: '入库+6臂空托盘出库',
+								8: '不带agv出库+移库',
+								9: '入库+12臂空托盘出库',
+								10: '平库移库',
+								11: '盘库出库',
+								12: '盘库入库',
+								13: '盘库出库+移库',
+							}[scope.row.mainTaskType]
+						}}
+					</span>
+				</template>
+			</el-table-column>
+			<el-table-column prop="stacker" label="堆垛机" />
+			<el-table-column prop="barCode" label="托盘编码" />
+			<el-table-column prop="agv" label="agv" />
+			<el-table-column prop="agvStartPoint" label="AGV起点" />
+			<el-table-column prop="agvEndPoint" label="AGV终点" />
+			<el-table-column prop="mainTaskState" label="状态">
+				<template slot-scope="scope">
+					{{
+						{
+							0: '开始',
+							1: '已发送agv',
+							2: 'agv运行中',
+							3: '已发送堆垛机',
+							4: '堆垛机运行中',
+							5: '完成',
+							6: '已发送传输线',
+							7: '传输线运行中',
+							8: '暂时无空托盘',
+						}[scope.row.mainTaskState]
+					}}
+					<el-button
+						v-if="scope.row.mainTaskState === 8"
+						type="text"
+						size="mini"
+						@click="Radd()">
+						重补
+					</el-button>
+				</template>
+			</el-table-column>
+			<el-table-column prop="taskSource" label="任务来源">
+				<template slot-scope="scope">
+					{{
+						{
+							1: 'mes下发',
+							2: 'wms手动',
+							3: '自动包装线',
+							4: 'wms外购',
+						}[scope.row.taskSource]
+					}}
+				</template>
+			</el-table-column>
+			<el-table-column prop="createTime" label="创建时间" width="150">
+				<template v-slot="scope">
+					<span>{{ parseTime(scope.row.createTime) }}</span>
+				</template>
+			</el-table-column>
+		</el-table>
 		<pagination
 			:limit.sync="listQuery.pageSize"
 			:page.sync="listQuery.pageNo"
@@ -33,71 +111,15 @@
 </template>
 
 <script>
+import product from './product-mini';
 import drawerAdd from './add-or-updata.vue';
 import basicPage from '../mixins/basic-page';
 import { parseTime } from '../mixins/code-filter';
 import codeFilter from '../mixins/code-filter';
 import { getMainTaskHistoryPage } from '@/api/oth/mainTaskHistory';
+import { Radd } from '@/api/oth/mainTask';
 import point from './point';
 
-const tableProps = [
-	{
-		prop: 'mainTaskCode',
-		label: '任务编码',
-	},
-	{
-		prop: 'inOutWarehouseName',
-		label: '出入移库库位',
-	},
-	{
-		prop: 'relocationWarehouseName',
-		label: '移库终点库位',
-	},
-	{
-		prop: 'mainTaskType',
-		label: '任务类型',
-		filter: codeFilter('mainTaskType'),
-		width: 100,
-	},
-	{
-		prop: 'stacker',
-		label: '堆垛机',
-		width: 110,
-	},
-	{
-		prop: 'barCode',
-		label: '托盘编码',
-	},
-	{
-		prop: 'agv',
-		label: 'agv',
-	},
-	{
-		prop: 'agvStartPoint',
-		label: 'AGV起点',
-	},
-	{
-		prop: 'agvEndPoint',
-		label: 'AGV终点',
-	},
-	{
-		prop: 'mainTaskState',
-		label: '状态',
-		subcomponent: point,
-	},
-	{
-		prop: 'taskSource',
-		label: '任务来源',
-		filter: codeFilter('taskSourceBuyIn'),
-		width: 100,
-	},
-	{
-		prop: 'createTime',
-		label: '创建时间',
-		filter: parseTime,
-		width: 150,
-	},
-];
 const mainTaskType = [
 	{
 		name: '入库',
@@ -194,6 +216,7 @@ export default {
 	mixins: [basicPage],
 	components: {
 		drawerAdd,
+    product
 	},
 	data() {
 		return {
@@ -207,13 +230,6 @@ export default {
 				total: 1,
 			},
 			drawerVisible: false,
-			tableProps,
-			tableBtn: [
-				// {
-				// 	type: 'canlce',
-				// 	btnName: '取消',
-				// },
-			],
 			tableData: [],
 			formConfig: [
 				{
@@ -285,8 +301,8 @@ export default {
 		};
 	},
 	created() {
-    this.listQuery.warehouseId = this.bId
-	this.listQuery.taskSource = 4;
+		this.listQuery.warehouseId = this.bId;
+		this.listQuery.taskSource = 4;
 		this.setFormConfig();
 	},
 	methods: {
@@ -335,6 +351,15 @@ export default {
 					console.log(val);
 			}
 		},
+		Radd() {
+			Radd(this.injectData.id).then((response) => {
+				this.$message({
+					message: '操作成功',
+					type: 'success',
+					duration: 1500,
+				});
+			});
+		},
 		otherMethods(val) {
 			this.$confirm(
 				`确定对${'[任务编码=' + val.data.mainTaskCode + ']'}进行取消操作?`,
diff --git a/src/views/asrs/buyRoll/product-mini.vue b/src/views/asrs/buyRoll/product-mini.vue
new file mode 100644
index 0000000..7e0dbbe
--- /dev/null
+++ b/src/views/asrs/buyRoll/product-mini.vue
@@ -0,0 +1,84 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-24 14:47:58
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-26 14:07:19
+ * @Description:
+-->
+<template>
+	<div>
+	<!-- <div class="app-container"> -->
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+      max-height="200"
+			:table-data="tableData" />
+      </div>
+</template>
+
+<script>
+import basicPage from '../mixins/basic-page';
+import { parseTime } from '../mixins/code-filter';
+import codeFilter from '../mixins/code-filter';
+
+import {
+	getWarehouseStorehouseStorageGoodsSpecificationPage,
+} from '@/api/asrs/warehouseStorehouseStorageGoodsSpecification';
+
+
+const tableProps = [
+	{
+		prop: 'goodSpecificationName',
+		label: '产品名',
+	},
+	{
+		prop: 'rollCode',
+		label: '膜卷编码',
+	},
+	{
+		prop: 'specification',
+		label: '产品规格',
+		filter: codeFilter('specification'),
+	},
+	{
+		prop: 'number',
+		label: '数量',
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	props: {
+    warehouseId: {
+			type: String,
+			default: '',
+		},
+    warehouseStorehouseStorageId: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getWarehouseStorehouseStorageGoodsSpecificationPage,
+			},
+			tableProps,
+			tableData: [],
+      listQuery: {
+        pageSize: 100,
+        pageNo: 1,
+        total: 1,
+        warehouseId:this.warehouseId,
+        warehouseStorehouseStorageId:this.warehouseStorehouseStorageId,
+      },
+		};
+	},
+	components: {
+	},
+	created() {
+  },
+	methods: {
+	},
+};
+</script>
diff --git a/src/views/asrs/delivery/add-or-updata.vue b/src/views/asrs/delivery/add-or-updata.vue
index 499435e..bab8091 100644
--- a/src/views/asrs/delivery/add-or-updata.vue
+++ b/src/views/asrs/delivery/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2025-08-14 09:47:56
+ * @LastEditTime: 2025-11-26 11:08:44
  * @Description:
 -->
 <template>
@@ -12,7 +12,8 @@
 			:rules="dataRule"
 			ref="dataForm"
 			@keyup.enter.native="dataFormSubmit()"
-			label-width="100px">
+			label-width="100px"
+			label-position="top">
 			<el-row :gutter="15">
 				<el-col :span="12">
 					<el-form-item label="出库单号" prop="deliveryCode">
@@ -177,6 +178,14 @@
 							placeholder="请输入申请人" />
 					</el-form-item>
 				</el-col>
+				<el-col :span="12" v-if="dataForm.deliveryType === 3">
+					<el-form-item label="出库事由" prop="outwhy">
+						<el-input
+							v-model="dataForm.outwhy"
+							clearable
+							placeholder="请输入出库事由" />
+					</el-form-item>
+				</el-col>
 				<div v-if="dataForm.deliveryType === 3">
 					<el-table
 						:data="tableData"
@@ -246,6 +255,11 @@
 								</span>
 							</template>
 						</el-table-column>
+						<el-table-column property="freeze" label="是否冻结" width="80">
+							<template v-slot="scope">
+								<span>{{ scope.row.freeze == 1 ? '冻结' : '否' }}</span>
+							</template>
+						</el-table-column>
 						<el-table-column fixed="right" label="操作" width="50">
 							<template slot-scope="scope">
 								<el-button
@@ -369,7 +383,7 @@
 				element-loading-spinner="el-icon-loading"
 				element-loading-background="rgba(0, 0, 0, 0.8)">
 				<el-table-column type="index" fixed="left" label="#" align="center" />
-				<el-table-column label="" width="40">
+				<el-table-column label="" width="40" fixed="left">
 					<template slot-scope="scope">
 						<i
 							class="el-icon-plus"
@@ -377,21 +391,45 @@
 							style="color: #409eff; cursor: pointer; font-weight: bolder" />
 					</template>
 				</el-table-column>
-				<el-table-column property="trayCode" label="托盘编码" width="80" />
-				<el-table-column property="productCode" label="物料编码" width="120" />
-				<el-table-column property="description" label="物料名称" />
+				<el-table-column
+					property="trayCode"
+					fixed="left"
+					label="托盘编码"
+					width="80" />
+				<el-table-column
+					property="productCode"
+					fixed="left"
+					label="物料编码"
+					width="120" />
+				<el-table-column
+					property="description"
+					fixed="left"
+					label="物料名称"
+					show-overflow-tooltip
+					width="200" />
 				<el-table-column property="planQty" label="数量" width="80" />
 				<el-table-column property="grade" label="货物品质" width="80" />
 				<el-table-column property="cpGrade" label="初判等级" width="80" />
 				<el-table-column property="fpGrade" label="复判等级" width="80" />
-				<el-table-column property="inventory" label="膜卷号" width="160" />
+				<el-table-column property="inventory" label="膜卷号" width="168" />
+				<el-table-column property="freeze" label="是否冻结" width="80">
+					<template v-slot="scope">
+						<span>{{ scope.row.freeze == 1 ? '冻结' : '否' }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column property="freezeType" label="冻结类型" width="80" />
+				<el-table-column
+					property="freezeNote"
+					label="冻结备注"
+					show-overflow-tooltip
+					width="80" />
 				<el-table-column property="process" label="工序" width="80" />
-				<el-table-column property="createTime" label="入库时间" width="160">
+				<el-table-column property="createTime" label="入库时间" width="150">
 					<template v-slot="scope">
 						<span>{{ parseTime(scope.row.createTime) }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column property="finishTime" label="完成日期" width="160">
+				<el-table-column property="finishTime" label="完成日期" width="150">
 					<template v-slot="scope">
 						<span>{{ parseTime(scope.row.finishTime) }}</span>
 					</template>
@@ -461,6 +499,7 @@ export default {
 				workOrder: null,
 				department: null,
 				applicant: null,
+				outwhy: null,
 				process: null,
 			},
 			listQuery: {
@@ -521,6 +560,9 @@ export default {
 				applicant: [
 					{ required: true, message: '申请人不能为空', trigger: 'blur' },
 				],
+				outwhy: [
+					{ required: true, message: '出库事由不能为空', trigger: 'blur' },
+				],
 			},
 		};
 	},
@@ -624,6 +666,7 @@ export default {
 					);
 					this.$set(this.tableData[this.trayIndex], 'process', val.process);
 					this.$set(this.tableData[this.trayIndex], 'earlyTime', 0);
+					this.$set(this.tableData[this.trayIndex], 'freeze', val.freeze);
 				} else {
 					this.$confirm('该货物不是完成日期最早货物，是否选择出库?', '提示', {
 						confirmButtonText: '确定',
@@ -654,6 +697,7 @@ export default {
 							);
 							this.$set(this.tableData[this.trayIndex], 'process', val.process);
 							this.$set(this.tableData[this.trayIndex], 'earlyTime', 1);
+							this.$set(this.tableData[this.trayIndex], 'freeze', val.freeze);
 						})
 						.catch(() => {
 							return;
@@ -718,6 +762,7 @@ export default {
 						item.deliveryCode = this.dataForm.deliveryCode;
 						item.department = this.dataForm.department;
 						item.applicant = this.dataForm.applicant;
+						item.outwhy = this.dataForm.outwhy;
 						item.warehouseId = this.aId;
 						item.deliveryType = 3;
 						item.needTrayNumber = 1;
diff --git a/src/views/asrs/delivery/add-or-updatab.vue b/src/views/asrs/delivery/add-or-updatab.vue
index cbfc548..5225e34 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-08-14 09:33:21
+ * @LastEditTime: 2025-11-26 11:07:40
  * @Description:
 -->
 <template>
@@ -12,7 +12,8 @@
 			:rules="dataRule"
 			ref="dataForm"
 			@keyup.enter.native="dataFormSubmit()"
-			label-width="100px">
+			label-width="100px"
+			label-position="top">
 			<el-row :gutter="15">
 				<el-col :span="12">
 					<el-form-item label="出库单号" prop="deliveryCode">
@@ -177,6 +178,14 @@
 							placeholder="请输入申请人" />
 					</el-form-item>
 				</el-col>
+				<el-col :span="12" v-if="dataForm.deliveryType === 3">
+					<el-form-item label="出库事由" prop="outwhy">
+						<el-input
+							v-model="dataForm.outwhy"
+							clearable
+							placeholder="请输入出库事由" />
+					</el-form-item>
+				</el-col>
 				<div v-if="dataForm.deliveryType === 3">
 					<el-table
 						:data="tableData"
@@ -214,7 +223,11 @@
 							<template slot-scope="scope">
 								<span>
 									{{
-										scope.row.region ? regionArr.filter(item=>{return item.id===scope.row.region})[0].name: ''
+										scope.row.region
+											? regionArr.filter((item) => {
+													return item.id === scope.row.region;
+											  })[0].name
+											: ''
 									}}
 								</span>
 							</template>
@@ -236,10 +249,21 @@
 						<el-table-column prop="earlyTime" label="最早时间">
 							<template slot-scope="scope">
 								<span>
-									{{ scope.row.earlyTime?scope.row.earlyTime == 0 ? '是' : '否':'' }}
+									{{
+										scope.row.earlyTime
+											? scope.row.earlyTime == 0
+												? '是'
+												: '否'
+											: ''
+									}}
 								</span>
 							</template>
 						</el-table-column>
+						<el-table-column property="freeze" label="是否冻结" width="80">
+							<template v-slot="scope">
+								<span>{{ scope.row.freeze == 1 ? '冻结' : '否' }}</span>
+							</template>
+						</el-table-column>
 						<el-table-column fixed="right" label="操作" width="50">
 							<template slot-scope="scope">
 								<el-button
@@ -315,7 +339,10 @@
 						clearable />
 				</el-form-item>
 				<el-form-item label="数量" prop="planQty">
-					<el-input v-model="listQuery.planQty" clearable placeholder="请输入数量" />
+					<el-input
+						v-model="listQuery.planQty"
+						clearable
+						placeholder="请输入数量" />
 				</el-form-item>
 				<el-form-item label="当日工单" prop="todayOrder">
 					<el-input
@@ -360,7 +387,7 @@
 				element-loading-spinner="el-icon-loading"
 				element-loading-background="rgba(0, 0, 0, 0.8)">
 				<el-table-column type="index" fixed="left" label="#" align="center" />
-				<el-table-column label="" width="40">
+				<el-table-column label="" width="40" fixed="left">
 					<template slot-scope="scope">
 						<i
 							class="el-icon-plus"
@@ -368,21 +395,45 @@
 							style="color: #409eff; cursor: pointer; font-weight: bolder" />
 					</template>
 				</el-table-column>
-				<el-table-column property="trayCode" label="托盘编码" width="80" />
-				<el-table-column property="productCode" label="物料编码" width="120" />
-				<el-table-column property="description" label="物料名称" />
+				<el-table-column
+					property="trayCode"
+					fixed="left"
+					label="托盘编码"
+					width="80" />
+				<el-table-column
+					property="productCode"
+					fixed="left"
+					label="物料编码"
+					width="120" />
+				<el-table-column
+					property="description"
+					fixed="left"
+					label="物料名称"
+					show-overflow-tooltip
+					width="200" />
 				<el-table-column property="planQty" label="数量" width="80" />
 				<el-table-column property="grade" label="货物品质" width="80" />
 				<el-table-column property="cpGrade" label="初判等级" width="80" />
 				<el-table-column property="fpGrade" label="复判等级" width="80" />
 				<el-table-column property="inventory" label="膜卷号" width="160" />
+				<el-table-column property="freeze" label="是否冻结" width="80">
+					<template v-slot="scope">
+						<span>{{ scope.row.freeze == 1 ? '冻结' : '否' }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column property="freezeType" label="冻结类型" width="80" />
+				<el-table-column
+					property="freezeNote"
+					label="冻结备注"
+					show-overflow-tooltip
+					width="80" />
 				<el-table-column property="process" label="工序" width="80" />
-				<el-table-column property="createTime" label="入库时间" width="160">
+				<el-table-column property="createTime" label="入库时间" width="150">
 					<template v-slot="scope">
 						<span>{{ parseTime(scope.row.createTime) }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column property="finishTime" label="完成日期" width="160">
+				<el-table-column property="finishTime" label="完成日期" width="150">
 					<template v-slot="scope">
 						<span>{{ parseTime(scope.row.finishTime) }}</span>
 					</template>
@@ -405,7 +456,7 @@ import {
 	getDelivery,
 	getCode,
 	createDeliveryList,
-  checkGoods
+	checkGoods,
 } from '@/api/oth/delivery';
 import { getPage } from '@/api/oth/rollMessage';
 import { getLineList } from '@/api/asrs/warehouseStorehouse';
@@ -452,6 +503,7 @@ export default {
 				workOrder: null,
 				department: null,
 				applicant: null,
+				outwhy: null,
 				process: null,
 			},
 			listQuery: {
@@ -512,6 +564,9 @@ export default {
 				applicant: [
 					{ required: true, message: '申请人不能为空', trigger: 'blur' },
 				],
+				outwhy: [
+					{ required: true, message: '出库事由不能为空', trigger: 'blur' },
+				],
 			},
 		};
 	},
@@ -594,6 +649,7 @@ export default {
 				containerCode: val.containerCode,
 				warehouseId: this.bId,
 			};
+			console.log(val);
 			checkGoods(params).then((res) => {
 				if (res == 0) {
 					this.innerVisible = false;
@@ -615,6 +671,7 @@ export default {
 					);
 					this.$set(this.tableData[this.trayIndex], 'process', val.process);
 					this.$set(this.tableData[this.trayIndex], 'earlyTime', 0);
+					this.$set(this.tableData[this.trayIndex], 'freeze', val.freeze);
 				} else {
 					this.$confirm('该货物不是完成日期最早货物，是否选择出库?', '提示', {
 						confirmButtonText: '确定',
@@ -645,6 +702,7 @@ export default {
 							);
 							this.$set(this.tableData[this.trayIndex], 'process', val.process);
 							this.$set(this.tableData[this.trayIndex], 'earlyTime', 1);
+							this.$set(this.tableData[this.trayIndex], 'freeze', val.freeze);
 						})
 						.catch(() => {
 							return;
@@ -709,6 +767,7 @@ export default {
 						item.deliveryCode = this.dataForm.deliveryCode;
 						item.department = this.dataForm.department;
 						item.applicant = this.dataForm.applicant;
+						item.outwhy = this.dataForm.outwhy;
 						item.warehouseId = this.bId;
 						item.deliveryType = 3;
 						item.needTrayNumber = 1;
@@ -732,7 +791,7 @@ export default {
 					return;
 				}
 				// 添加的提交
-        this.dataForm.warehouseId = '1698950657556340737'
+				this.dataForm.warehouseId = '1698950657556340737';
 				this.urlOptions.createURL(this.dataForm).then((response) => {
 					if (response.data === -1) {
 						this.$modal.msgWarning('排、列、层不能重复');
diff --git a/src/views/asrs/delivery/index.vue b/src/views/asrs/delivery/index.vue
index adaa32e..4773981 100644
--- a/src/views/asrs/delivery/index.vue
+++ b/src/views/asrs/delivery/index.vue
@@ -119,7 +119,7 @@ const tableProps = [
 		prop: 'earlyTime',
 		label: '最早时间',
 		filter: (val) => {
-			val == 0 ? '是' : '否';
+			return val == 0 ? '是' : '否';
 		},
 	},
 	{
diff --git a/src/views/asrs/delivery/indexb.vue b/src/views/asrs/delivery/indexb.vue
index 40a1e87..75969f9 100644
--- a/src/views/asrs/delivery/indexb.vue
+++ b/src/views/asrs/delivery/indexb.vue
@@ -119,7 +119,7 @@ const tableProps = [
 		prop: 'earlyTime',
 		label: '最早时间',
 		filter: (val) => {
-			val == 0 ? '是' : '否';
+			return val == 0 ? '是' : '否';
 		},
 	},
 	{
diff --git a/src/views/asrs/deliveryHis/product-mini.vue b/src/views/asrs/deliveryHis/product-mini.vue
index 06b2327..b9f0b3f 100644
--- a/src/views/asrs/deliveryHis/product-mini.vue
+++ b/src/views/asrs/deliveryHis/product-mini.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-24 14:47:58
  * @LastEditors: zwq
- * @LastEditTime: 2024-05-31 14:07:27
+ * @LastEditTime: 2025-11-26 12:51:42
  * @Description:
 -->
 <template>
@@ -83,6 +83,19 @@ const tableProps = [
 		prop: 'lineId',
 		label: '行号',
 	},
+	{
+		prop: 'freeze',
+		label: '是否冻结',
+    filter: (val)=>{return val == 1 ? '冻结' : '否'}
+	},
+	{
+		prop: 'freezeType',
+		label: '冻结类型',
+	},
+	{
+		prop: 'freezeNote',
+		label: '冻结备注',
+	},
 	{
 		prop: 'createTime',
 		label: '创建时间',
diff --git a/src/views/asrs/jobMainTask/add-or-updata.vue b/src/views/asrs/jobMainTask/add-or-updata.vue
index 3d61cb9..ae9f61d 100644
--- a/src/views/asrs/jobMainTask/add-or-updata.vue
+++ b/src/views/asrs/jobMainTask/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2025-08-14 13:57:21
+ * @LastEditTime: 2025-09-04 09:19:29
  * @Description:
 -->
 <template>
@@ -40,7 +40,10 @@
 </template>
 
 <script>
-import { updatestacker, getLibraryPage } from '@/api/oth/mainTask';
+import { updatestacker } from '@/api/oth/mainTask';
+import {
+	getLineList,
+} from '@/api/asrs/warehouseStorehouse';
 
 const stackerArr1 = [
 	{
@@ -118,12 +121,10 @@ export default {
 				this.stackerArr = this.stackerArr1;
 			}
 			const params = {
-				pageSize: 100,
-				pageNo: 1,
 				warehouseId: this.dataForm.warehouseId,
 			};
-			getLibraryPage(params).then((res) => {
-				this.libraryArr = res.data.list;
+			getLineList(params).then((res) => {
+				this.libraryArr = res.data;
 			});
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
diff --git a/src/views/asrs/rollMessage/index.vue b/src/views/asrs/rollMessage/index.vue
index 146f058..e0c7758 100644
--- a/src/views/asrs/rollMessage/index.vue
+++ b/src/views/asrs/rollMessage/index.vue
@@ -29,6 +29,7 @@ const tableProps = [
 		prop: 'workOrderCode',
 		label: '入库单号',
 		width: 170,
+		fixed: true,
 	},
 	{
 		prop: 'process',
@@ -142,6 +143,21 @@ const tableProps = [
 		label: '物料类型描述',
 		width: 100,
 	},
+	{
+		prop: 'freeze',
+		label: '是否冻结',
+		filter: (val) => {
+			return val == 1 ? '冻结' : '否';
+		},
+	},
+	{
+		prop: 'freezeType',
+		label: '冻结类型',
+	},
+	{
+		prop: 'freezeNote',
+		label: '冻结备注',
+	},
 	{
 		prop: 'customCode',
 		label: '客户编码',
diff --git a/src/views/asrs/rollMessage/indexb.vue b/src/views/asrs/rollMessage/indexb.vue
index 0efa19b..c04967e 100644
--- a/src/views/asrs/rollMessage/indexb.vue
+++ b/src/views/asrs/rollMessage/indexb.vue
@@ -29,6 +29,7 @@ const tableProps = [
 		prop: 'workOrderCode',
 		label: '入库单号',
 		width: 170,
+		fixed: true,
 	},
 	{
 		prop: 'process',
@@ -146,6 +147,21 @@ const tableProps = [
 		prop: 'customCode',
 		label: '客户编码',
 	},
+	{
+		prop: 'freeze',
+		label: '是否冻结',
+		filter: (val) => {
+			return val == '1' ? '冻结' : '否';
+		},
+	},
+	{
+		prop: 'freezeType',
+		label: '冻结类型',
+	},
+	{
+		prop: 'freezeNote',
+		label: '冻结备注',
+	},
 	{
 		prop: 'sfcCreateTime',
 		label: '膜卷生产时间',
@@ -169,7 +185,7 @@ export default {
 			},
 			tableProps,
 			tableData: [],
-      getTrayCode: undefined,
+			getTrayCode: undefined,
 			formConfig: [
 				{
 					type: 'input',
@@ -248,11 +264,11 @@ export default {
 	},
 	components: {},
 	created() {
-    this.listQuery.warehouseId = this.bId
-    this.listQuery.trayCode = this.$route.query && this.$route.query.trayCode
-    this.formConfig[0].placeholder = this.listQuery.trayCode || '托盘编码'
-    this.getDataList();
-  },
+		this.listQuery.warehouseId = this.bId;
+		this.listQuery.trayCode = this.$route.query && this.$route.query.trayCode;
+		this.formConfig[0].placeholder = this.listQuery.trayCode || '托盘编码';
+		this.getDataList();
+	},
 	methods: {
 		buttonClick(val) {
 			switch (val.btnName) {
diff --git a/src/views/wcsAlarm/real1.vue b/src/views/wcsAlarm/real1.vue
index 0a2f790..c30123e 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-01-09 10:07:00
+ * @LastEditTime: 2025-10-20 13:32:06
  * @Description:
 -->
 <template>
@@ -126,7 +126,7 @@ export default {
 		startFun() {
 			const timer = setInterval(() => {
 				this.getInfo();
-			}, 10000);
+			}, 20000);
 			this.$once('hook:beforeDestroy', () => {
 				clearInterval(timer);
 			});
diff --git a/src/views/wcsAlarm/real2.vue b/src/views/wcsAlarm/real2.vue
index 62f3392..7f8708e 100644
--- a/src/views/wcsAlarm/real2.vue
+++ b/src/views/wcsAlarm/real2.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2024-05-21 14:25:27
  * @LastEditors: zwq
- * @LastEditTime: 2024-10-10 14:29:56
+ * @LastEditTime: 2025-10-20 13:32:14
  * @Description:
 -->
 <template>
@@ -126,7 +126,7 @@ export default {
 		startFun() {
 			const timer = setInterval(() => {
 				this.getInfo();
-			}, 10000);
+			}, 20000);
 			this.$once('hook:beforeDestroy', () => {
 				clearInterval(timer);
 			});