Browse Source

20240923

java8
qiezi 1 year ago
parent
commit
2912233bb8
  1. 2
      src/main/java/com/xujie/sys/modules/quote/entity/QuoteDetailAttribute.java
  2. 4
      src/main/java/com/xujie/sys/modules/reader/config/TCPClient.java
  3. 11
      src/main/resources/mapper/quote/QuoteDetailAttributeMapper.xml

2
src/main/java/com/xujie/sys/modules/quote/entity/QuoteDetailAttribute.java

@ -59,5 +59,7 @@ public class QuoteDetailAttribute {
private String valueType; private String valueType;
@TableField(exist = false) @TableField(exist = false)
private String itemDesc; private String itemDesc;
@TableField(exist = false)
private String valueTypeDb;
} }

4
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); log.error("连接设备失败,IP:{},Port:{}",config.getIp(),config.getPort(),e);
}finally { }finally {
try { try {
if (in!= null){
if (in != null){
in.close(); in.close();
} }
if (socket!= null && !socket.isClosed()){
if (socket != null && !socket.isClosed()){
socket.close(); socket.close();
} }
} catch (IOException e) { } catch (IOException e) {

11
src/main/resources/mapper/quote/QuoteDetailAttributeMapper.xml

@ -40,12 +40,13 @@
qda.update_by, qda.update_by,
qda.update_date, qda.update_date,
ppi.item_desc, ppi.item_desc,
ppi.value_type
ppi.value_type,
ppi.value_type_db
from plm_quote_detail_attribute qda 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} where quote_detail_id = #{quoteDetailId}
</select> </select>
<select id="queryQuoteDetailAttributeByItem" <select id="queryQuoteDetailAttributeByItem"

Loading…
Cancel
Save