盘点单权限

xqs
1 parent aca6122c
Showing 4 changed files with 41 additions and 39 deletions
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java
src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java
src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html
src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html
@@ -58,9 +58,10 @@ public class CycleCountDetailController extends BaseController {
  
  
  
-
     private String prefix = "inventory/cycleCountDetail";
  
+
+    @RequiresPermissions("inventory:cyclecountDetail:view")
     @GetMapping()
     public String cyclecountHeader()
     {
@@ -70,7 +71,7 @@ public class CycleCountDetailController extends BaseController {
     /**
      * 查询盘点单主列表
      */
-    //@RequiresPermissions("inventory:cycleCount:list")
+    @RequiresPermissions("inventory:cycleCountDetail:list")
     @PostMapping("/list")
     @Log(title = "库存-盘点",operating = "查看盘点明细", action = BusinessType.GRANT)
     @ResponseBody
@@ -143,7 +144,7 @@ public class CycleCountDetailController extends BaseController {
     /**
      * 新增保存盘点明细
      */
-    //@RequiresPermissions("inventory:cyclecountDetail:add")
+    @RequiresPermissions("inventory:cyclecountDetail:add")
     @Log(title = "库存-盘点", operating = "新增盘点补货明细", action = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
@@ -155,7 +156,7 @@ public class CycleCountDetailController extends BaseController {
     /**
      * 删除盘点明细
      */
-    //@RequiresPermissions("inventory:cyclecountDetail:remove")
+    @RequiresPermissions("inventory:cyclecountDetail:remove")
     @Log(title = "库存-盘点", operating = "删除盘点明细", action = BusinessType.DELETE)
     @PostMapping( "/remove")
     @ResponseBody
@@ -194,7 +195,7 @@ public class CycleCountDetailController extends BaseController {
     }
  
     /**生成全部盘点任务*/
-    //@RequiresPermissions("inventory:cyclecountDetail:createTask")
+    @RequiresPermissions("inventory:cyclecountDetail:createTask")
     @PostMapping("/createCycleCountTaskByHeadId")
     @ResponseBody
     public AjaxResult createCycleCountTaskByHeadId(String cycleCountHeadCode){
@@ -205,7 +206,7 @@ public class CycleCountDetailController extends BaseController {
     }
  
     /**生成单条盘点任务*/
-    //@RequiresPermissions("inventory:cyclecountDetail:createTask")
+    @RequiresPermissions("inventory:cyclecountDetail:createTask")
     @PostMapping("/createCycleCoutTaskByDetailId")
     @ResponseBody
     public AjaxResult createCycleCoutTaskByDetailId(Integer cycleCoutdetailId){
@@ -221,7 +222,7 @@ public class CycleCountDetailController extends BaseController {
      * @param qty
      * @return
      */
-    //@RequiresPermissions("inventory:cyclecountDetail:confirm")
+    @RequiresPermissions("inventory:cyclecountDetail:confirm")
     @PostMapping("/confirmGapQty")
     @ResponseBody
     public AjaxResult confirmGapQty(Integer detailId, BigDecimal qty){
@@ -233,7 +234,7 @@ public class CycleCountDetailController extends BaseController {
      * @param cycleCountHeadCode
      * @return
      */
-    //@RequiresPermissions("inventory:cyclecountDetail:cyclecountRepeat")
+    @RequiresPermissions("inventory:cyclecountDetail:cyclecountRepeat")
     @PostMapping("/createCyclecountWithGapQty")
     @ResponseBody
     public AjaxResult createCyclecountWithGapQty(String cycleCountHeadCode){
@@ -44,15 +44,12 @@ public class CycleCountHeaderController extends BaseController {
     private CycleCountHeaderService cycleCountHeaderService;
     @Resource
     private CycleCountDetailService cycleCountDetailService;
-    @Resource
-    private AdjustHeaderService adjustHeaderService;
-
  
  
     private String prefix = "inventory/cycleCountHeader";
  
  
-    //@RequiresPermissions("inventory:cycleCount:view")
+    @RequiresPermissions("inventory:cycleCountHeader:view")
     @GetMapping()
     public String cyclecountHeader()
     {
@@ -62,7 +59,7 @@ public class CycleCountHeaderController extends BaseController {
     /**
      * 查询盘点单主列表
      */
-    //@RequiresPermissions("inventory:cycleCount:list")
+    @RequiresPermissions("inventory:cycleCountHeader:list")
     @PostMapping("/list")
     @Log(title = "库存-盘点",operating = "查看盘点主单", action = BusinessType.GRANT)
     @ResponseBody
@@ -95,6 +92,9 @@ public class CycleCountHeaderController extends BaseController {
         }
  
     }
+
+
+
     /**
      * 新增盘点单主
      */
@@ -107,7 +107,7 @@ public class CycleCountHeaderController extends BaseController {
     /**
      * 新增保存盘点单主
      */
-    //@RequiresPermissions("inventory:cycleCount:add")
+    @RequiresPermissions("inventory:cycleCountHeader:add")
     @Log(title = "库存-盘点",operating = "新增盘点主单", action = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
@@ -137,7 +137,7 @@ public class CycleCountHeaderController extends BaseController {
     /**
      * 修改保存盘点单主
      */
-    //@RequiresPermissions("inventory:cycleCount:edit")
+    @RequiresPermissions("inventory:cycleCountHeader:edit")
     @Log(title = "库存-盘点",operating = "修改盘点主单", action = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
@@ -151,7 +151,7 @@ public class CycleCountHeaderController extends BaseController {
     /**
      * 删除盘点单主
      */
-    //@RequiresPermissions("inventory:cycleCount:remove")
+    @RequiresPermissions("inventory:cycleCountHeader:remove")
     @Log(title = "库存-盘点",operating = "删除盘点主单", action = BusinessType.DELETE)
     @PostMapping( "/remove")
     @ResponseBody
@@ -173,7 +173,7 @@ public class CycleCountHeaderController extends BaseController {
      *
      * 生成调整单
      * */
-    //@RequiresPermissions("inventory:cyclecountHead:addAdjust")
+    @RequiresPermissions("inventory:cyclecountHead:addAdjust")
     @Log(title = "库存-盘点", operating = "新增盘点差异调整单", action = BusinessType.INSERT)
     @PostMapping("/goAdjust")
     @ResponseBody
@@ -187,7 +187,7 @@ public class CycleCountHeaderController extends BaseController {
      *  盘点单报表打印
      * @return
      */
-    //@RequiresPermissions("inventory:cycleCount:report")
+    @RequiresPermissions("inventory:cycleCountHeader:report")
     @GetMapping("/report/{id}")
     public String report(@PathVariable("id") Integer id, ModelMap mmap)
     {
@@ -85,7 +85,7 @@
         </div>
         <div class="btn-group hidden-xs" id="toolbar" role="group">
             <a class="btn btn-outline btn-success btn-rounded" onclick="add()"
-               shiro:hasPermission="inventory:cycleCountDetail:add">
+               shiro:hasPermission="inventory:cyclecountDetail:add">
                 <i class="fa fa-plus"></i> 新增
             </a>
             <a class="btn btn-outline btn-danger btn-rounded" onclick="createCyclecountWithGapQty()"
@@ -98,7 +98,7 @@
             </a>
             <a class="btn btn-outline btn-danger btn-rounded" onclick="batRemove()"
                shiro:hasPermission="inventory:cyclecountDetail:remove">
-                <i class="fa fa-trash-o"></i> 批量删除
+                <i class="fa fa-trash-o"></i> 删除
             </a>
             <a class="btn btn-outline btn-success btn-rounded" onclick="$.table.refresh()">
                 <i class="fa fa-refresh"></i> 刷新
@@ -109,10 +109,10 @@
 </div>
 <div th:include="include :: footer"></div>
 <script th:inline="javascript">
-    var editFlag = [[${@permission.hasPermi('inventoryHeader:cycleCountDetail:edit')}]];
-    var removeFlag = [[${@permission.hasPermi('inventoryHeader:cycleCountDetail:remove')}]];
-    var confirmFlag=[[${@permission.hasPermi('inventoryHeader:cycleCountDetail:confirm')}]];
-    var createTaskFalg=[[${@permission.hasPermi('inventoryHeader:cycleCountDetail:createTask')}]];
+    //var editFlag = [[${@permission.hasPermi('inventory:cyclecountDetail:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('inventory:cyclecountDetail:remove')}]];
+    var confirmFlag = [[${@permission.hasPermi('inventory:cyclecountDetail:confirm')}]];
+    var createTaskFalg = [[${@permission.hasPermi('inventory:cyclecountDetail:createTask')}]];
     var prefix = ctx + "inventory/cycleCountDetail";
     var prefix_head = ctx + "inventory/cycleCountHeader";
     var remove_url= prefix + "/remove";
@@ -319,11 +319,12 @@
                     formatter: function (value, row, index) {
                         var actions = [];
  
-                            actions.push('<a class="btn btn-success btn-xs " href="#" onclick="confirmGapQty(\'' + row.id + '\')"><i class="fa fa-comment"></i>实盘登记</a> ');
+                            actions.push('<a class="btn btn-success btn-xs ' + confirmFlag + '" href="#" onclick="confirmGapQty(\'' + row.id + '\')"><i class="fa fa-comment"></i>实盘登记</a> ');
  
-                            actions.push('<a class="btn btn-primary btn-xs " href="#" onclick="outcheck(\'' + row.id + '\')"><i class="fa fa-gbp"></i>生成盘点任务</a> ');
+                            actions.push('<a class="btn btn-primary btn-xs ' + createTaskFalg + '" href="#" onclick="outcheck(\'' + row.id + '\')"><i class="fa fa-gbp"></i>生成盘点任务</a> ');
+
+                            actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>');
  
-                        actions.push('<a class="btn btn-danger btn-xs " href="#" onclick="remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>');
                         return actions.join('');
                     }
                 }]
@@ -70,13 +70,13 @@
                     </div>
                     <div class="btn-group hidden-xs" id="toolbar" role="group">
                         <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()"
-                           shiro:hasPermission="inventory:cycleCount:add">
+                           shiro:hasPermission="inventory:cycleCountHeader:add">
                             <i class="fa fa-plus"></i> 新增
                         </a>
-                        <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()"
-                           shiro:hasPermission="inventory:cycleCount:remove">
+                        <!--<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()"
+                           shiro:hasPermission="inventory:cycleCountHeader:remove">
                             <i class="fa fa-trash-o"></i> 删除
-                        </a>
+                        </a>-->
                     </div>
                     <table id="bootstrap-table" data-mobile-responsive="true"
                            class="table table-bordered table-hover"></table>
@@ -89,10 +89,10 @@
 </div>
 <div th:include="include :: footer"></div>
 <script th:inline="javascript">
-    var reportFlag = [[${@permission.hasPermi('inventoryHeader:cycleCount:report')}]];
-    var editFlag = [[${@permission.hasPermi('inventoryHeader:cycleCount:edit')}]];
-    var addAdjust = [[${@permission.hasPermi('inventoryHeader:cyclecountHead:addAdjust')}]];
-    var removeFlag = [[${@permission.hasPermi('inventoryHeader:cycleCount:remove')}]];
+    var reportFlag = [[${@permission.hasPermi('inventory:cycleCountHeader:report')}]];
+    //var editFlag = [[${@permission.hasPermi('inventory:cycleCountHeader:edit')}]];
+    var addAdjust = [[${@permission.hasPermi('inventory:cyclecountHead:addAdjust')}]];
+    var removeFlag = [[${@permission.hasPermi('inventory:cycleCount:remove')}]];
     var prefix = ctx + "inventory/cycleCountHeader";
     var datas = [[${@dict.getType('sys_normal_disable')}]];
     var types = [[${@dict.getType('cyclecountType')}]];
@@ -274,12 +274,12 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs " href="#" onclick="cyclecountPrint(\'' + row.id + '\')"><i class="fa fa-print"></i>打印</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + reportFlag + '" href="#" onclick="cyclecountPrint(\'' + row.id + '\')"><i class="fa fa-print"></i>打印</a> ');
  
-                        actions.push('<a class="btn btn-warning btn-xs " href="#" onclick="goAdjust(\'' + row.id + '\')"><i class="fa fa-gbp"></i>生成调整单</a> ');
+                        actions.push('<a class="btn btn-warning btn-xs ' + addAdjust + '" href="#" onclick="goAdjust(\'' + row.id + '\')"><i class="fa fa-gbp"></i>生成调整单</a> ');
  
-                        //actions.push('<a class="btn btn-info btn-xs " href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs " href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a> ');
+                        //actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a> ');
                          return actions.join('');
                     }
                 }]