Merge remote-tracking branch 'origin/master'

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

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;
 
 }

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) {

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"