From 50389229cc2b9ca66d729ea9a5b145d33f3518aa Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Wed, 16 Nov 2022 13:43:39 +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/ql/service/impl/PhysicalMstServiceImpl.java  | 4 ++--
 .../src/main/java/org/nl/wms/ql/wql/QL_ERP.wql              | 6 ++----
 mes/qd/src/App.vue                                          | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java
index a211cc20..2859b28d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java
@@ -1001,8 +1001,8 @@ public class PhysicalMstServiceImpl implements PhysicalMstService {
         for (int i = 0; i < dataArr.size(); i++) {
             JSONObject json = dataArr.getJSONObject(i);
             JSONObject jsonPhyMst = phyMstTab.query("inspection_id = '"+json.getString("inspection_id")+"'").uniqueResult(0);
-            if (StrUtil.equals(jsonPhyMst.getString("bill_status"), "99")) {
-                throw new BadRequestException("此理化报告：" + jsonPhyMst.getString("inspection_code") + "已完成");
+            if (StrUtil.equals(jsonPhyMst.getString("bill_status"), "99") && StrUtil.equals(jsonPhyMst.getString("is_effective"), "`99`")) {
+                throw new BadRequestException("此理化报告：" + jsonPhyMst.getString("inspection_code") + "已完成且有效");
             }
 
             // 1.将wms物料id转换成本erp物料id
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 ab48efe0..7919a969 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
@@ -71,15 +71,13 @@
             where
                is_effective = '1'
                AND dr = '0'
-
                 OPTION 输入.ext_id <> ""
                         material_id = 输入.ext_id
                 ENDOPTION
-
                 OPTION 输入.pcsn <> ""
                         pcsn = 输入.pcsn
                 ENDOPTION
-
+                order by confirm_time desc
 			ENDSELECT
 		ENDQUERY
 	ENDIF
@@ -104,4 +102,4 @@
 
 			ENDSELECT
 		ENDQUERY
-	ENDIF
\ No newline at end of file
+	ENDIF
diff --git a/mes/qd/src/App.vue b/mes/qd/src/App.vue
index 2f82bccf..f8183ec8 100644
--- a/mes/qd/src/App.vue
+++ b/mes/qd/src/App.vue
@@ -24,7 +24,7 @@ export default {
       this.timmer = setTimeout(() => {
         sessionStorage.clear()
         this.logout()
-      }, 1000 * 60 * 15) // 15分钟 https://blog.csdn.net/qq_42345108/article/details/103496456
+      }, 1000 * 60 * 30) // 30分钟 https://blog.csdn.net/qq_42345108/article/details/103496456
     },
     logout() {
       this.$store.dispatch('LogOut').then(() => {