From fc1da706c4134ecef47dd9bbf22f33eb8a0bfb06 Mon Sep 17 00:00:00 2001
From: lyd <1419499670@qq.com>
Date: Tue, 1 Nov 2022 10:46:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProducetaskServiceImpl.java  |  2 ++
 .../org/nl/wms/pdm/wql/PDM_ProduceTask_01.wql | 28 ++++++++++---------
 .../src/views/wms/pdm/produceTask/index.vue   | 16 +++++++++--
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java
index 292892b..62620de 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java
@@ -69,6 +69,7 @@ public class ProducetaskServiceImpl implements ProducetaskService {
         String produceline_id = MapUtil.getStr(whereJson, "produceline_id");
         String cust_id = MapUtil.getStr(whereJson, "cust_id");
         String workprocedure_id = MapUtil.getStr(whereJson, "workprocedure_id");
+        String producetask_status = MapUtil.getStr(whereJson, "producetask_status");
         JSONObject map = new JSONObject();
         map.put("flag", "1");
         map.put("material_id", material_id);
@@ -76,6 +77,7 @@ public class ProducetaskServiceImpl implements ProducetaskService {
         map.put("produceline_id", produceline_id);
         map.put("cust_id", cust_id);
         map.put("workprocedure_id", workprocedure_id);
+        map.put("producetask_status", producetask_status);
         if (ObjectUtil.isNotEmpty(search)) {
             map.put("search", "%" + search + "%");
         }
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_ProduceTask_01.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_ProduceTask_01.wql
index 3e1109f..c359a88 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_ProduceTask_01.wql
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_ProduceTask_01.wql
@@ -1,10 +1,10 @@
 [交易说明]
 	交易名：	生产任务分页查询
-	所属模块：	
-	功能简述：	
-	版权所有：	
-	表引用：	
-	版本经历：	
+	所属模块：
+	功能简述：
+	版权所有：
+	表引用：
+	版本经历：
 
 [数据库]
 	--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
@@ -21,25 +21,26 @@
 	输入.cust_id   					        TYPEAS s_string
 	输入.workprocedure_id   					TYPEAS s_string
 	输入.producetask_id   					TYPEAS s_string
+	输入.producetask_status   					TYPEAS s_string
 
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
-	
+
 [临时变量]
 	--所有中间过程变量均可在此处定义
-		 
+
 [业务过程]
 
 	##########################################
 	#			1、输入输出检查				 #
 	##########################################
 
-	
+
 	##########################################
 	#			2、主过程前处理				 #
 	##########################################
-	
-	
+
+
 	##########################################
 	#			3、业务主过程			 	 #
 	##########################################
@@ -61,8 +62,6 @@
 
             WHERE
                 task.is_delete = '0'
-                and task.produceTask_status <> '05'
-                and task.produceTask_status <> '99'
             OPTION 输入.search <> ""
                 (task.producetask_code like 输入.search)
             ENDOPTION
@@ -78,6 +77,9 @@
             OPTION 输入.produceline_id <> ""
                 (task.produceline_id = 输入.produceline_id)
             ENDOPTION
+            OPTION 输入.producetask_status <> ""
+                (task.producetask_status = 输入.producetask_status)
+            ENDOPTION
 
     		ENDSELECT
     	ENDPAGEQUERY
@@ -163,4 +165,4 @@
                          ENDOPTION
                 		ENDSELECT
                 	ENDQUERY
-                ENDIF
\ No newline at end of file
+                ENDIF
diff --git a/wms/qd/src/views/wms/pdm/produceTask/index.vue b/wms/qd/src/views/wms/pdm/produceTask/index.vue
index f30f8ad..2382687 100644
--- a/wms/qd/src/views/wms/pdm/produceTask/index.vue
+++ b/wms/qd/src/views/wms/pdm/produceTask/index.vue
@@ -64,6 +64,16 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="生产状态">
+            <el-select v-model="query.producetask_status" style="width: 185px;" filterable clearable class="filter-item" placeholder="请选择状态" @change="crud.toQuery">
+              <el-option
+                v-for="item in dict.PRODUCETASK_STATUS"
+                :key="item.label"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <rrOperation :crud="crud" />
         </el-form>
 
@@ -74,7 +84,7 @@
           slot="right"
           class="filter-item"
           type="info"
-          icon="el-icon-s-comment"
+          icon="el-icon-position"
           :disabled="issue"
           size="mini"
           @click="is_sue"
@@ -85,7 +95,7 @@
           slot="right"
           class="filter-item"
           type="success"
-          icon="el-icon-position"
+          icon="el-icon-document-copy"
           size="mini"
           :disabled="crud.selections.length !== 1"
           @click="crud.toCopy(crud.selections[0])"
@@ -128,7 +138,7 @@
           slot="right"
           class="filter-item"
           type="info"
-          icon="el-icon-s-comment"
+          icon="el-icon-refresh"
           size="mini"
           @click="is_sys"
         >