|
|
@@ -27,7 +27,7 @@
|
|
|
|
|
|
<!-- 通用查询结果列 -->
|
|
|
<sql id="Base_Column_List">
|
|
|
- id, name, tag_id, model_number, unit, address, factory, pic, service_life, next_indate, is_delete, creator_id, division_code, suffix_code, good_type, rack_id, rack_ip, rack_port, indate
|
|
|
+ id, name, tag_id, model_number, unit, address, factory, pic, service_life, next_indate, is_delete, creator_id, division_code, suffix_code, good_type,rack_ip, rack_port, indate
|
|
|
</sql>
|
|
|
<resultMap id="BaseResultMapVO" type="com.hssx.pcbms.entity.vo.GoodsVO">
|
|
|
<id column="id" property="id"/>
|
|
|
@@ -128,8 +128,8 @@
|
|
|
<select id="selectGoodsNoByGoodsId" resultType="com.hssx.pcbms.entity.GoodsNo">
|
|
|
select
|
|
|
id, model_no, state,indate, goods_id,user_id, update_indate,
|
|
|
- is_maintain, type, device_name, device_model, good_sn_no,
|
|
|
- label_id, rack_id, model_id, u_bit_num, current_state, alarm_level
|
|
|
+ is_maintain, good_sn_no,
|
|
|
+ label_id, model_id, u_bit_num, current_state, alarm_level
|
|
|
from
|
|
|
goods_no
|
|
|
where
|
|
|
@@ -138,7 +138,7 @@
|
|
|
<select id="getDetail" resultMap="BaseResultMapDetail">
|
|
|
select
|
|
|
g.id, g.name, g.tag_id,gt.name tag_name, g.model_number, g.unit,g.address, g.factory, g.pic, g.service_life, g.next_indate,g.division_code divisioncode,g.suffix_code suffixcode,
|
|
|
- g.is_delete,gn.id nid,g.good_type,g.rack_id,rd.hum,rd.door_status,rd.temp,
|
|
|
+ g.is_delete,gn.id nid,g.good_type,rd.hum,rd.door_status,rd.temp,
|
|
|
gn.model_no, gn.division_code, gn.suffix_code, gn.state, gn.indate, gn.goods_id, gn.user_id,u.name username,gn.is_maintain,u.phone
|
|
|
from
|
|
|
goods g
|
