From 6e05d25d44bd1fa1bab3806e5f2f33d9076664b5 Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期五, 31 五月 2024 11:17:42 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/CheckLocDetlExistScheduler.java | 2 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 360 +++++++++++++++++++++++--------------------- src/main/java/com/zy/asrs/task/AutoMoveScheduler.java | 47 ++++- src/main/java/com/zy/asrs/task/AutoMoveTwoAndThreeGoOneScheduler.java | 18 ++ src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java | 2 5 files changed, 243 insertions(+), 186 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java index cb64c93..26a801d 100644 --- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java +++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java @@ -201,22 +201,41 @@ */ @Scheduled(cron = "0/2 * * * * ? ") private void autoEmptyBack4(){ - // 鏌ヨ 涓嶄负1妤肩殑绌鸿揣鏋� - List<AgvLocMast> agvLocMasts = agvLocMastService.selectList( - new EntityWrapper<AgvLocMast>() - .ne("floor", 1) - .eq("loc_sts","D") - .eq("loc_type1",3)); - if (agvLocMasts.isEmpty()) { - return; - } - for (AgvLocMast agvLocMast : agvLocMasts) { - try{ - autoMoveHandler.autoEmptyBack4(agvLocMast); - } catch (Exception e){ - log.error("搴撲綅鍙�"+agvLocMast.getLocNo()+"绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐� 搴撲綅-鍚稿杞﹂棿,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage()); +// if (determineFloorConnection(2)){ + // 鏌ヨ 涓嶄负1妤肩殑绌鸿揣鏋� + List<AgvLocMast> agvLocMasts = agvLocMastService.selectList( + new EntityWrapper<AgvLocMast>() + .ne("floor", 1) + .eq("loc_sts","D") + .eq("loc_type1",3)); + if (agvLocMasts.isEmpty()) { + return; } + for (AgvLocMast agvLocMast : agvLocMasts) { + try{ + autoMoveHandler.autoEmptyBack4(agvLocMast); + } catch (Exception e){ + log.error("搴撲綅鍙�"+agvLocMast.getLocNo()+"绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐� 搴撲綅-鍚稿杞﹂棿,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage()); + } + } +// } + } + + private boolean determineFloorConnection(Integer floor){ + try{ + List<AgvBasDevp> agvBasDevps = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>().eq("floor", floor).like("dev_no", "DB_")); + if (!agvBasDevps.isEmpty()){ + for (AgvBasDevp agvBasDevp:agvBasDevps){ + if (agvBasDevp.getInEnable().equals("Y")){ + return false; + } + } + return true; + } + }catch (Exception e){ + log.error("鍒ゆ柇褰撳墠妤煎眰鎺ラ┏浣嶆槸鍚﹀叏閮ㄥ叧闂紝寮傚父"+e.getMessage()); } + return false; } /** diff --git a/src/main/java/com/zy/asrs/task/AutoMoveTwoAndThreeGoOneScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveTwoAndThreeGoOneScheduler.java new file mode 100644 index 0000000..872288f --- /dev/null +++ b/src/main/java/com/zy/asrs/task/AutoMoveTwoAndThreeGoOneScheduler.java @@ -0,0 +1,18 @@ +package com.zy.asrs.task; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +// 鑷姩绉诲簱 +@Slf4j +@Component +public class AutoMoveTwoAndThreeGoOneScheduler { + + /** + * 2銆�3妤艰浆绉诲埌1妤间换鍔℃墽琛� + */ +// @Scheduled(cron = "0/2 * * * * ? ") + private void autoMove(){ + + } +} diff --git a/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java b/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java index 4bb6358..8cf793a 100644 --- a/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java +++ b/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java @@ -37,7 +37,7 @@ /* 瀹氭椂閬嶅巻搴撳瓨锛岀敓鎴愯嚜鍔ㄨˉ璐у崟鎹� */ - @Scheduled(cron = "0 */1 * * * ? ") +// @Scheduled(cron = "0 */1 * * * ? ") public void createOrder(){ if(!"Y".equals(Parameter.get().getAutoReplenishment())){ diff --git a/src/main/java/com/zy/asrs/task/CheckLocDetlExistScheduler.java b/src/main/java/com/zy/asrs/task/CheckLocDetlExistScheduler.java index 8567ad2..3711b95 100644 --- a/src/main/java/com/zy/asrs/task/CheckLocDetlExistScheduler.java +++ b/src/main/java/com/zy/asrs/task/CheckLocDetlExistScheduler.java @@ -28,7 +28,7 @@ private ConfigService configService; //姣�30鍒嗛挓鎵弿涓�娆� - @Scheduled(cron = "0 30 * * * ? ") +// @Scheduled(cron = "0 30 * * * ? ") private void execute(){ List<LocMast> locMasts = locMastService.selectLocDetlNotExist(); if (locMasts.isEmpty()) { 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 b2f16b9..855a1f2 100644 --- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java @@ -54,196 +54,211 @@ @Transactional public ReturnT<String> completedPutWayWrk(AgvWrkMast agvWrkMast) { - int wrkNo = agvWrkMast.getWrkNo(); - String barcode = agvWrkMast.getBarcode(); - String orderNo = getOrderNoByWrkNo(wrkNo); - String agvBasDevp = ""; - if (agvWrkMast.getIoType() > 100) { - agvBasDevp = agvWrkMast.getLocNo(); - } else { - agvBasDevp = agvWrkMast.getSourceLocNo(); - } - - - //淇敼宸ヤ綔妗g姸鎬佷负207.搴撳瓨鏇存柊瀹屾垚 - agvWrkMast.setWrkSts(207L); - agvWrkMastService.updateById(agvWrkMast); - // 绌烘澘鍏ュ簱 璁剧疆搴撲綅鐘舵�佷负D.绌烘《/绌烘爤鏉� - String locSts = agvWrkMast.getIoType() == 10 ? "D" : "F"; - if (agvWrkMast.getIoType() == 10 || agvWrkMast.getIoType() == 109 || agvWrkMast.getIoType() == 111 ) { - // 搴撲綅 -- 鎺ラ┏浣� / 搴撲綅 - if ((agvWrkMast.getIoType() == 109 || agvWrkMast.getIoType() == 111) && agvWrkMast.getLocNo().substring(0,2).equals("DB")) { - agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue()); - // 鎺ラ┏浣� -- 搴撲綅 + try{ + int wrkNo = agvWrkMast.getWrkNo(); + String barcode = agvWrkMast.getBarcode(); + String orderNo = getOrderNoByWrkNo(wrkNo); + String agvBasDevp = ""; + if (agvWrkMast.getIoType() > 100) { + agvBasDevp = agvWrkMast.getLocNo(); } else { - agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"D",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue()); + agvBasDevp = agvWrkMast.getSourceLocNo(); } - } else { - agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue()); - } - if (agvWrkMast.getIoType() != 111) { - //鐢熸垚AGV宸ヤ綔鍘嗗彶妗� - agvWrkMastLogService.save(agvWrkMast); - //鐢熸垚AGV宸ヤ綔鏄庣粏鍘嗗彶妗� - agvWrkDetlLogService.save(wrkNo); - } - //绫诲瀷涓哄叆搴撴椂 - if(agvWrkMast.getIoType() == 1){ - //鏇存柊鐩爣搴撲綅鏄庣粏 - log.info("鏇存柊鐩爣搴撲綅鏄庣粏 agvWrkMast.getLocNo(): " + agvWrkMast.getLocNo() + ", wrkNo: " + wrkNo); - agvLocDetlService.addLocDetlInfo(agvWrkMast.getLocNo(),wrkNo); - //鐢熸垚鍏ュ簱閫氱煡鍘嗗彶妗� - boolean save = agvWaitPakinLogService.save(barcode); - //鍒犻櫎鍏ュ簱閫氱煡妗� - log.info("鍒犻櫎鍏ュ簱閫氱煡妗� supp_code: " + barcode); - agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("supp_code",barcode)); - } - //绫诲瀷涓哄簱浣嶇Щ杞椂 - if(agvWrkMast.getIoType() == 11 || agvWrkMast.getIoType() == 12){ - //鏇存柊搴撳瓨鏄庣粏 - agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo()); - //淇敼婧愬簱浣嶇姸鎬佷负O - agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null); - } - - //绫诲瀷涓哄簱浣嶇Щ杞椂 - if(agvWrkMast.getIoType() == 108){ - //鏇存柊搴撳瓨鏄庣粏 - agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo()); - //淇敼婧愬簱浣嶇姸鎬佷负O - agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0); - } - - if(agvWrkMast.getIoType() == 109 || agvWrkMast.getIoType() == 111 || agvWrkMast.getIoType() == 112){ - // 鎺ラ┏浣� -- 搴撲綅 - if (agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) { - agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",(short)0); - // 搴撲綅 -- 鎺ラ┏浣� / 搴撲綅 + //淇敼宸ヤ綔妗g姸鎬佷负207.搴撳瓨鏇存柊瀹屾垚 + agvWrkMast.setWrkSts(207L); + agvWrkMastService.updateById(agvWrkMast); + // 绌烘澘鍏ュ簱 璁剧疆搴撲綅鐘舵�佷负D.绌烘《/绌烘爤鏉� + String locSts = agvWrkMast.getIoType() == 10 ? "D" : "F"; + if (agvWrkMast.getIoType() == 10 || agvWrkMast.getIoType() == 109 || agvWrkMast.getIoType() == 111 ) { + // 搴撲綅 -- 鎺ラ┏浣� / 搴撲綅 + if ((agvWrkMast.getIoType() == 109 || agvWrkMast.getIoType() == 111) && agvWrkMast.getLocNo().substring(0,2).equals("DB")) { + agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue()); + // 鎺ラ┏浣� -- 搴撲綅 + } else { + agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"D",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue()); + } } else { + agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue()); + } + + if (agvWrkMast.getIoType() != 111) { + //鐢熸垚AGV宸ヤ綔鍘嗗彶妗� + agvWrkMastLogService.save(agvWrkMast); + //鐢熸垚AGV宸ヤ綔鏄庣粏鍘嗗彶妗� + agvWrkDetlLogService.save(wrkNo); + } + + //绫诲瀷涓哄叆搴撴椂 + if(agvWrkMast.getIoType() == 1){ + //鏇存柊鐩爣搴撲綅鏄庣粏 + log.info("鏇存柊鐩爣搴撲綅鏄庣粏 agvWrkMast.getLocNo(): " + agvWrkMast.getLocNo() + ", wrkNo: " + wrkNo); + agvLocDetlService.addLocDetlInfo(agvWrkMast.getLocNo(),wrkNo); + //鐢熸垚鍏ュ簱閫氱煡鍘嗗彶妗� + boolean save = agvWaitPakinLogService.save(barcode); + //鍒犻櫎鍏ュ簱閫氱煡妗� + log.info("鍒犻櫎鍏ュ簱閫氱煡妗� supp_code: " + barcode); + agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("supp_code",barcode)); + } + //绫诲瀷涓哄簱浣嶇Щ杞椂 + if(agvWrkMast.getIoType() == 11 || agvWrkMast.getIoType() == 12){ + //鏇存柊搴撳瓨鏄庣粏 + agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo()); + //淇敼婧愬簱浣嶇姸鎬佷负O + agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null); + } + + //绫诲瀷涓哄簱浣嶇Щ杞椂 + if(agvWrkMast.getIoType() == 108){ + //鏇存柊搴撳瓨鏄庣粏 + agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo()); //淇敼婧愬簱浣嶇姸鎬佷负O agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0); } - } - if(agvWrkMast.getIoType() == 113){ - // 鎺ラ┏浣� -- 搴撲綅 - if (agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) { - agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",(short)0); + if(agvWrkMast.getIoType() == 109 || agvWrkMast.getIoType() == 111 || agvWrkMast.getIoType() == 112){ + // 鎺ラ┏浣� -- 搴撲綅 + if (agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) { + agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",(short)0); + // 搴撲綅 -- 鎺ラ┏浣� / 搴撲綅 + } else { + //淇敼婧愬簱浣嶇姸鎬佷负O + agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0); + } } + + if(agvWrkMast.getIoType() == 113){ + // 鎺ラ┏浣� -- 搴撲綅 + if (agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) { + agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",(short)0); + } + } + + if (agvWrkMast.getIoType() == 58) { + agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue()); + } + + + + if (agvWrkMast.getIoType() != 111) { + //鍒犻櫎AGV宸ヤ綔妗� + agvWrkMastService.deleteById(wrkNo); + //鍒犻櫎AGV宸ヤ綔鏄庣粏妗� + agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo)); + } + + if(!isJSON(orderNo)){ + //妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚 + orderService.checkComplete(orderNo); + }else{ + List<Map> maps = JSONArray.parseArray(orderNo, Map.class); + maps.forEach(map -> { + String o = map.get("orderNo").toString(); + orderService.checkComplete(o); + }); + } + + return SUCCESS; + }catch (Exception e){ + log.error(""+e.getMessage()); } - - if (agvWrkMast.getIoType() == 58) { - agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue()); - } - - - - if (agvWrkMast.getIoType() != 111) { - //鍒犻櫎AGV宸ヤ綔妗� - agvWrkMastService.deleteById(wrkNo); - //鍒犻櫎AGV宸ヤ綔鏄庣粏妗� - agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo)); - } - - if(!isJSON(orderNo)){ - //妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚 - orderService.checkComplete(orderNo); - }else{ - List<Map> maps = JSONArray.parseArray(orderNo, Map.class); - maps.forEach(map -> { - String o = map.get("orderNo").toString(); - orderService.checkComplete(o); - }); - } - - return SUCCESS; + return FAIL; } @Transactional public ReturnT<String> completedCarryWrk(AgvWrkMast agvWrkMast) { - int wrkNo = agvWrkMast.getWrkNo(); - String orderNo = getOrderNoByWrkNo(wrkNo); - //淇敼宸ヤ綔妗g姸鎬佷负207.搴撳瓨鏇存柊瀹屾垚 - agvWrkMast.setWrkSts(207L); - agvWrkMastService.updateById(agvWrkMast); - //淇敼婧愬簱浣嶇姸鎬佷负O - agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null); - if(agvWrkMast.getIoType() == 101){ - //鏇存柊鐩爣搴撲綅鏄庣粏 101.鍑哄簱 鍒犻櫎婧愬簱浣嶅簱瀛樻槑缁� - agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no",agvWrkMast.getSourceLocNo())); - //鐢熸垚绌烘澘鍏ュ簱浠诲姟 - Short containerType = Short.valueOf(agvWrkMast.getBarcode().substring(0, 2)); - try { - agvWorkService.emptyPlateIn(agvWrkMast.getLocNo(),agvWrkMast.getBarcode(),containerType,9527L,true); - }catch (Exception e){ - e.printStackTrace(); - log.error(e.getMessage()); + try{ + int wrkNo = agvWrkMast.getWrkNo(); + String orderNo = getOrderNoByWrkNo(wrkNo); + //淇敼宸ヤ綔妗g姸鎬佷负207.搴撳瓨鏇存柊瀹屾垚 + agvWrkMast.setWrkSts(207L); + agvWrkMastService.updateById(agvWrkMast); + //淇敼婧愬簱浣嶇姸鎬佷负O + agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null); + if(agvWrkMast.getIoType() == 101){ + //鏇存柊鐩爣搴撲綅鏄庣粏 101.鍑哄簱 鍒犻櫎婧愬簱浣嶅簱瀛樻槑缁� + agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no",agvWrkMast.getSourceLocNo())); + //鐢熸垚绌烘澘鍏ュ簱浠诲姟 + Short containerType = Short.valueOf(agvWrkMast.getBarcode().substring(0, 2)); + try { + agvWorkService.emptyPlateIn(agvWrkMast.getLocNo(),agvWrkMast.getBarcode(),containerType,9527L,true); + }catch (Exception e){ + e.printStackTrace(); + log.error(e.getMessage()); + } } - } - //鐢熸垚AGV宸ヤ綔鍘嗗彶妗� - agvWrkMastLogService.save(agvWrkMast); - //鐢熸垚AGV宸ヤ綔鏄庣粏鍘嗗彶妗� - agvWrkDetlLogService.save(wrkNo); - //鍒犻櫎AGV宸ヤ綔妗� - agvWrkMastService.deleteById(wrkNo); - //鍒犻櫎AGV宸ヤ綔鏄庣粏妗� - agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo)); - if(!isJSON(orderNo)){ - //妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚 - orderService.checkComplete(orderNo); - }else{ - List<Map> maps = JSONArray.parseArray(orderNo, Map.class); - maps.forEach(map -> { - String o = map.get("orderNo").toString(); - orderService.checkComplete(o); - }); + //鐢熸垚AGV宸ヤ綔鍘嗗彶妗� + agvWrkMastLogService.save(agvWrkMast); + //鐢熸垚AGV宸ヤ綔鏄庣粏鍘嗗彶妗� + agvWrkDetlLogService.save(wrkNo); + //鍒犻櫎AGV宸ヤ綔妗� + agvWrkMastService.deleteById(wrkNo); + //鍒犻櫎AGV宸ヤ綔鏄庣粏妗� + agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo)); + if(!isJSON(orderNo)){ + //妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚 + orderService.checkComplete(orderNo); + }else{ + List<Map> maps = JSONArray.parseArray(orderNo, Map.class); + maps.forEach(map -> { + String o = map.get("orderNo").toString(); + orderService.checkComplete(o); + }); + } + return SUCCESS; + }catch (Exception e){ + log.error(""+e.getMessage()); } - return SUCCESS; + return FAIL; } @Transactional public ReturnT<String> completedCarryWrk2(AgvWrkMast agvWrkMast) { - int wrkNo = agvWrkMast.getWrkNo(); - String orderNo = getOrderNoByWrkNo(wrkNo); - String agvBasDevp = ""; - if (agvWrkMast.getIoType() > 100) { - agvBasDevp = agvWrkMast.getLocNo(); - } else { - agvBasDevp = agvWrkMast.getSourceLocNo(); - } - //淇敼宸ヤ綔妗g姸鎬佷负207.搴撳瓨鏇存柊瀹屾垚 - agvWrkMast.setWrkSts(207L); - agvWrkMastService.updateById(agvWrkMast); - //淇敼婧愬簱浣嶇姸鎬佷负O - agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null); - if(agvWrkMast.getIoType() == 101){ - //鏇存柊鐩爣搴撲綅鏄庣粏 101.鍑哄簱 鍒犻櫎婧愬簱浣嶅簱瀛樻槑缁� - agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no",agvWrkMast.getSourceLocNo())); - } + try{ + int wrkNo = agvWrkMast.getWrkNo(); + String orderNo = getOrderNoByWrkNo(wrkNo); + String agvBasDevp = ""; + if (agvWrkMast.getIoType() > 100) { + agvBasDevp = agvWrkMast.getLocNo(); + } else { + agvBasDevp = agvWrkMast.getSourceLocNo(); + } + //淇敼宸ヤ綔妗g姸鎬佷负207.搴撳瓨鏇存柊瀹屾垚 + agvWrkMast.setWrkSts(207L); + agvWrkMastService.updateById(agvWrkMast); + //淇敼婧愬簱浣嶇姸鎬佷负O + agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null); + if(agvWrkMast.getIoType() == 101){ + //鏇存柊鐩爣搴撲綅鏄庣粏 101.鍑哄簱 鍒犻櫎婧愬簱浣嶅簱瀛樻槑缁� + agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no",agvWrkMast.getSourceLocNo())); + } - //鐢熸垚AGV宸ヤ綔鍘嗗彶妗� - agvWrkMastLogService.save(agvWrkMast); - //鐢熸垚AGV宸ヤ綔鏄庣粏鍘嗗彶妗� - agvWrkDetlLogService.save(wrkNo); - //鍒犻櫎AGV宸ヤ綔妗� - agvWrkMastService.deleteById(wrkNo); - //鍒犻櫎AGV宸ヤ綔鏄庣粏妗� - agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo)); - if(!isJSON(orderNo)){ - //妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚 - orderService.checkComplete(orderNo); - }else{ - List<Map> maps = JSONArray.parseArray(orderNo, Map.class); - maps.forEach(map -> { - String o = map.get("orderNo").toString(); - orderService.checkComplete(o); - }); + //鐢熸垚AGV宸ヤ綔鍘嗗彶妗� + agvWrkMastLogService.save(agvWrkMast); + //鐢熸垚AGV宸ヤ綔鏄庣粏鍘嗗彶妗� + agvWrkDetlLogService.save(wrkNo); + //鍒犻櫎AGV宸ヤ綔妗� + agvWrkMastService.deleteById(wrkNo); + //鍒犻櫎AGV宸ヤ綔鏄庣粏妗� + agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo)); + if(!isJSON(orderNo)){ + //妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚 + orderService.checkComplete(orderNo); + }else{ + List<Map> maps = JSONArray.parseArray(orderNo, Map.class); + maps.forEach(map -> { + String o = map.get("orderNo").toString(); + orderService.checkComplete(o); + }); + } + return SUCCESS; + }catch (Exception e){ + log.error(""+e.getMessage()); } - return SUCCESS; + return FAIL; } @Transactional @@ -265,7 +280,7 @@ } return SUCCESS; }catch (Exception e){ - log.error(e.getMessage()); + log.error("淇敼AGV鍏ュ簱閫氱煡妗g姸鎬佸叆鍑虹姸鎬佷负Y"+e.getMessage()); } return FAIL; } @@ -275,11 +290,16 @@ public ReturnT<String> startAllcationIn(AgvWrkMast agvWrkMast) throws IOException { //涓嬪彂浠诲姟 - int startWrkCode = agvWrkMastService.startAllcationIn(agvWrkMast); - if(startWrkCode != 0){ - throw new CoolException("浠诲姟涓嬪彂澶辫触"); + try{ + int startWrkCode = agvWrkMastService.startAllcationIn(agvWrkMast); + if(startWrkCode != 0){ + throw new CoolException("浠诲姟涓嬪彂澶辫触"); + } + return SUCCESS; + }catch (Exception e){ + log.error("浠诲姟涓嬪彂澶辫触"+e.getMessage()); } - return SUCCESS; + return FAIL; } -- Gitblit v1.9.1