删除权限注解,出入库移库

2025-07-18 11:30:09 +08:00
parent ab1dda6422
commit 03af50ad9b
16 changed files with 115 additions and 50 deletions
--- a/klp-wms/src/main/java/com/klp/controller/WmsCategoryController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsCategoryController.java
@@ -40,7 +40,6 @@ public class WmsCategoryController extends BaseController {
    /**
     * 查询通用分类列表
     */
-    @SaCheckPermission("klp:category:list")
    @GetMapping("/list")
    public TableDataInfo<WmsCategoryVo> list(WmsCategoryBo bo, PageQuery pageQuery) {
        return iWmsCategoryService.queryPageList(bo, pageQuery);
@@ -49,7 +48,6 @@ public class WmsCategoryController extends BaseController {
    /**
     * 导出通用分类列表
     */
-    @SaCheckPermission("klp:category:export")
    @Log(title = "通用分类", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(WmsCategoryBo bo, HttpServletResponse response) {
@@ -62,7 +60,6 @@ public class WmsCategoryController extends BaseController {
     *
     * @param categoryId 主键
     */
-    @SaCheckPermission("klp:category:query")
    @GetMapping("/{categoryId}")
    public R<WmsCategoryVo> getInfo(@NotNull(message = "主键不能为空")
                                     @PathVariable Long categoryId) {
@@ -72,7 +69,6 @@ public class WmsCategoryController extends BaseController {
    /**
     * 新增通用分类
     */
-    @SaCheckPermission("klp:category:add")
    @Log(title = "通用分类", businessType = BusinessType.INSERT)
    @RepeatSubmit()
    @PostMapping()
@@ -96,7 +92,6 @@ public class WmsCategoryController extends BaseController {
     *
     * @param categoryIds 主键串
     */
-    @SaCheckPermission("klp:category:remove")
    @Log(title = "通用分类", businessType = BusinessType.DELETE)
    @DeleteMapping("/{categoryIds}")
    public R<Void> remove(@NotEmpty(message = "主键不能为空")
--- a/klp-wms/src/main/java/com/klp/controller/WmsOrderController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsOrderController.java
@@ -40,7 +40,6 @@ public class WmsOrderController extends BaseController {
    /**
     * 查询订单主列表
     */
-    @SaCheckPermission("klp:order:list")
    @GetMapping("/list")
    public TableDataInfo<WmsOrderVo> list(WmsOrderBo bo, PageQuery pageQuery) {
        return iWmsOrderService.queryPageList(bo, pageQuery);
@@ -49,7 +48,6 @@ public class WmsOrderController extends BaseController {
    /**
     * 导出订单主列表
     */
-    @SaCheckPermission("klp:order:export")
    @Log(title = "订单主", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(WmsOrderBo bo, HttpServletResponse response) {
@@ -62,7 +60,6 @@ public class WmsOrderController extends BaseController {
     *
     * @param orderId 主键
     */
-    @SaCheckPermission("klp:order:query")
    @GetMapping("/{orderId}")
    public R<WmsOrderVo> getInfo(@NotNull(message = "主键不能为空")
                                 @PathVariable Long orderId) {
@@ -72,7 +69,6 @@ public class WmsOrderController extends BaseController {
    /**
     * 新增订单主
     */
-    @SaCheckPermission("klp:order:add")
    @Log(title = "订单主", businessType = BusinessType.INSERT)
    @RepeatSubmit()
    @PostMapping()
@@ -83,7 +79,6 @@ public class WmsOrderController extends BaseController {
    /**
     * 修改订单主
     */
-    @SaCheckPermission("klp:order:edit")
    @Log(title = "订单主", businessType = BusinessType.UPDATE)
    @RepeatSubmit()
    @PutMapping()
@@ -96,7 +91,6 @@ public class WmsOrderController extends BaseController {
     *
     * @param orderIds 主键串
     */
-    @SaCheckPermission("klp:order:remove")
    @Log(title = "订单主", businessType = BusinessType.DELETE)
    @DeleteMapping("/{orderIds}")
    public R<Void> remove(@NotEmpty(message = "主键不能为空")
--- a/klp-wms/src/main/java/com/klp/controller/WmsOrderDetailController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsOrderDetailController.java
@@ -40,7 +40,6 @@ public class WmsOrderDetailController extends BaseController {
    /**
     * 查询订单明细列表
     */
-    @SaCheckPermission("klp:orderDetail:list")
    @GetMapping("/list")
    public TableDataInfo<WmsOrderDetailVo> list(WmsOrderDetailBo bo, PageQuery pageQuery) {
        return iWmsOrderDetailService.queryPageList(bo, pageQuery);
@@ -49,7 +48,6 @@ public class WmsOrderDetailController extends BaseController {
    /**
     * 导出订单明细列表
     */
-    @SaCheckPermission("klp:orderDetail:export")
    @Log(title = "订单明细", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(WmsOrderDetailBo bo, HttpServletResponse response) {
@@ -62,7 +60,6 @@ public class WmsOrderDetailController extends BaseController {
     *
     * @param detailId 主键
     */
-    @SaCheckPermission("klp:orderDetail:query")
    @GetMapping("/{detailId}")
    public R<WmsOrderDetailVo> getInfo(@NotNull(message = "主键不能为空")
                                     @PathVariable Long detailId) {
@@ -72,7 +69,6 @@ public class WmsOrderDetailController extends BaseController {
    /**
     * 新增订单明细
     */
-    @SaCheckPermission("klp:orderDetail:add")
    @Log(title = "订单明细", businessType = BusinessType.INSERT)
    @RepeatSubmit()
    @PostMapping()
@@ -83,7 +79,6 @@ public class WmsOrderDetailController extends BaseController {
    /**
     * 修改订单明细
     */
-    @SaCheckPermission("klp:orderDetail:edit")
    @Log(title = "订单明细", businessType = BusinessType.UPDATE)
    @RepeatSubmit()
    @PutMapping()
@@ -96,7 +91,6 @@ public class WmsOrderDetailController extends BaseController {
     *
     * @param detailIds 主键串
     */
-    @SaCheckPermission("klp:orderDetail:remove")
    @Log(title = "订单明细", businessType = BusinessType.DELETE)
    @DeleteMapping("/{detailIds}")
    public R<Void> remove(@NotEmpty(message = "主键不能为空")
--- a/klp-wms/src/main/java/com/klp/controller/WmsProductBomController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsProductBomController.java
@@ -40,7 +40,6 @@ public class WmsProductBomController extends BaseController {
    /**
     * 查询产品BOM（产品-原材料清单）列表
     */
-    @SaCheckPermission("klp:productBom:list")
    @GetMapping("/list")
    public TableDataInfo<WmsProductBomVo> list(WmsProductBomBo bo, PageQuery pageQuery) {
        return iWmsProductBomService.queryPageList(bo, pageQuery);
@@ -49,7 +48,6 @@ public class WmsProductBomController extends BaseController {
    /**
     * 导出产品BOM（产品-原材料清单）列表
     */
-    @SaCheckPermission("klp:productBom:export")
    @Log(title = "产品BOM（产品-原材料清单）", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(WmsProductBomBo bo, HttpServletResponse response) {
@@ -62,7 +60,6 @@ public class WmsProductBomController extends BaseController {
     *
     * @param bomId 主键
     */
-    @SaCheckPermission("klp:productBom:query")
    @GetMapping("/{bomId}")
    public R<WmsProductBomVo> getInfo(@NotNull(message = "主键不能为空")
                                     @PathVariable Long bomId) {
@@ -72,7 +69,6 @@ public class WmsProductBomController extends BaseController {
    /**
     * 新增产品BOM（产品-原材料清单）
     */
-    @SaCheckPermission("klp:productBom:add")
    @Log(title = "产品BOM（产品-原材料清单）", businessType = BusinessType.INSERT)
    @RepeatSubmit()
    @PostMapping()
@@ -83,7 +79,6 @@ public class WmsProductBomController extends BaseController {
    /**
     * 修改产品BOM（产品-原材料清单）
     */
-    @SaCheckPermission("klp:productBom:edit")
    @Log(title = "产品BOM（产品-原材料清单）", businessType = BusinessType.UPDATE)
    @RepeatSubmit()
    @PutMapping()
@@ -96,7 +91,6 @@ public class WmsProductBomController extends BaseController {
     *
     * @param bomIds 主键串
     */
-    @SaCheckPermission("klp:productBom:remove")
    @Log(title = "产品BOM（产品-原材料清单）", businessType = BusinessType.DELETE)
    @DeleteMapping("/{bomIds}")
    public R<Void> remove(@NotEmpty(message = "主键不能为空")
--- a/klp-wms/src/main/java/com/klp/controller/WmsProductController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsProductController.java
@@ -40,7 +40,6 @@ public class WmsProductController extends BaseController {
    /**
     * 查询产品列表
     */
-    @SaCheckPermission("klp:product:list")
    @GetMapping("/list")
    public TableDataInfo<WmsProductVo> list(WmsProductBo bo, PageQuery pageQuery) {
        return iWmsProductService.queryPageList(bo, pageQuery);
@@ -49,7 +48,6 @@ public class WmsProductController extends BaseController {
    /**
     * 导出产品列表
     */
-    @SaCheckPermission("klp:product:export")
    @Log(title = "产品", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(WmsProductBo bo, HttpServletResponse response) {
@@ -62,7 +60,6 @@ public class WmsProductController extends BaseController {
     *
     * @param productId 主键
     */
-    @SaCheckPermission("klp:product:query")
    @GetMapping("/{productId}")
    public R<WmsProductVo> getInfo(@NotNull(message = "主键不能为空")
                                     @PathVariable Long productId) {
@@ -72,7 +69,6 @@ public class WmsProductController extends BaseController {
    /**
     * 新增产品
     */
-    @SaCheckPermission("klp:product:add")
    @Log(title = "产品", businessType = BusinessType.INSERT)
    @RepeatSubmit()
    @PostMapping()
@@ -83,7 +79,6 @@ public class WmsProductController extends BaseController {
    /**
     * 修改产品
     */
-    @SaCheckPermission("klp:product:edit")
    @Log(title = "产品", businessType = BusinessType.UPDATE)
    @RepeatSubmit()
    @PutMapping()
@@ -96,7 +91,6 @@ public class WmsProductController extends BaseController {
     *
     * @param productIds 主键串
     */
-    @SaCheckPermission("klp:product:remove")
    @Log(title = "产品", businessType = BusinessType.DELETE)
    @DeleteMapping("/{productIds}")
    public R<Void> remove(@NotEmpty(message = "主键不能为空")
--- a/klp-wms/src/main/java/com/klp/controller/WmsProductionLineController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsProductionLineController.java
@@ -40,7 +40,6 @@ public class WmsProductionLineController extends BaseController {
    /**
     * 查询产线列表
     */
-    @SaCheckPermission("klp:productionLine:list")
    @GetMapping("/list")
    public TableDataInfo<WmsProductionLineVo> list(WmsProductionLineBo bo, PageQuery pageQuery) {
        return iWmsProductionLineService.queryPageList(bo, pageQuery);
@@ -49,7 +48,6 @@ public class WmsProductionLineController extends BaseController {
    /**
     * 导出产线列表
     */
-    @SaCheckPermission("klp:productionLine:export")
    @Log(title = "产线", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(WmsProductionLineBo bo, HttpServletResponse response) {
@@ -62,7 +60,6 @@ public class WmsProductionLineController extends BaseController {
     *
     * @param lineId 主键
     */
-    @SaCheckPermission("klp:productionLine:query")
    @GetMapping("/{lineId}")
    public R<WmsProductionLineVo> getInfo(@NotNull(message = "主键不能为空")
                                     @PathVariable Long lineId) {
@@ -72,7 +69,6 @@ public class WmsProductionLineController extends BaseController {
    /**
     * 新增产线
     */
-    @SaCheckPermission("klp:productionLine:add")
    @Log(title = "产线", businessType = BusinessType.INSERT)
    @RepeatSubmit()
    @PostMapping()
@@ -83,7 +79,6 @@ public class WmsProductionLineController extends BaseController {
    /**
     * 修改产线
     */
-    @SaCheckPermission("klp:productionLine:edit")
    @Log(title = "产线", businessType = BusinessType.UPDATE)
    @RepeatSubmit()
    @PutMapping()
@@ -96,7 +91,6 @@ public class WmsProductionLineController extends BaseController {
     *
     * @param lineIds 主键串
     */
-    @SaCheckPermission("klp:productionLine:remove")
    @Log(title = "产线", businessType = BusinessType.DELETE)
    @DeleteMapping("/{lineIds}")
    public R<Void> remove(@NotEmpty(message = "主键不能为空")
--- a/klp-wms/src/main/java/com/klp/controller/WmsPurchasePlanController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsPurchasePlanController.java
@@ -40,7 +40,6 @@ public class WmsPurchasePlanController extends BaseController {
    /**
     * 查询采购计划主列表
     */
-    @SaCheckPermission("klp:purchasePlan:list")
    @GetMapping("/list")
    public TableDataInfo<WmsPurchasePlanVo> list(WmsPurchasePlanBo bo, PageQuery pageQuery) {
        return iWmsPurchasePlanService.queryPageList(bo, pageQuery);
@@ -49,7 +48,6 @@ public class WmsPurchasePlanController extends BaseController {
    /**
     * 导出采购计划主列表
     */
-    @SaCheckPermission("klp:purchasePlan:export")
    @Log(title = "采购计划主", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(WmsPurchasePlanBo bo, HttpServletResponse response) {
@@ -62,7 +60,6 @@ public class WmsPurchasePlanController extends BaseController {
     *
     * @param planId 主键
     */
-    @SaCheckPermission("klp:purchasePlan:query")
    @GetMapping("/{planId}")
    public R<WmsPurchasePlanVo> getInfo(@NotNull(message = "主键不能为空")
                                     @PathVariable Long planId) {
@@ -72,7 +69,6 @@ public class WmsPurchasePlanController extends BaseController {
    /**
     * 新增采购计划主
     */
-    @SaCheckPermission("klp:purchasePlan:add")
    @Log(title = "采购计划主", businessType = BusinessType.INSERT)
    @RepeatSubmit()
    @PostMapping()
@@ -83,7 +79,6 @@ public class WmsPurchasePlanController extends BaseController {
    /**
     * 修改采购计划主
     */
-    @SaCheckPermission("klp:purchasePlan:edit")
    @Log(title = "采购计划主", businessType = BusinessType.UPDATE)
    @RepeatSubmit()
    @PutMapping()
@@ -96,7 +91,6 @@ public class WmsPurchasePlanController extends BaseController {
     *
     * @param planIds 主键串
     */
-    @SaCheckPermission("klp:purchasePlan:remove")
    @Log(title = "采购计划主", businessType = BusinessType.DELETE)
    @DeleteMapping("/{planIds}")
    public R<Void> remove(@NotEmpty(message = "主键不能为空")
--- a/klp-wms/src/main/java/com/klp/controller/WmsPurchasePlanDetailController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsPurchasePlanDetailController.java
@@ -40,7 +40,6 @@ public class WmsPurchasePlanDetailController extends BaseController {
    /**
     * 查询采购计划明细列表
     */
-    @SaCheckPermission("klp:purchasePlanDetail:list")
    @GetMapping("/list")
    public TableDataInfo<WmsPurchasePlanDetailVo> list(WmsPurchasePlanDetailBo bo, PageQuery pageQuery) {
        return iWmsPurchasePlanDetailService.queryPageList(bo, pageQuery);
@@ -49,7 +48,6 @@ public class WmsPurchasePlanDetailController extends BaseController {
    /**
     * 导出采购计划明细列表
     */
-    @SaCheckPermission("klp:purchasePlanDetail:export")
    @Log(title = "采购计划明细", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(WmsPurchasePlanDetailBo bo, HttpServletResponse response) {
@@ -62,7 +60,6 @@ public class WmsPurchasePlanDetailController extends BaseController {
     *
     * @param detailId 主键
     */
-    @SaCheckPermission("klp:purchasePlanDetail:query")
    @GetMapping("/{detailId}")
    public R<WmsPurchasePlanDetailVo> getInfo(@NotNull(message = "主键不能为空")
                                     @PathVariable Long detailId) {
@@ -72,7 +69,6 @@ public class WmsPurchasePlanDetailController extends BaseController {
    /**
     * 新增采购计划明细
     */
-    @SaCheckPermission("klp:purchasePlanDetail:add")
    @Log(title = "采购计划明细", businessType = BusinessType.INSERT)
    @RepeatSubmit()
    @PostMapping()
@@ -83,7 +79,6 @@ public class WmsPurchasePlanDetailController extends BaseController {
    /**
     * 修改采购计划明细
     */
-    @SaCheckPermission("klp:purchasePlanDetail:edit")
    @Log(title = "采购计划明细", businessType = BusinessType.UPDATE)
    @RepeatSubmit()
    @PutMapping()
@@ -96,7 +91,6 @@ public class WmsPurchasePlanDetailController extends BaseController {
     *
     * @param detailIds 主键串
     */
-    @SaCheckPermission("klp:purchasePlanDetail:remove")
    @Log(title = "采购计划明细", businessType = BusinessType.DELETE)
    @DeleteMapping("/{detailIds}")
    public R<Void> remove(@NotEmpty(message = "主键不能为空")
--- a/klp-wms/src/main/java/com/klp/controller/WmsRawMaterialController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsRawMaterialController.java
@@ -40,7 +40,6 @@ public class WmsRawMaterialController extends BaseController {
    /**
     * 查询原材料列表
     */
-    @SaCheckPermission("klp:rawMaterial:list")
    @GetMapping("/list")
    public TableDataInfo<WmsRawMaterialVo> list(WmsRawMaterialBo bo, PageQuery pageQuery) {
        return iWmsRawMaterialService.queryPageList(bo, pageQuery);
@@ -49,7 +48,6 @@ public class WmsRawMaterialController extends BaseController {
    /**
     * 导出原材料列表
     */
-    @SaCheckPermission("klp:rawMaterial:export")
    @Log(title = "原材料", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(WmsRawMaterialBo bo, HttpServletResponse response) {
@@ -62,7 +60,6 @@ public class WmsRawMaterialController extends BaseController {
     *
     * @param rawMaterialId 主键
     */
-    @SaCheckPermission("klp:rawMaterial:query")
    @GetMapping("/{rawMaterialId}")
    public R<WmsRawMaterialVo> getInfo(@NotNull(message = "主键不能为空")
                                     @PathVariable Long rawMaterialId) {
--- a/klp-wms/src/main/java/com/klp/controller/WmsStockIoController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsStockIoController.java
@@ -103,4 +103,14 @@ public class WmsStockIoController extends BaseController {
                          @PathVariable Long[] stockIoIds) {
        return toAjax(iWmsStockIoService.deleteWithValidByIds(Arrays.asList(stockIoIds), true));
    }
+
+    /**
+     * 审核出入库/移库单
+     */
+    @SaCheckPermission("klp:stockIo:audit")
+    @Log(title = "出入库单主", businessType = BusinessType.UPDATE)
+    @PostMapping("/audit/{stockIoId}")
+    public R<Void> audit(@NotNull(message = "主键不能为空") @PathVariable Long stockIoId) {
+        return toAjax(iWmsStockIoService.auditStockIo(stockIoId));
+    }
 }