From 317f29afde12ef88035fcfda866be98be84bbbff Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Mon, 19 Dec 2022 14:04:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/pdm/wql/QPDM_PRODUCTPLANPROC.wql |  1 +
 .../src/main/java/org/nl/wms/ql/wql/QL_ERP.wql  |  4 ++--
 .../src/main/resources/config/application.yml   | 17 +++++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTPLANPROC.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTPLANPROC.wql
index 813415c3..ad29050c 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTPLANPROC.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTPLANPROC.wql
@@ -210,6 +210,7 @@
                 	1 = 1
                 	AND ProductProcessRoute.is_delete = '0'
                 	AND ProductProcessRoute.productprocess_status = '20'
+                	AND ProductProcessRouteDtl.workprocedure_code in ('GX001','GX002','GX003')
                      OPTION 输入.material_code <> ""
                            ProductProcessRoute.material_id = 输入.material_code
                     ENDOPTION
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql
index d297dc59..ebee7491 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql
@@ -113,7 +113,7 @@
             FROM
                 PURCHASE_CONTRACT_VIEW
             where
-               STATUSFLAG = '3'
+               STATUSFLAG = '1'
                AND DEL_FLAG = '0'
                 OPTION 输入.ext_id <> ""
                         ITEM_ID = 输入.ext_id
@@ -151,7 +151,7 @@
                 FROM
                     PURCHASE_CONTRACT_VIEW PURCHASE
                 where
-                   PURCHASE.STATUSFLAG = '3'
+                   PURCHASE.STATUSFLAG = '1'
                    AND PURCHASE.DEL_FLAG = '0'
                     OPTION 输入.material_id <> ""
                           PURCHASE.ITEM_ID = 输入.material_id
diff --git a/mes/hd/nladmin-system/src/main/resources/config/application.yml b/mes/hd/nladmin-system/src/main/resources/config/application.yml
index 8f7f5442..e1f8184a 100644
--- a/mes/hd/nladmin-system/src/main/resources/config/application.yml
+++ b/mes/hd/nladmin-system/src/main/resources/config/application.yml
@@ -9,6 +9,23 @@ spring:
     redis:
       repositories:
         enabled: false
+redisson:
+  # redis key前缀
+  keyPrefix:
+  # 线程池数量
+  threads: 4
+  # Netty线程池数量
+  nettyThreads: 8
+  # 单节点配置
+  singleServerConfig:
+    # 最小空闲连接数
+    connectionMinimumIdleSize: 8
+    # 连接池大小
+    connectionPoolSize: 32
+    # 连接空闲超时，单位：毫秒
+    idleConnectionTimeout: 10000
+    # 命令等待超时，单位：毫秒
+    timeout: 3000
 
   #配置 Jpa
   jpa: