From 7b7a2cc050d55af2eed2cccb3761a91314c9b9f6 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 30 四月 2026 15:07:32 +0800
Subject: [PATCH] feat:1.产品维护,增加产品编号字段 2.入库批号添加 3.是否质检仅添加入库记录（待审核） 4.是否生产报工更改 5.入库做审核

---
 src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java |   75 ++++++++++++++++++++-----------------
 1 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java b/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
index 0050920..5aa3413 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
@@ -1,17 +1,16 @@
 package com.ruoyi.project.system.controller;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
@@ -22,70 +21,76 @@
 
 /**
  * 鍏憡 淇℃伅鎿嶄綔澶勭悊
- * 
+ *
  * @author ruoyi
  */
 @RestController
 @RequestMapping("/system/notice")
-public class SysNoticeController extends BaseController
-{
-    @Autowired
+@AllArgsConstructor
+public class SysNoticeController extends BaseController {
     private ISysNoticeService noticeService;
 
     /**
      * 鑾峰彇閫氱煡鍏憡鍒楄〃
      */
-    @PreAuthorize("@ss.hasPermi('system:notice:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysNotice notice)
-    {
-        startPage();
-        List<SysNotice> list = noticeService.selectNoticeList(notice);
-        return getDataTable(list);
+    public R<IPage<SysNotice>> list(SysNotice notice, Page page) {
+        IPage<SysNotice> list = noticeService.selectNoticeList(notice, page);
+        return R.ok(list);
+    }
+
+    /**
+     * 鑾峰彇鏈鏁伴噺
+     */
+    @GetMapping("/getCount")
+    public R getCount(Long consigneeId) {
+        return R.ok(noticeService.getCount(consigneeId));
     }
 
     /**
      * 鏍规嵁閫氱煡鍏憡缂栧彿鑾峰彇璇︾粏淇℃伅
      */
-    @PreAuthorize("@ss.hasPermi('system:notice:query')")
     @GetMapping(value = "/{noticeId}")
-    public AjaxResult getInfo(@PathVariable Long noticeId)
-    {
+    public AjaxResult getInfo(@PathVariable Long noticeId) {
         return success(noticeService.selectNoticeById(noticeId));
     }
 
     /**
      * 鏂板閫氱煡鍏憡
      */
-    @PreAuthorize("@ss.hasPermi('system:notice:add')")
-    @Log(title = "閫氱煡鍏憡", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysNotice notice)
-    {
-        notice.setCreateBy(getUsername());
+    public AjaxResult add(@Validated @RequestBody SysNotice notice) {
         return toAjax(noticeService.insertNotice(notice));
     }
 
     /**
      * 淇敼閫氱煡鍏憡
      */
-    @PreAuthorize("@ss.hasPermi('system:notice:edit')")
-    @Log(title = "閫氱煡鍏憡", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysNotice notice)
-    {
-        notice.setUpdateBy(getUsername());
+    public AjaxResult edit(@Validated @RequestBody SysNotice notice) {
         return toAjax(noticeService.updateNotice(notice));
     }
 
     /**
      * 鍒犻櫎閫氱煡鍏憡
      */
-    @PreAuthorize("@ss.hasPermi('system:notice:remove')")
-    @Log(title = "閫氱煡鍏憡", businessType = BusinessType.DELETE)
     @DeleteMapping("/{noticeIds}")
-    public AjaxResult remove(@PathVariable Long[] noticeIds)
-    {
+    public AjaxResult remove(@PathVariable Long[] noticeIds) {
         return toAjax(noticeService.deleteNoticeByIds(noticeIds));
     }
+
+    /**
+     * 涓�閿凡璇�
+     */
+    @PostMapping("/readAll")
+    public AjaxResult readAll() {
+        return toAjax(noticeService.readAll());
+    }
+
+    @PostMapping("appReadNotice")
+    @Operation(summary = "绉诲姩绔牴鎹秷鎭疘D杩涜宸茶")
+    public AjaxResult appReadNotice(@RequestParam("noticeId") Long noticeId) {
+        boolean result = noticeService.appReadNotice(noticeId);
+        return toAjax(result);
+    }
 }

--
Gitblit v1.9.3