From 1a8e7f30035b45771d05cd4cc99aae2743576112 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期五, 17 五月 2024 00:16:46 +0800 Subject: [PATCH] # 手动调拨 --- src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 46 insertions(+), 9 deletions(-) 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 65a5db0..a5cd6e2 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java @@ -326,7 +326,9 @@ if (Cools.isEmpty(agvBasDevp)) { throw new CoolException("鏆傛棤"+ station + "绔欑偣"); } - if (containerType == 21 && agvBasDevp.getFloor() == 3) { + if (containerType == 40) { + locType = 5; + } else if (containerType == 21 && agvBasDevp.getFloor() == 3) { locType = 4; } else if (containerType == 20 && agvBasDevp.getFloor() == 3) { locType = 2; @@ -391,7 +393,7 @@ } //瀵绘壘鐩稿簲绫诲瀷鐨勭┖鎵樼洏 - AgvLocMast agvLocMast = agvLocMastService.selectEmptyZpallet(containerType); + AgvLocMast agvLocMast = agvLocMastService.selectEmptyZpallet(containerType,agvBasDevp.getFloor()); if(containerType == 0){ //绌烘澘鑷姩鍑哄簱锛屾牴鎹珯鐐圭被鍨嬮�夋嫨 agvLocMastService.selectEmptyZpalletByLocType1(agvBasDevp.getLocType1()); @@ -566,6 +568,10 @@ //淇敼鍑哄簱绔欑偣鐘舵�� agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getLocNo(),"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue()); } + if(wrkMast.getIoType() == 1 || wrkMast.getIoType() == 53 ){ + //淇敼鍑哄簱绔欑偣鐘舵�� + agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getSourceLocNo(),"O","",wrkMast.getWhsType().shortValue()); + } //鍑哄簱浠诲姟 110.绌烘澘鍑哄簱 if(wrkMast.getIoType() == 110){ agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getLocNo(),"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue()); @@ -574,7 +580,7 @@ } @Transactional - public void cancelWrkMast(String workNo, Long userId) { + public void cancelWrkMast(String workNo, Long userId,Integer type) { AgvWrkMast wrkMast = agvWrkMastService.selectById(workNo); if (Cools.isEmpty(wrkMast)){ throw new CoolException(workNo+"宸ヤ綔妗d笉瀛樺湪"); @@ -593,16 +599,45 @@ agvLocMastService.updateLocStsByLocNo(locNo,"O","",null); agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue()); + // 绉诲簱鍙栨秷 + } else if( wrkMast.getIoType() == 11 || wrkMast.getIoType() == 12) { + //婧愬簱浣� + String locNo = wrkMast.getSourceLocNo(); + + // 鐩爣搴撲綅 + String targetLocNo = wrkMast.getLocNo(); + agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo)); + agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null); + // 鑷姩璋冩嫧鍑哄簱鍙栨秷 + } else if(wrkMast.getIoType() == 108 || wrkMast.getIoType() == 111) { + // 婧愬簱浣� + String locNo = wrkMast.getSourceLocNo(); + // 鐩爣搴撲綅 + String targetLocNo = wrkMast.getLocNo(); + agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo),"",(short)0); + if (wrkMast.getIoType() == 108) { + agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null); + } else { + agvBasDevpService.updateLocStsAndBarcodeByDevNo(targetLocNo,"O","",wrkMast.getWhsType().shortValue()); + } + + List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo)); + // 鏇存柊璁㈠崟 + for (AgvLocDetl agvLocDetl : agvLocDetls) { + OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode())); + orderDetl.setQty(orderDetl.getQty() - agvLocDetl.getAnfme()); + if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no","DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){ + throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr()); + } + } //鍑哄簱鍙栨秷 - }else { + } else { //婧愬簱浣� String locNo = wrkMast.getSourceLocNo(); //鐩爣绔欑偣 String devNo = wrkMast.getLocNo(); agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo)); - if(devNo.contains("@")){ - agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null); - } + agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null); } if(wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10){ @@ -639,9 +674,11 @@ if(!agvWrkMastService.deleteByWrkNo(wrkMast.getWrkNo()) || !agvWrkDetlService.deleteByWrkNo(wrkMast.getWrkNo())){ throw new CoolException("鍒犻櫎澶辫触锛岃鑱旂郴绠$悊鍛�"); } + if (type == 2) { + //璋冪敤agv鍙栨秷浠诲姟鎺ュ彛 + agvWrkMastService.callCancelTask(wrkMast.getWrkNo()); + } - //璋冪敤agv鍙栨秷浠诲姟鎺ュ彛 - agvWrkMastService.callCancelTask(wrkMast.getWrkNo()); } -- Gitblit v1.9.1