Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YeeAmosFireAutoSysRoot
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
station
YeeAmosFireAutoSysRoot
Commits
057203ff
Commit
057203ff
authored
May 08, 2021
by
KeYong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
27c2ab6f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
EquipmentSpecificVo.java
...com/yeejoin/amos/fas/business/vo/EquipmentSpecificVo.java
+1
-1
dbTemplate_equipment_specific.xml
...ain/resources/db/mapper/dbTemplate_equipment_specific.xml
+2
-1
dbTemplate_fire_equip.xml
...rt/src/main/resources/db/mapper/dbTemplate_fire_equip.xml
+1
-1
No files found.
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/vo/EquipmentSpecificVo.java
View file @
057203ff
...
@@ -16,7 +16,7 @@ public class EquipmentSpecificVo {
...
@@ -16,7 +16,7 @@ public class EquipmentSpecificVo {
//地址
//地址
private
String
address
;
private
String
address
;
//库存
//库存
private
Integer
amount
;
private
Long
amount
;
//是否单件管理(1是多件)
//是否单件管理(1是多件)
private
Integer
single
;
private
Integer
single
;
...
...
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_equipment_specific.xml
View file @
057203ff
...
@@ -32,9 +32,10 @@
...
@@ -32,9 +32,10 @@
equ.code as code,
equ.code as code,
det.name as name,
det.name as name,
cate.name as type,
cate.name as type,
spe.is_binding as isbind,
concat_ws('-',ware.full_name, det.area) as address,
concat_ws('-',ware.full_name, det.area) as address,
spe.single as single,
sto.amount as amount,
sto.amount as amount,
spe.single as single,
spe.iot_code,
spe.iot_code,
spe.code as specific_code,
spe.code as specific_code,
spe.system_id,
spe.system_id,
...
...
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_fire_equip.xml
View file @
057203ff
...
@@ -182,7 +182,7 @@
...
@@ -182,7 +182,7 @@
left join wl_equipment_index as ein on ind.equipment_index_id = ein.id
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_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
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
) d
<where>
<where>
<if
test=
"fireEquipmentName!=null"
>
<if
test=
"fireEquipmentName!=null"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment