From 22eb908397bd3adf6fda1bb0822a0f14bf06edf4 Mon Sep 17 00:00:00 2001
From: zwq <zwq229436@163.com>
Date: Fri, 13 Dec 2024 12:58:44 +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

---
 .../warehouseStorehouseGoodsSpecification.js  |  7 +--
 src/layout/components/Sidebar/SidebarItem.vue |  6 ++-
 src/layout/index.vue                          |  2 +-
 src/views/asrs/product-mini.vue               | 10 +++-
 src/views/asrs/rollTimeRemind/index.vue       | 50 +++++++++++--------
 src/views/asrs/rollTimeRemind/indexb.vue      |  8 ++-
 .../index.vue                                 | 16 ++++++
 .../indexb.vue                                | 16 ++++++
 .../asrs/warehouseStorehouseStorage/index.vue | 14 ++++++
 .../warehouseStorehouseStorage/indexb.vue     | 16 +++++-
 src/views/wcsAlarm/real.vue                   |  2 +-
 11 files changed, 116 insertions(+), 31 deletions(-)

diff --git a/src/api/asrs/warehouseStorehouseGoodsSpecification.js b/src/api/asrs/warehouseStorehouseGoodsSpecification.js
index 2790f2d..bae3fd5 100644
--- a/src/api/asrs/warehouseStorehouseGoodsSpecification.js
+++ b/src/api/asrs/warehouseStorehouseGoodsSpecification.js
@@ -17,10 +17,11 @@ export function inventoryOverview(id) {
   })
 }
 // 熟化时间提醒
-export function rollTimeRemind(day) {
+export function rollTimeRemind(query) {
   return request({
-    url: '/asrs/warehouse-storehouse-goods-specification/xday?xDays=' + day,
-    method: 'get'
+    url: '/asrs/warehouse-storehouse-goods-specification/xday',
+    method: 'get',
+    params: query
   })
 }
 // 导出熟化时间提醒 Excel
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index a7774ae..6d88a30 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -102,7 +102,11 @@ export default {
 			};
 			listData(queryParams).then((response) => {
 				if (response.data.list.length > 0) {
-					rollTimeRemind(response.data.list[0].value).then((response) => {
+          const params = {
+            xDays:response.data.list[0].value,
+            warehouseId:componentName==='rollTimeRemind'?'1696803324030865409':'1698950657556340737'
+          }
+					rollTimeRemind(params).then((response) => {
 						remindCount = response.length;
 						console.log(componentName);
 						const elx = document
diff --git a/src/layout/index.vue b/src/layout/index.vue
index ea8d563..55a672d 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -122,7 +122,7 @@ export default {
 		},
 		getRealAlarm() {
 			axios
-				.post('http://172.22.22.190/wcs-njlm/business/wcsTask/isAlarm34')
+				.post('http://172.22.22.190/wcs-njlm/business/wcsTask/isAlarm')
 				.then((res) => {
 					res.data.forEach((item, index) => {
 						if (index < 4) {
diff --git a/src/views/asrs/product-mini.vue b/src/views/asrs/product-mini.vue
index 534ff42..7beefe7 100644
--- a/src/views/asrs/product-mini.vue
+++ b/src/views/asrs/product-mini.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-24 14:47:58
  * @LastEditors: zwq
- * @LastEditTime: 2024-04-19 14:30:04
+ * @LastEditTime: 2024-10-30 13:52:15
  * @Description:
 -->
 <template>
@@ -56,6 +56,14 @@ const tableProps = [
 ];
 
 const tableProps1 = [
+	{
+		prop: 'cpGrade',
+		label: '质检初判等级',
+	},
+	{
+		prop: 'fpGrade',
+		label: '质检复判等级',
+	},
 	{
 		prop: 'cureTime',
 		label: '需要熟化时间(小时)',
diff --git a/src/views/asrs/rollTimeRemind/index.vue b/src/views/asrs/rollTimeRemind/index.vue
index b0b5963..eeea0e8 100644
--- a/src/views/asrs/rollTimeRemind/index.vue
+++ b/src/views/asrs/rollTimeRemind/index.vue
@@ -39,14 +39,14 @@
 					:label="'第' + i + '页'"
 					:name="i + '页'">
 					<el-tag
-						style="margin: 5px; border: 1px solid #67c23a;cursor: pointer;"
+						style="margin: 5px; border: 1px solid #67c23a; cursor: pointer"
 						v-for="(item, index) in containerCodeArr.slice(
 							(i - 1) * pageSize,
 							i * pageSize
 						)"
 						:key="index"
 						effect="plain"
-            @click="toRollMessagePage(item.containerCode)"
+						@click="toRollMessagePage(item.containerCode)"
 						size="small">
 						{{ item.containerCode }}
 					</el-tag>
@@ -114,7 +114,11 @@ export default {
 		init() {},
 		setDay() {
 			this.containerCodeArr = [];
-			rollTimeRemind(this.xDays.value).then((response) => {
+			const params = {
+				xDays: this.xDays.value,
+				warehouseId: this.warehouseId,
+			};
+			rollTimeRemind(params).then((response) => {
 				this.containerCodeArr = response;
 			});
 		},
@@ -134,7 +138,7 @@ export default {
 					}
 					break;
 				case 'export':
-					this.handleExport('膜卷熟化时间信息',val.day);
+					this.handleExport('膜卷熟化时间信息', val.day);
 					break;
 				default:
 					console.log(val);
@@ -145,7 +149,7 @@ export default {
 			updateData(this.xDays).then((response) => {});
 		},
 		/** 导出按钮操作 */
-		handleExport(name,day) {
+		handleExport(name, day) {
 			// 处理查询参数
 			this.$modal
 				.confirm('是否确认导出膜卷熟化时间信息')
@@ -160,22 +164,26 @@ export default {
 				.catch(() => {});
 		},
 		/** 跳转膜卷信息页面 */
-    toRollMessagePage(trayCode){
-      this.$confirm(`是否跳转到膜卷信息页面? 托盘编码:[ ${trayCode} ]`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "success ",
-      })
-        .then(() => {
-      this.$router.push({
-        path: "rollMessage",
-        query:{
-          trayCode: trayCode
-        }
-      });
-        })
-        .catch(() => { });
-    }
+		toRollMessagePage(trayCode) {
+			this.$confirm(
+				`是否跳转到膜卷信息页面? 托盘编码:[ ${trayCode} ]`,
+				'提示',
+				{
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'success ',
+				}
+			)
+				.then(() => {
+					this.$router.push({
+						path: 'rollMessage',
+						query: {
+							trayCode: trayCode,
+						},
+					});
+				})
+				.catch(() => {});
+		},
 	},
 };
 </script>
diff --git a/src/views/asrs/rollTimeRemind/indexb.vue b/src/views/asrs/rollTimeRemind/indexb.vue
index f1da139..1a39dbc 100644
--- a/src/views/asrs/rollTimeRemind/indexb.vue
+++ b/src/views/asrs/rollTimeRemind/indexb.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2024-02-27 14:43:14
  * @LastEditors: zwq
- * @LastEditTime: 2024-10-09 14:40:07
+ * @LastEditTime: 2024-10-30 14:00:57
  * @Description:
 -->
 <template>
@@ -114,7 +114,11 @@ export default {
 		init() {},
 		setDay() {
 			this.containerCodeArr = [];
-			rollTimeRemind(this.xDays.value).then((response) => {
+			const params = {
+				xDays: this.xDays.value,
+				warehouseId: this.warehouseId,
+			};
+			rollTimeRemind(params).then((response) => {
 				this.containerCodeArr = response;
 			});
 		},
diff --git a/src/views/asrs/warehouseStorehouseGoodsSpecification/index.vue b/src/views/asrs/warehouseStorehouseGoodsSpecification/index.vue
index ff8ee82..8ed35bf 100644
--- a/src/views/asrs/warehouseStorehouseGoodsSpecification/index.vue
+++ b/src/views/asrs/warehouseStorehouseGoodsSpecification/index.vue
@@ -201,6 +201,18 @@ export default {
 					placeholder: '品质',
 					param: 'quality',
 				},
+				{
+					type: 'input',
+					label: '质检初判等级',
+					placeholder: '质检初判等级',
+					param: 'cpGrade',
+				},
+				{
+					type: 'input',
+					label: '质检复判等级',
+					placeholder: '质检复判等级',
+					param: 'fpGrade',
+				},
 				{
 					type: 'input',
 					label: '工序',
@@ -283,6 +295,8 @@ export default {
 					this.listQuery.grade = val.quality;
 					this.listQuery.rollCode = val.rollCode;
 					this.listQuery.process = val.processId;
+					this.listQuery.fpGrade = val.fpGrade;
+					this.listQuery.cpGrade = val.cpGrade;
 					this.listQuery.warehouseStorehouseState =
 						val.warehouseStorehouseStateId;
 					this.getDataList();
@@ -312,6 +326,8 @@ export default {
 					this.listQuery.grade = val.quality;
 					this.listQuery.rollCode = val.rollCode;
 					this.listQuery.process = val.processId;
+					this.listQuery.fpGrade = val.fpGrade;
+					this.listQuery.cpGrade = val.cpGrade;
 					this.listQuery.warehouseStorehouseState =
 						val.warehouseStorehouseStateId;
 					this.handleExport(this.listQuery,'库位产品导出');
diff --git a/src/views/asrs/warehouseStorehouseGoodsSpecification/indexb.vue b/src/views/asrs/warehouseStorehouseGoodsSpecification/indexb.vue
index 7766f5a..74da4cb 100644
--- a/src/views/asrs/warehouseStorehouseGoodsSpecification/indexb.vue
+++ b/src/views/asrs/warehouseStorehouseGoodsSpecification/indexb.vue
@@ -201,6 +201,18 @@ export default {
 					placeholder: '品质',
 					param: 'quality',
 				},
+				{
+					type: 'input',
+					label: '质检初判等级',
+					placeholder: '质检初判等级',
+					param: 'cpGrade',
+				},
+				{
+					type: 'input',
+					label: '质检复判等级',
+					placeholder: '质检复判等级',
+					param: 'fpGrade',
+				},
 				{
 					type: 'input',
 					label: '工序',
@@ -284,6 +296,8 @@ export default {
 					this.listQuery.grade = val.quality;
 					this.listQuery.rollCode = val.rollCode;
 					this.listQuery.process = val.processId;
+					this.listQuery.fpGrade = val.fpGrade;
+					this.listQuery.cpGrade = val.cpGrade;
 					this.listQuery.warehouseStorehouseState =
 						val.warehouseStorehouseStateId;
 					this.getDataList();
@@ -313,6 +327,8 @@ export default {
 					this.listQuery.grade = val.quality;
 					this.listQuery.rollCode = val.rollCode;
 					this.listQuery.process = val.processId;
+					this.listQuery.fpGrade = val.fpGrade;
+					this.listQuery.cpGrade = val.cpGrade;
 					this.listQuery.warehouseStorehouseState =
 						val.warehouseStorehouseStateId;
 					this.handleExport(this.listQuery,'库位产品导出');
diff --git a/src/views/asrs/warehouseStorehouseStorage/index.vue b/src/views/asrs/warehouseStorehouseStorage/index.vue
index a8d60d1..3d48b75 100644
--- a/src/views/asrs/warehouseStorehouseStorage/index.vue
+++ b/src/views/asrs/warehouseStorehouseStorage/index.vue
@@ -234,6 +234,18 @@ export default {
 					placeholder: '品质',
 					param: 'quality',
 				},
+				{
+					type: 'input',
+					label: '质检初判等级',
+					placeholder: '质检初判等级',
+					param: 'cpGrade',
+				},
+				{
+					type: 'input',
+					label: '质检复判等级',
+					placeholder: '质检复判等级',
+					param: 'fpGrade',
+				},
 				{
 					type: 'input',
 					label: '工序',
@@ -319,6 +331,8 @@ export default {
 					this.listQuery.rollCode = val.rollCode;
 					this.listQuery.grade = val.quality;
 					this.listQuery.process = val.processId;
+					this.listQuery.fpGrade = val.fpGrade;
+					this.listQuery.cpGrade = val.cpGrade;
 					this.listQuery.warehouseStorehouseState =
 						val.warehouseStorehouseStateId;
 					this.getDataList();
diff --git a/src/views/asrs/warehouseStorehouseStorage/indexb.vue b/src/views/asrs/warehouseStorehouseStorage/indexb.vue
index 4a4da1d..64626f5 100644
--- a/src/views/asrs/warehouseStorehouseStorage/indexb.vue
+++ b/src/views/asrs/warehouseStorehouseStorage/indexb.vue
@@ -234,6 +234,18 @@ export default {
 					placeholder: '品质',
 					param: 'quality',
 				},
+				{
+					type: 'input',
+					label: '质检初判等级',
+					placeholder: '质检初判等级',
+					param: 'cpGrade',
+				},
+				{
+					type: 'input',
+					label: '质检复判等级',
+					placeholder: '质检复判等级',
+					param: 'fpGrade',
+				},
 				{
 					type: 'input',
 					label: '工序',
@@ -320,6 +332,8 @@ export default {
 					this.listQuery.rollCode = val.rollCode;
 					this.listQuery.grade = val.quality;
 					this.listQuery.process = val.processId;
+					this.listQuery.fpGrade = val.fpGrade;
+					this.listQuery.cpGrade = val.cpGrade;
 					this.listQuery.warehouseStorehouseState =
 						val.warehouseStorehouseStateId;
 					this.getDataList();
@@ -327,7 +341,7 @@ export default {
 				case 'reset':
 					this.$refs.searchBarForm.resetForm();
 					this.listQuery = {
-						warehouseId: this.bId,
+						warehouseId: this.aId,
 						pageSize: 10,
 						pageNo: 1,
 						total: 1,
diff --git a/src/views/wcsAlarm/real.vue b/src/views/wcsAlarm/real.vue
index 0f53746..62f3392 100644
--- a/src/views/wcsAlarm/real.vue
+++ b/src/views/wcsAlarm/real.vue
@@ -133,7 +133,7 @@ export default {
 		},
 		getInfo() {
 			axios
-				.post('http://172.22.22.190/wcs-njlm/business/wcsTask/isAlarm34')
+				.post('http://172.22.22.190/wcs-njlm/business/wcsTask/isAlarm')
 				.then((res) => {
           console.log('实时报警')
           console.log(res.data)