diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryReportDamageController.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryReportDamageController.java index 0e687b40..36c73ddc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryReportDamageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryReportDamageController.java @@ -112,39 +112,28 @@ public class WarehouseInventoryReportDamageController extends BaseController return toAjax(warehouseInventoryReportDamageService.updateWarehouseInventoryReportDamage(warehouseInventoryReportDamage)); } - /** - * 删除仓库库存报损 - */ - @RequiresPermissions("warehouse:inventoryReportDamage:remove") - @Log(title = "仓库库存报损", businessType = BusinessType.DELETE) - @PostMapping( "/remove") - @ResponseBody - public AjaxResult remove(String ids) - { - return toAjax(warehouseInventoryReportDamageService.deleteWarehouseInventoryReportDamageByIds(ids)); - } /** - * 作废仓库库存报损 + * 仓库库存报损详情 */ - @RequiresPermissions("warehouse:inventoryReportDamage:cancel") - @Log(title = "仓库库存报损", businessType = BusinessType.CANCEL) - @GetMapping( "/cancel/{id}") - @ResponseBody - public AjaxResult cancel(@PathVariable("id") Long id){ - return toAjax(warehouseInventoryReportDamageService.cancelWarehouseInventoryReportDamageById(id)); + @GetMapping("/detail/{reportDamageId}") + public String detail(@PathVariable("reportDamageId") Long reportDamageId, ModelMap mmap) + { + WarehouseInventoryReportDamage warehouseInventoryReportDamage = warehouseInventoryReportDamageService.selectWarehouseInventoryReportDamageById(reportDamageId); + mmap.put("warehouseInventoryReportDamage", warehouseInventoryReportDamage); + return prefix + "/detail"; } /** - * 恢复仓库库存报损 + * 保存仓库库存报损详情 */ - @RequiresPermissions("warehouse:inventoryReportDamage:restore") - @Log(title = "仓库库存报损", businessType = BusinessType.RESTORE) - @GetMapping( "/restore/{id}") + @RequiresPermissions("warehouse:inventoryReportDamage:detail") + @Log(title = "仓库库存报损", businessType = BusinessType.UPDATE) + @PostMapping("/detail") @ResponseBody - public AjaxResult restore(@PathVariable("id")Long id) + public AjaxResult detailSave(WarehouseInventoryReportDamage warehouseInventoryReportDamage) { - return toAjax(warehouseInventoryReportDamageService.restoreWarehouseInventoryReportDamageById(id)); + return toAjax(warehouseInventoryReportDamageService.updateWarehouseInventoryReportDamage(warehouseInventoryReportDamage)); } diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/detail.html b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/detail.html new file mode 100644 index 00000000..52a1ef00 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/detail.html @@ -0,0 +1,126 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/edit.html b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/edit.html index 79e2df5d..ddf3a81f 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/edit.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/edit.html @@ -8,12 +8,6 @@
-
- -
- -
-
diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/inventoryReportDamage.html b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/inventoryReportDamage.html index 4ba4f9af..88456622 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/inventoryReportDamage.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/inventoryReportDamage.html @@ -76,7 +76,7 @@ \ No newline at end of file