Commit 057203ff authored by KeYong's avatar KeYong

修改bug

parent 27c2ab6f
......@@ -16,7 +16,7 @@ public class EquipmentSpecificVo {
//地址
private String address;
//库存
private Integer amount;
private Long amount;
//是否单件管理(1是多件)
private Integer single;
......
......@@ -32,9 +32,10 @@
equ.code as code,
det.name as name,
cate.name as type,
spe.is_binding as isbind,
concat_ws('-',ware.full_name, det.area) as address,
spe.single as single,
sto.amount as amount,
spe.single as single,
spe.iot_code,
spe.code as specific_code,
spe.system_id,
......
......@@ -182,7 +182,7 @@
left join wl_equipment_index as ein on ind.equipment_index_id = ein.id
left join wl_stock_detail as sto on sto.equipment_specific_id = spe.id
left join wl_warehouse_structure as str on sto.warehouse_structure_id = str.source_id
WHERE ind.`value` IS NOT NULL AND ind.`value` != ''
WHERE ind.`value` IS NOT NULL AND ind.`value` != '' AND ein.is_iot = 1
) d
<where>
<if test="fireEquipmentName!=null">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment