From aa3476e8ff45d168f0bb9376ed3a114610a65f12 Mon Sep 17 00:00:00 2001 From: zhangc <zc@123> Date: 星期三, 25 十二月 2024 08:39:12 +0800 Subject: [PATCH] 添加工厂判断逻辑及优化库位查找 --- src/main/java/com/zy/asrs/constant/AsrsConstants.java | 8 + src/main/java/com/zy/asrs/utils/OrderUtils.java | 22 ++++ src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 2 src/main/java/com/zy/common/service/AgvCommonService.java | 161 +++++++++++++++++--------------- src/main/java/com/zy/asrs/controller/AgvMobileController.java | 7 + src/main/java/com/zy/asrs/utils/LocUtils.java | 76 +++++++++++++++ src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 12 +- src/main/java/com/zy/asrs/service/AgvWorkService.java | 2 8 files changed, 205 insertions(+), 85 deletions(-) diff --git a/src/main/java/com/zy/asrs/constant/AsrsConstants.java b/src/main/java/com/zy/asrs/constant/AsrsConstants.java new file mode 100644 index 0000000..5188c4f --- /dev/null +++ b/src/main/java/com/zy/asrs/constant/AsrsConstants.java @@ -0,0 +1,8 @@ +package com.zy.asrs.constant; + +public class AsrsConstants { + //B鏄簩鍘傦紝G鏄笁鍘� + public static final String ERCHANG = "B"; + + public static final String SANCHANG = "G"; +} diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java index 1aad0bc..5795120 100644 --- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java +++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java @@ -12,6 +12,7 @@ import com.zy.asrs.entity.param.*; import com.zy.asrs.service.*; import com.zy.asrs.service.impl.OrderServiceImpl; +import com.zy.asrs.utils.OrderUtils; import com.zy.common.web.BaseController; import lombok.Synchronized; import org.slf4j.Logger; @@ -140,9 +141,11 @@ params.getCombParams().forEach(combParam -> { agvMobileService.comb(combParam, getUserId()); }); + //鑾峰彇鍒ゆ柇鏃跺摢涓巶鐨勮鍗� String csocode = params.getCombParams().get(0).getCombMats().get(0).getCsocode(); + String factory = OrderUtils.getFactory(csocode); params.setContainerType(Short.valueOf(params.getContainerCode().substring(0, 2))); - workService.emptyPlateIn(params.getDevNo(), params.getContainerCode(), params.getContainerType(), getUserId(), false); + workService.emptyPlateIn(params.getDevNo(), params.getContainerCode(), params.getContainerType(), getUserId(), false,factory); return R.ok("鐢熸垚宸ヤ綔妗f垚鍔�"); } @@ -157,7 +160,7 @@ for (AgvMobileStartParam.Pda pda : params.getPad()) { pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0, 2))); - workService.emptyPlateIn(pda.getDevNo(), pda.getContainerCode(), pda.getContainerType(), getUserId(), false); + workService.emptyPlateIn(pda.getDevNo(), pda.getContainerCode(), pda.getContainerType(), getUserId(), false,null); } return R.ok(); diff --git a/src/main/java/com/zy/asrs/service/AgvWorkService.java b/src/main/java/com/zy/asrs/service/AgvWorkService.java index 190b1df..dee9873 100644 --- a/src/main/java/com/zy/asrs/service/AgvWorkService.java +++ b/src/main/java/com/zy/asrs/service/AgvWorkService.java @@ -44,7 +44,7 @@ /* 绌烘澘鍏ュ簱 */ - String emptyPlateIn(String station,String containerCode,Short containerType, Long userId, boolean emptyAutoIn); + String emptyPlateIn(String station,String containerCode,Short containerType, Long userId, boolean emptyAutoIn, String factory ); void emptyPlateOut(String station, int containerType, Long userId); diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java index 70c1b84..8627132 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java @@ -480,7 +480,7 @@ 鍏ュ簱 */ @Transactional - public String emptyPlateIn(String station, String containerCode, Short containerType, Long userId, boolean emptyAutoIn) { + public String emptyPlateIn(String station, String containerCode, Short containerType, Long userId, boolean emptyAutoIn,String factory) { Date now = new Date(); @@ -569,19 +569,19 @@ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "elevatorTasks")); if (Cools.isEmpty(config)) { if (isCurrLev.get()) { - agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true); + agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true,factory); } else { - agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false); + agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false,factory); } } else { List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().like("loc_no", "02F1").like("source_loc_no", "F1")); if (Integer.parseInt(config.getValue()) <= agvWrkMasts.size()) { - agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true); + agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true,factory); } else { if (isCurrLev.get()) { - agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true); + agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true,factory); } else { - agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false); + agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false,factory); } //agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false); } diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java index b5ff538..7dea374 100644 --- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java @@ -44,7 +44,7 @@ private static final List<Integer> MOVE_TYPE_List = new ArrayList<Integer>() {{ add(11); add(12); - //add(53); + add(53); add(101); add(103); add(108); diff --git a/src/main/java/com/zy/asrs/utils/LocUtils.java b/src/main/java/com/zy/asrs/utils/LocUtils.java new file mode 100644 index 0000000..53db48a --- /dev/null +++ b/src/main/java/com/zy/asrs/utils/LocUtils.java @@ -0,0 +1,76 @@ +package com.zy.asrs.utils; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.core.common.Cools; +import com.core.exception.CoolException; +import com.zy.asrs.constant.AsrsConstants; +import com.zy.asrs.entity.AgvLocMast; +import com.zy.asrs.service.AgvLocMastService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; + +@Component +public class LocUtils { + + @Autowired + private AgvLocMastService agvLocMastService; + + /** + * 鏌ヨ搴撲綅 + * @param type + * @param factory + * @return + */ + public AgvLocMast getLocNoRuleByFactory(int type, String factory) { + if (Cools.isEmpty(factory)) { + throw new CoolException("鎼滅储搴撲綅鏃讹紝璁㈠崟绫诲瀷閿欒"); + } + try { + EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>(); + wrapper.eq("loc_sts", "O").eq("loc_type1", type); + List<AgvLocMast> agvLocMasts = new ArrayList<>(); + if (factory.equalsIgnoreCase(AsrsConstants.ERCHANG)) { + wrapper.orderBy("lev1", false); + } else if (factory.equalsIgnoreCase(AsrsConstants.SANCHANG)) { + wrapper.orderBy("lev1", true); + } + agvLocMasts = agvLocMastService.selectList(wrapper); + + for (AgvLocMast agvLocMast : agvLocMasts) { + AgvLocMast agvLocMast1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocMast.getLocNo())); + if (agvLocMast1.getLocSts().equals("O")) { + return agvLocMast1; + } + } + throw new CoolException("鎼滅储搴撲綅鏃讹紝鏈壘鍒板彲鍏ュ簱搴撲綅銆�"); + } catch (Exception e) { + throw new CoolException("鎼滅储搴撲綅鏃讹紝鏈壘鍒板彲鍏ュ簱搴撲綅銆�"); + } + } + + /** + * 鏌ヨ搴撲綅 + * @param type + * @param floor + * @return + */ + public AgvLocMast getLocNoRuleByFloor(int type, Integer floor, Integer lev1) { + try { + EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>(); + wrapper.eq("loc_sts", "O").eq("loc_type1", type).eq("floor", floor).eq("lev1", lev1); + List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(wrapper); + for (AgvLocMast agvLocMast : agvLocMasts) { + AgvLocMast agvLocMast1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocMast.getLocNo())); + if (agvLocMast1.getLocSts().equals("O")) { + return agvLocMast1; + } + } + throw new CoolException("鎼滅储搴撲綅鏃讹紝鏈壘鍒板彲鍏ュ簱搴撲綅銆�"); + } catch (Exception e) { + throw new CoolException("鎼滅储搴撲綅鏃讹紝鏈壘鍒板彲鍏ュ簱搴撲綅銆�"); + } + } +} diff --git a/src/main/java/com/zy/asrs/utils/OrderUtils.java b/src/main/java/com/zy/asrs/utils/OrderUtils.java new file mode 100644 index 0000000..c342772 --- /dev/null +++ b/src/main/java/com/zy/asrs/utils/OrderUtils.java @@ -0,0 +1,22 @@ +package com.zy.asrs.utils; + +import com.core.common.Cools; +import com.zy.asrs.constant.AsrsConstants; + +public class OrderUtils { + + /** + * 鍒ゆ柇鏃跺摢涓巶鐨勮鍗� + * 璁㈠崟缂栧彿閲屾湁B鏄簩鍘傦紝G鏄笁鍘� + */ + public static String getFactory(String threeCode) { + if (Cools.isEmpty(threeCode)) { + return null; + } + if (threeCode.contains(AsrsConstants.ERCHANG)) { + return AsrsConstants.ERCHANG; + } else { + return AsrsConstants.SANCHANG; + } + } +} diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java index b3b3a6a..76a2b87 100644 --- a/src/main/java/com/zy/common/service/AgvCommonService.java +++ b/src/main/java/com/zy/common/service/AgvCommonService.java @@ -5,6 +5,7 @@ import com.core.exception.CoolException; import com.zy.asrs.entity.*; import com.zy.asrs.service.*; +import com.zy.asrs.utils.LocUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,6 +36,9 @@ @Autowired AgvBasDevpService agvBasDevpService; + @Autowired + private LocUtils locUtils; + public int getWorkNo(Integer wrkMk) { AgvWrkLastno wrkLastno = agvWrkLastnoService.selectById(wrkMk); if (Cools.isEmpty(wrkLastno)) { @@ -46,24 +50,24 @@ int sNo = wrkLastno.getSNo(); int eNo = wrkLastno.getENo(); - workNo = workNo>=eNo ? sNo : workNo+1; + workNo = workNo >= eNo ? sNo : workNo + 1; while (true) { AgvWrkMast wrkMast = agvWrkMastService.selectById(workNo); if (null != wrkMast) { - workNo = workNo>=eNo ? sNo : workNo+1; + workNo = workNo >= eNo ? sNo : workNo + 1; } else { break; } } - if (workNo > 0){ + if (workNo > 0) { wrkLastno.setWrkNo(workNo); agvWrkLastnoService.updateById(wrkLastno); } if (workNo == 0) { throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳"); } else { - if (agvWrkMastService.selectById(workNo)!=null) { + if (agvWrkMastService.selectById(workNo) != null) { throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪"); } } @@ -74,7 +78,7 @@ * 妫�绱㈠簱浣嶅彿 * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿 */ - public AgvLocMast getLocNo(int type, int floor,boolean isEmpty,boolean isCurrLev) { + public AgvLocMast getLocNo(int type, int floor, boolean isEmpty, boolean isCurrLev, String factory) { // 鐩爣搴撲綅 AgvLocMast locMast = null; // if(Cools.isEmpty(agvWaitPakinList)){ @@ -112,24 +116,29 @@ // } - try{ + try { // 寮�濮嬫煡鎵惧簱浣� ==============================>> - //濡傛灉鏄崐鎴愬搧绠卞3 - if (type == 6) { - - }else { + // 鍥涙湡椤圭洰锛氶渶瑕佹敼鏌ユ壘搴撲綅閫昏緫 + // 绠卞3鍏ュ簱 + if (type == 3) { + //浼樺厛鍏ュ簱鍚稿1妤硷紝鍦�2妤� + locMast = locUtils.getLocNoRuleByFactory(type, factory); + } else if (type == 6) { + //鍗婃垚鍝佺澹冲叆搴擄紝鍏ュ埌鍚稿2妤肩殑370涓簱浣嶉噷 + locMast = locUtils.getLocNoRuleByFloor(type, floor, 2); + } else { //涓嶅姩杩欎釜閫昏緫 - locMast = getLocNoRule(type,floor,isEmpty,isCurrLev); + locMast = getLocNoRule(type, floor, isEmpty, isCurrLev); } if (locMast != null) { return locMast; } - }catch (Exception e){ - throw new CoolException(floor+"妤硷紱璇ユゼ灞傛病鏈夌┖搴撲綅===>"+e.getMessage()); + } catch (Exception e) { + throw new CoolException(floor + "妤硷紱璇ユゼ灞傛病鏈夌┖搴撲綅===>" + e.getMessage()); } //鎵句笉鍒板簱浣嶏紝鎶涘嚭寮傚父 - throw new CoolException(floor+"妤硷紱璇ユゼ灞傛病鏈夌┖搴撲綅"); + throw new CoolException(floor + "妤硷紱璇ユゼ灞傛病鏈夌┖搴撲綅"); } /* @@ -141,24 +150,24 @@ .eq("matnr", agvWaitPakin.getMatnr()) .eq("batch", agvWaitPakin.getModel()) .eq("floor", floor)); - if(Cools.isEmpty(agvLocRules)){ + if (Cools.isEmpty(agvLocRules)) { agvLocRules = agvLocRuleService.selectList(new EntityWrapper<AgvLocRule>() .eq("matnr", agvWaitPakin.getMatnr()) .eq("floor", floor)); } - if(Cools.isEmpty(agvLocRules)){ + if (Cools.isEmpty(agvLocRules)) { return null; } for (AgvLocRule agvLocRule : agvLocRules) { EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>(); - wrapper.between("row1",agvLocRule.getRowBeg(),agvLocRule.getRowEnd()) - .between("bay1",agvLocRule.getBayBeg(),agvLocRule.getBayEnd()) - .between("lev1",agvLocRule.getLevBeg(),agvLocRule.getLevEnd()) - .eq("floor",floor) - .eq("loc_sts","O"); + wrapper.between("row1", agvLocRule.getRowBeg(), agvLocRule.getRowEnd()) + .between("bay1", agvLocRule.getBayBeg(), agvLocRule.getBayEnd()) + .between("lev1", agvLocRule.getLevBeg(), agvLocRule.getLevEnd()) + .eq("floor", floor) + .eq("loc_sts", "O"); AgvLocMast agvLocMast = agvLocMastService.selectOne(wrapper); - if(!Cools.isEmpty(agvLocMast)){ + if (!Cools.isEmpty(agvLocMast)) { return agvLocMast; } } @@ -200,7 +209,7 @@ /* 闈犺繎鎽嗘斁瑙勫垯 */ - private AgvLocMast getLocByProximityRule(){ + private AgvLocMast getLocByProximityRule() { //to do return null; } @@ -208,30 +217,30 @@ /* 鏍规嵁鐗╂枡棰戠巼鏌ユ壘 */ - private AgvLocMast getLocByFre(int fre, int floor){ - if(floor == 1){ - if(fre == 1){ + private AgvLocMast getLocByFre(int fre, int floor) { + if (floor == 1) { + if (fre == 1) { return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>() - .eq("floor",floor) - .eq("loc_sts","O") - .orderBy("bay1",false)); - }else{ + .eq("floor", floor) + .eq("loc_sts", "O") + .orderBy("bay1", false)); + } else { return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>() - .eq("floor",floor) - .eq("loc_sts","O") + .eq("floor", floor) + .eq("loc_sts", "O") .orderBy("bay1")); } } - if(floor == 3){ - if(fre == 1){ + if (floor == 3) { + if (fre == 1) { return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>() - .eq("floor",floor) - .eq("loc_sts","O") - .orderBy("row1",false)); - }else{ + .eq("floor", floor) + .eq("loc_sts", "O") + .orderBy("row1", false)); + } else { return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>() - .eq("floor",floor) - .eq("loc_sts","O") + .eq("floor", floor) + .eq("loc_sts", "O") .orderBy("row1")); } } @@ -239,13 +248,14 @@ throw new CoolException("鎼滅储搴撲綅鏃讹紝妤煎眰鍑洪敊銆�"); } + //闅忔満鍙栦竴涓揣浣� - private AgvLocMast getLocNoRule(int type,int floor,boolean isEmpty,boolean isCurrLev){ + private AgvLocMast getLocNoRule(int type, int floor, boolean isEmpty, boolean isCurrLev) { Boolean orderBy = false; int levCount = 0; int times = 1; if (floor == 1 || floor >= 4) { - if (floor >= 4 ) { + if (floor >= 4) { floor = 1; } orderBy = true; @@ -254,45 +264,46 @@ orderBy = false; levCount = 1; } - try{ + try { EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>(); wrapper.eq("loc_sts", "O").eq("loc_type1", type); List<AgvLocMast> agvLocMasts = new ArrayList<>(); //涓嶆槸绌烘澘浼樺厛鎵�2灞� if (isEmpty) { - wrapper.eq("floor", floor).eq("lev1",1); + wrapper.eq("floor", floor).eq("lev1", 1); } else { if (isCurrLev) { - wrapper.eq("floor", floor).eq("lev1",1); + wrapper.eq("floor", floor).eq("lev1", 1); } else { - wrapper.eq("floor", floor).orderBy("lev1",!orderBy); + wrapper.eq("floor", floor).orderBy("lev1", !orderBy); } } //褰撶洰鏍囧簱浣嶆槸1妤� - if(floor == 1) { - wrapper.orderBy("loc_no",false); + if (floor == 1) { + wrapper.orderBy("loc_no", false); } agvLocMasts = agvLocMastService.selectList(wrapper); //鏄惁褰撳墠灞� if (Cools.isEmpty(agvLocMasts) && !isCurrLev) { if (times < levCount) { times++; - return getLocNoRule(type,floor,isEmpty,isCurrLev); + return getLocNoRule(type, floor, isEmpty, isCurrLev); } } - for (AgvLocMast agvLocMast : agvLocMasts){ + for (AgvLocMast agvLocMast : agvLocMasts) { AgvLocMast agvLocMast1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocMast.getLocNo())); - if (agvLocMast1.getLocSts().equals("O")){ + if (agvLocMast1.getLocSts().equals("O")) { return agvLocMast1; } } throw new CoolException("鎼滅储搴撲綅鏃讹紝鏈壘鍒板彲鍏ュ簱搴撲綅銆�"); - }catch (Exception e){ + } catch (Exception e) { throw new CoolException("鎼滅储搴撲綅鏃讹紝鏈壘鍒板彲鍏ュ簱搴撲綅銆�"); } } + /** * 妫�绱㈠簱浣嶅彿 * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿 @@ -302,13 +313,13 @@ AgvBasDevp basDevp = null; // 寮�濮嬫煡鎵惧簱浣� ==============================>> - basDevp = getDevpNoRule(type,floor); + basDevp = getDevpNoRule(type, floor); if (basDevp != null) { return basDevp; } //鎵句笉鍒板簱浣嶏紝鎶涘嚭寮傚父 - throw new CoolException("妤煎眰鍙凤細"+floor+"锛涜妤煎眰娌℃湁绌烘帴椹充綅"); + throw new CoolException("妤煎眰鍙凤細" + floor + "锛涜妤煎眰娌℃湁绌烘帴椹充綅"); } @@ -321,25 +332,25 @@ AgvBasDevp basDevp = null; // 寮�濮嬫煡鎵惧簱浣� ==============================>> - basDevp = getDevpNoAuto(type,floor,auto); + basDevp = getDevpNoAuto(type, floor, auto); if (basDevp != null) { return basDevp; } //鎵句笉鍒板簱浣嶏紝鎶涘嚭寮傚父 - throw new CoolException("妤煎眰鍙凤細"+floor+"锛涜妤煎眰娌℃湁绌烘帴椹充綅"); + throw new CoolException("妤煎眰鍙凤細" + floor + "锛涜妤煎眰娌℃湁绌烘帴椹充綅"); } /** * 妫�绱㈠簱浣嶅彿 * @return locNo 妫�绱㈠彲鍏ユ帴椹充綅 */ - public AgvBasDevp getDevpNo(int type, int floor, String auto ,String inEable) { + public AgvBasDevp getDevpNo(int type, int floor, String auto, String inEable) { // 鐩爣搴撲綅 AgvBasDevp basDevp = null; // 寮�濮嬫煡鎵惧簱浣� ==============================>> - basDevp = getDevpNoInEable(type,floor,inEable); + basDevp = getDevpNoInEable(type, floor, inEable); if (basDevp != null) { return basDevp; } @@ -349,32 +360,32 @@ } //闅忔満鍙栦竴涓揣浣� - private AgvBasDevp getDevpNoRule(int type,int floor){ + private AgvBasDevp getDevpNoRule(int type, int floor) { return agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>() - .eq("loc_sts","O") - .eq("floor",floor) - .eq("loc_type1",type) - .like("dev_no","DB")); + .eq("loc_sts", "O") + .eq("floor", floor) + .eq("loc_type1", type) + .like("dev_no", "DB")); } //闅忔満鍙栦竴涓揣浣� - private AgvBasDevp getDevpNoAuto(int type,int floor,String auto){ + private AgvBasDevp getDevpNoAuto(int type, int floor, String auto) { return agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>() - .eq("loc_sts","O") - .eq("floor",floor) - .eq("loc_type1",type) - .eq("autoing",auto) - .like("dev_no","DB")); + .eq("loc_sts", "O") + .eq("floor", floor) + .eq("loc_type1", type) + .eq("autoing", auto) + .like("dev_no", "DB")); } //闅忔満鍙栦竴涓揣浣� - private AgvBasDevp getDevpNoInEable(int type,int floor,String inEable){ + private AgvBasDevp getDevpNoInEable(int type, int floor, String inEable) { return agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>() - .eq("loc_sts","O") - .eq("floor",floor) - .eq("loc_type1",type) - .eq("in_enable",inEable) - .like("dev_no","DB")); + .eq("loc_sts", "O") + .eq("floor", floor) + .eq("loc_type1", type) + .eq("in_enable", inEable) + .like("dev_no", "DB")); } } -- Gitblit v1.9.1