| | |
|---|
| | | * @param floor |
|---|
| | | * @return |
|---|
| | | */ |
|---|
| | | public AgvLocMast getLocNoRuleByFloor(int type, Integer floor) { |
|---|
| | | public AgvLocMast getLocNoRuleByFloor6(int type, Integer floor) { |
|---|
| | | try { |
|---|
| | | EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>(); |
|---|
| | | wrapper.eq("loc_sts", "O").eq("loc_type1", type); |
|---|
| | | if (floor == 4) { |
|---|
| | | wrapper.orderBy("lev1", false); |
|---|
| | | wrapper.eq("floor", 1).eq("lev1", 2).orderBy("bay1", false); |
|---|
| | | } else { |
|---|
| | | wrapper.orderBy("lev1", true); |
|---|
| | | wrapper.orderBy("floor", false).orderBy("lev1", true); |
|---|
| | | } |
|---|
| | | List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(wrapper); |
|---|
| | | for (AgvLocMast agvLocMast : agvLocMasts) { |
|---|
