代码修改

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 + "%");
         }

wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_ProduceTask_01.wql

@@ -21,6 +21,7 @@
 	输入.cust_id   					        TYPEAS s_string
 	输入.workprocedure_id   					TYPEAS s_string
 	输入.producetask_id   					TYPEAS s_string
+	输入.producetask_status   					TYPEAS s_string
 
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
@@ -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

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"
         >