Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseStockTransferController.java

@@ -46,7 +46,7 @@ public class TWarehouseStockTransferController extends BaseController {
     /**
      * 查询入库详情主表列表
      */
-//    @PreAuthorize("@ss.hasPermi('warehouseBusiness:StockTransfer:list')")
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:stockTransfer:list')")
     @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/list")
     public TableDataInfo list(TWarehouseBills tWarehouseBills) {
@@ -61,7 +61,7 @@ public class TWarehouseStockTransferController extends BaseController {
     /**
      * 导出入库详情主表列表
      */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:StockTransfer:export')")
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:stockTransfer:export')")
     @Log(title = "详情主表", businessType = BusinessType.EXPORT)
     @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/export")
@@ -75,7 +75,7 @@ public class TWarehouseStockTransferController extends BaseController {
     /**
      * 获取入库仓库详细信息
      */
-//    @PreAuthorize("@ss.hasPermi('warehouseBusiness:StockTransfer:query')")
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:stockTransfer:query')")
     @GetMapping(value = "/{fId}")
     @RepeatSubmit
     public AjaxResult getInfo(@PathVariable("fId") Long fId) {
@@ -85,7 +85,7 @@ public class TWarehouseStockTransferController extends BaseController {
     /**
      * 入库暂存
      */
-//    @PreAuthorize("@ss.hasPermi('warehouseBusiness:StockTransfer:add')")
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:stockTransfer:add')")
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
     @PostMapping(value = "/add")
     @RepeatSubmit
@@ -106,7 +106,7 @@ public class TWarehouseStockTransferController extends BaseController {
     /**
      * 调拨提交
      */
-//    @PreAuthorize("@ss.hasPermi('warehouseBusiness:StockTransfer:add')")
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:stockTransfer:add')")
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
     @PostMapping(value = "/warehouseSubmission")
     @RepeatSubmit
@@ -130,7 +130,7 @@ public class TWarehouseStockTransferController extends BaseController {
     /**
      * 修改入库详情主表
      */
-//    @PreAuthorize("@ss.hasPermi('warehouseBusiness:StockTransfer:edit')")
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:stockTransfer:edit')")
     @Log(title = "详情主表", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TWarehouseBills tWarehouseBills) {
@@ -140,7 +140,7 @@ public class TWarehouseStockTransferController extends BaseController {
     /**
      * 删除入库详情主表
      */
-//    @PreAuthorize("@ss.hasPermi('warehouseBusiness:StockTransfer:remove')")
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:stockTransfer:remove')")
     @Log(title = "详情主表", businessType = BusinessType.DELETE)
     @DeleteMapping("/{fIds}")
     @RepeatSubmit
@@ -148,7 +148,7 @@ public class TWarehouseStockTransferController extends BaseController {
         return toAjax(itWarehouseBillsService.deleteTWarehousebillsByIds(fIds));
     }
 
-//    @PreAuthorize("@ss.hasPermi('warehouseBusiness:StockTransfer:remove')")
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:stockTransfer:remove')")
     @Log(title = "详情主表", businessType = BusinessType.DELETE)
     @DeleteMapping("/queryRemove/{fId}")
     public AjaxResult queryRemove(@PathVariable("fId") Long fId) {
@@ -158,7 +158,7 @@ public class TWarehouseStockTransferController extends BaseController {
     /**
      * 撤销入库信息
      */
-//    @PreAuthorize("@ss.hasPermi('warehouseBusiness:StockTransfer:revoke')")
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:stockTransfer:revoke')")
     @Log(title = "详情主表", businessType = BusinessType.UPDATE)
     @GetMapping("/get/{fId}")
     @RepeatSubmit
@@ -172,7 +172,7 @@ public class TWarehouseStockTransferController extends BaseController {
     /**
      * 撤销入库
      */
-//    @PreAuthorize("@ss.hasPermi('warehouseBusiness:StockTransfer:add')")
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:stockTransfer:add')")
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
     @PostMapping(value = "/updateCredit")
     public AjaxResult deleteCredit(@RequestParam("warehouseBills") String warehouseBills,
@@ -190,7 +190,7 @@ public class TWarehouseStockTransferController extends BaseController {
     /**
      * 调拨确认   状态 改为 -->  已入库
      */
-//    @PreAuthorize("@ss.hasPermi('warehouseBusiness:StockTransfer:add')")
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:stockTransfer:add')")
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
     @PostMapping(value = "/addCredit")
     @RepeatSubmit