From 68b59166244a626890c08480be4111d65232dc62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Sun, 15 Jun 2025 16:45:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=94=BE=E5=85=A5=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E6=89=98=E7=9B=98=E9=94=81=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iflytop/gd/app/service/api/TrayService.java | 12 +++++------- .../com/iflytop/gd/app/service/crafts/CraftsStepService.java | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/iflytop/gd/app/service/api/TrayService.java b/src/main/java/com/iflytop/gd/app/service/api/TrayService.java index 41fa93d..7fec2f1 100644 --- a/src/main/java/com/iflytop/gd/app/service/api/TrayService.java +++ b/src/main/java/com/iflytop/gd/app/service/api/TrayService.java @@ -42,7 +42,7 @@ public class TrayService { deviceStateService.getDeviceState().getSolutionModule().setTrayStatus(1); deviceStateService.getDeviceState().getSolutionModule().setIdle(false); return trayState; - }else{ + } else { throw new AppException(ResultCode.SOLUTION_MODULE_OCCUPIED); } } @@ -51,12 +51,10 @@ public class TrayService { * 拿走了托盘 */ public synchronized void trayOut() throws InterruptedException { - if (deviceStateService.getDeviceState().getSolutionModule().getTrayStatus() == 1) { - List trayList = deviceStateService.getDeviceState().getTray(); - trayList.removeIf(TrayState::isInSolutionModule); - deviceStateService.getDeviceState().getSolutionModule().setTrayStatus(0); - solutionModuleService.releaseSolutionModule(); - } + List trayList = deviceStateService.getDeviceState().getTray(); + trayList.removeIf(TrayState::isInSolutionModule); + deviceStateService.getDeviceState().getSolutionModule().setTrayStatus(0); + solutionModuleService.releaseSolutionModule(); } /** diff --git a/src/main/java/com/iflytop/gd/app/service/crafts/CraftsStepService.java b/src/main/java/com/iflytop/gd/app/service/crafts/CraftsStepService.java index 9e818a4..34e85af 100644 --- a/src/main/java/com/iflytop/gd/app/service/crafts/CraftsStepService.java +++ b/src/main/java/com/iflytop/gd/app/service/crafts/CraftsStepService.java @@ -361,9 +361,9 @@ public class CraftsStepService { Photos photos = new Photos(); photos.setMode(PhotoModeType.crafts); - photos.setOreId(crafts.getCraft().getId()); + photos.setOreId(crafts.getOres().getId()); + photos.setOreName(crafts.getOres().getName()); photos.setCraftsId(crafts.getCraft().getId()); - photos.setOreName(crafts.getCraft().getName()); photos.setCraftsName(crafts.getCraft().getName()); photos.setImagePath(imagePath); photosService.save(photos);