fix:放入移除托盘锁逻辑调整

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<TrayState> trayList = deviceStateService.getDeviceState().getTray();
-            trayList.removeIf(TrayState::isInSolutionModule);
-            deviceStateService.getDeviceState().getSolutionModule().setTrayStatus(0);
-            solutionModuleService.releaseSolutionModule();
-        }
+        List<TrayState> trayList = deviceStateService.getDeviceState().getTray();
+        trayList.removeIf(TrayState::isInSolutionModule);
+        deviceStateService.getDeviceState().getSolutionModule().setTrayStatus(0);
+        solutionModuleService.releaseSolutionModule();
     }
 
     /**

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);