Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-majoys into dev

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/storage/StorageController.java

@@ -69,15 +69,17 @@ public class StorageController {
     @Operation(summary = "更新入/出库")
     @PreAuthorize("@ss.hasPermission('biz:storage:update')")
     public CommonResult<Boolean> updateStorage(@Valid @RequestBody StorageSaveReqVO updateReqVO) {
-        try {
+//        try {
+//            storageService.updateStorage(updateReqVO);
+//            return success(true);
+//        }catch (UnexpectedRollbackException ex){
+//            return success(true);
+//        }catch (Exception ex){
+//            throw ex;
+//
+//        }
         storageService.updateStorage(updateReqVO);
         return success(true);
-        }catch (UnexpectedRollbackException ex){
-            return success(true);
-        }catch (Exception ex){
-            throw ex;
-
-        }
     }
     @PutMapping("/update-status")
     @Operation(summary = "更新入/出库")