From 2912233bb8c11d3a327ad8f9e6abbd9bb68e79ed Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Mon, 23 Sep 2024 11:03:35 +0800
Subject: [PATCH 1/2] 20240923

---
 .../modules/quote/entity/QuoteDetailAttribute.java    |  2 ++
 .../xujie/sys/modules/reader/config/TCPClient.java    |  4 ++--
 .../mapper/quote/QuoteDetailAttributeMapper.xml       | 11 ++++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/quote/entity/QuoteDetailAttribute.java b/src/main/java/com/xujie/sys/modules/quote/entity/QuoteDetailAttribute.java
index b98c1f1f..7ed2c716 100644
--- a/src/main/java/com/xujie/sys/modules/quote/entity/QuoteDetailAttribute.java
+++ b/src/main/java/com/xujie/sys/modules/quote/entity/QuoteDetailAttribute.java
@@ -59,5 +59,7 @@ public class QuoteDetailAttribute {
     private String valueType;
     @TableField(exist = false)
     private String itemDesc;
+    @TableField(exist = false)
+    private String valueTypeDb;
 
 }
diff --git a/src/main/java/com/xujie/sys/modules/reader/config/TCPClient.java b/src/main/java/com/xujie/sys/modules/reader/config/TCPClient.java
index bf0384b7..b82cd681 100644
--- a/src/main/java/com/xujie/sys/modules/reader/config/TCPClient.java
+++ b/src/main/java/com/xujie/sys/modules/reader/config/TCPClient.java
@@ -79,10 +79,10 @@ public class TCPClient {
                 log.error("连接设备失败,IP:{},Port:{}",config.getIp(),config.getPort(),e);
             }finally {
                 try {
-                    if (in!= null){
+                    if (in != null){
                         in.close();
                     }
-                    if (socket!= null && !socket.isClosed()){
+                    if (socket != null && !socket.isClosed()){
                         socket.close();
                     }
                 } catch (IOException e) {
diff --git a/src/main/resources/mapper/quote/QuoteDetailAttributeMapper.xml b/src/main/resources/mapper/quote/QuoteDetailAttributeMapper.xml
index 03e9ae8d..fce48f77 100644
--- a/src/main/resources/mapper/quote/QuoteDetailAttributeMapper.xml
+++ b/src/main/resources/mapper/quote/QuoteDetailAttributeMapper.xml
@@ -40,12 +40,13 @@
                qda.update_by,
                qda.update_date,
                ppi.item_desc,
-               ppi.value_type
+               ppi.value_type,
+               ppi.value_type_db
         from plm_quote_detail_attribute qda
-        left join plm_properties_item ppi on qda.site = ppi.site
-        and qda.bu_no = ppi.bu_no
-        and qda.item_type = ppi.item_type
-        and qda.item_no = ppi.item_no
+                 left join plm_properties_item ppi on qda.site = ppi.site
+            and qda.bu_no = ppi.bu_no
+            and qda.item_type = ppi.item_type
+            and qda.item_no = ppi.item_no
         where quote_detail_id = #{quoteDetailId}
     </select>
     <select id="queryQuoteDetailAttributeByItem"

From c9df9e670b03b492d0516d6871cf8b5757fa7103 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Mon, 23 Sep 2024 11:10:00 +0800
Subject: [PATCH 2/2] 20240923

---
 src/main/java/com/xujie/sys/common/utils/Constant.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/xujie/sys/common/utils/Constant.java b/src/main/java/com/xujie/sys/common/utils/Constant.java
index fac3b13b..7d4829c4 100644
--- a/src/main/java/com/xujie/sys/common/utils/Constant.java
+++ b/src/main/java/com/xujie/sys/common/utils/Constant.java
@@ -124,7 +124,7 @@ public class Constant {
 
     public static final String XJ = "XJ";
 
-    public static final String QUOTATION_CODE_NO = "P001";
+    public static final String QUOTATION_CODE_NO = "XJ001";
 
     public static final String QUOTATION_CODE_TYPE = "PRICECHECK";