From 7074c73ea7e429a15c39dce8329f22961e8e2e3e Mon Sep 17 00:00:00 2001 From: tqs <56479841@qq.com> Date: 星期五, 31 五月 2024 08:49:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'gitbit/phyzasrs' into phyzasrs --- src/main/java/com/zy/asrs/controller/AgvMobileController.java | 6 ++++++ src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 15 ++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java index 2e5c799..295a764 100644 --- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java +++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java @@ -27,6 +27,8 @@ @RequestMapping("agvMobile") public class AgvMobileController extends BaseController { + + @Autowired private AgvMobileService agvMobileService; @Autowired @@ -432,6 +434,10 @@ if (!Cools.isEmpty(source_loc_no)) { throw new CoolException("褰撳墠搴撲綅宸茬敓鎴愪换鍔★紒"); } + AgvLocMast locMastS = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo).eq("loc_sts","F")); + if (Cools.isEmpty(locMastS)) { + throw new CoolException("褰撳墠搴撲綅闈炲湪搴撶姸鎬侊紒搴撲綅鍙�="+locNo); + } AgvWrkMast wrkMast = createWrkMast(ioType, 22L, locNo, "", barcode, now, getUserId(), 30,floor); // 鍚屾璋冩嫧鍗� List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo)); 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 b71cbd0..f875725 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java @@ -647,7 +647,10 @@ } } // 鑷姩璋冩嫧鍑哄簱鍙栨秷 - } else if(wrkMast.getIoType() == 108 || wrkMast.getIoType() == 111) { + } else if(wrkMast.getIoType() == 108 || wrkMast.getIoType() == 111 || wrkMast.getIoType() == 112) { + if (wrkMast.getIoType() == 112) { + throw new CoolException("褰撳墠浣滀笟涓嶈兘鍙栨秷锛�"); + } // 婧愬簱浣� String locNo = wrkMast.getSourceLocNo(); // 鐩爣搴撲綅 @@ -658,9 +661,15 @@ agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null); } } else { - if (wrkMast.getWrkSts() != 22) { - agvBasDevpService.updateLocStsAndBarcodeByDevNo(targetLocNo,"O","",wrkMast.getWhsType().shortValue()); + if (wrkMast.getWrkSts() != 207L && wrkMast.getWrkSts() != 205L) { + if (wrkMast.getWrkSts() != 22) { + agvBasDevpService.updateLocStsAndBarcodeByDevNo(targetLocNo,"O","",wrkMast.getWhsType().shortValue()); + } + } else { + throw new CoolException("褰撳墠浣滀笟涓嶈兘鍙栨秷锛�"); } + + } List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo)); -- Gitblit v1.9.1