From 83e4d5a7784609270ef0b526ecfe61c556082e80 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Wed, 4 Jun 2025 14:36:31 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E7=83=98=E7=AE=B1?=
 =?UTF-8?q?=E5=86=B7=E5=8D=B4=E5=8C=BA=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/config/GeneralConfig.java     | 41 +++++++++++++++++++
 .../nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql    |  5 ++-
 .../org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql |  5 ++-
 3 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 lms/nladmin-system/src/main/java/org/nl/config/GeneralConfig.java

diff --git a/lms/nladmin-system/src/main/java/org/nl/config/GeneralConfig.java b/lms/nladmin-system/src/main/java/org/nl/config/GeneralConfig.java
new file mode 100644
index 000000000..10451a855
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/config/GeneralConfig.java
@@ -0,0 +1,41 @@
+package org.nl.config;
+
+import cn.hutool.core.net.NetUtil;
+import cn.hutool.crypto.digest.MD5;
+import org.springframework.context.SmartLifecycle;
+import org.springframework.context.annotation.Configuration;
+
+import java.net.InetAddress;
+import java.security.MessageDigest;
+import java.util.LinkedHashSet;
+import java.util.Optional;
+
+
+public class GeneralConfig implements SmartLifecycle {
+    /**
+     * 雪花算法workId
+     */
+    public static Long Ip_WorkId = 1L;
+
+
+    public void init(){
+
+    }
+
+    @Override
+    public void start() {
+        LinkedHashSet<InetAddress> inetAddresses = NetUtil.localAddressList(null);
+        Optional<InetAddress> any = inetAddresses.stream().findAny();
+
+    }
+
+    @Override
+    public void stop() {
+
+    }
+
+    @Override
+    public boolean isRunning() {
+        return false;
+    }
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql
index 053af445a..2a1a1792a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql
@@ -56,9 +56,10 @@
 	IF 输入.flag = "1"
     	PAGEQUERY
     	    SELECT
-    	        cool.*
+    	        cool.*, der.description
     	    FROM
     	        st_ivt_coolpointivt cool
+    	        LEFT JOIN PDM_BI_RawFoilWorkOrder der ON cool.container_name = der.container_name
     	    WHERE
     	        cool.product_area in 输入.in_area_id
     	        OPTION 输入.point_code <> ""
@@ -129,4 +130,4 @@
 
             ENDSELECT
         ENDPAGEQUERY
-    ENDIF
\ No newline at end of file
+    ENDIF
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql
index 018e1f4d9..66242f97f 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql
@@ -54,9 +54,10 @@
 	IF 输入.flag = "1"
         PAGEQUERY
             SELECT
-                hot.*
+                hot.*, der.description
             FROM
                 st_ivt_hotpointivt hot
+                 LEFT JOIN PDM_BI_RawFoilWorkOrder der ON hot.container_name = der.container_name
             WHERE
                 hot.product_area in 输入.in_area_id
                 OPTION 输入.point_location <> ""
@@ -135,4 +136,4 @@
 
             ENDSELECT
         ENDPAGEQUERY
-    ENDIF
\ No newline at end of file
+    ENDIF