From cd29b1bc4da47c55867ee6d2f5cd98662b5ea5aa Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 25 Jul 2024 17:12:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=98=E7=82=B9=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request2.js              | 14 +++++++++++++
 src/pages/count/job/countJob.vue | 36 +++++++++++++++++++-------------
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/src/api/request2.js b/src/api/request2.js
index 750772b6..b49c8a03 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -1342,6 +1342,9 @@ export function getIssueJobList(params) {
 		data: params,
 	});
 }
+/**
+ * 发料生产线查询
+ */
 export function getIssueJobByProductionline() {
 	return request({
 		url: baseApi + "/wms/issue-job-main/getIssueJobByProductionline",
@@ -1349,6 +1352,17 @@ export function getIssueJobByProductionline() {
 		data: {},
 	});
 }
+
+/**
+ * 发料接收生产线查询
+ */
+export function getProductionReceiptJobByProductionline() {
+	return request({
+		url: baseApi + "/wms/productionreceipt-job-main/getProductionreceiptJobByProductionline",
+		method: "get",
+		data: {},
+	});
+}
  
 /**
  * 发料任务明细
diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue
index 0deb5e36..4085bd11 100644
--- a/src/pages/count/job/countJob.vue
+++ b/src/pages/count/job/countJob.vue
@@ -157,11 +157,11 @@
 					value: this.status
 				})
 
-				// filters.push({
-				// 	column: "countSplitType",
-				// 	action: "==",
-				// 	value: "locationCode"
-				// })
+				filters.push({
+					column: "countSplitType",
+					action: "==",
+					value: "locationCode"
+				})
 				
 				filters.push({
 					column: "isOpenCount",
@@ -312,11 +312,11 @@
 					value: code
 				})
 				
-				// filters.push({
-				// 	column: "countSplitType",
-				// 	action: "==",
-				// 	value: "locationCode"
-				// })
+				filters.push({
+					column: "countSplitType",
+					action: "==",
+					value: "locationCode"
+				})
 				
 				filters.push({
 					column: "isOpenCount",
@@ -371,11 +371,17 @@
 					value: '1,2'
 				})
 				
-				// filters.push({
-				// 	column: "countSplitType",
-				// 	action: "==",
-				// 	value: "locationCode"
-				// })
+				filters.push({
+					column: "countSplitType",
+					action: "==",
+					value: "locationCode"
+				})
+				
+				filters.push({
+					column: "isOpenCount",
+					action: "==",
+					value: "TRUE"
+				})
 				
 				filters.push({
 					column: "countSplitCode",