From 7de835dea145fe8229f5f0100e2a90094e6d5b22 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 07 二月 2025 18:49:38 +0800
Subject: [PATCH] 改bug

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwStocktakingController.java |   55 ++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwStocktakingController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwStocktakingController.java
index 20745cf..14dfbf1 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwStocktakingController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwStocktakingController.java
@@ -8,8 +8,11 @@
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.model.PageData;
 import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.YwOutinbound;
 import com.doumee.dao.business.model.YwStocktaking;
+import com.doumee.service.business.YwOutinboundService;
 import com.doumee.service.business.YwStocktakingService;
+import com.doumee.service.business.impl.YwOutinboundServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;    
@@ -32,26 +35,30 @@
     @Autowired
     private YwStocktakingService ywStocktakingService;
 
+    @Autowired
+    private YwOutinboundServiceImpl ywOutinboundService;
+
     @PreventRepeat
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
     @CloudRequiredPermission("business:ywstocktaking:create")
-    public ApiResponse create(@RequestBody YwStocktaking ywStocktaking) {
+    public ApiResponse create(@RequestBody YwStocktaking ywStocktaking,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        ywStocktaking.setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(ywStocktakingService.create(ywStocktaking));
     }
 
     @ApiOperation("鏍规嵁ID鍒犻櫎")
     @GetMapping("/delete/{id}")
     @CloudRequiredPermission("business:ywstocktaking:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        ywStocktakingService.deleteById(id);
+    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        ywStocktakingService.deleteById(id,getLoginUser(token));
         return ApiResponse.success(null);
     }
 
     @ApiOperation("鎵归噺鍒犻櫎")
     @GetMapping("/delete/batch")
     @CloudRequiredPermission("business:ywstocktaking:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
+    public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         String [] idArray = ids.split(",");
         List<Integer> idList = new ArrayList<>();
         for (String id : idArray) {
@@ -64,7 +71,7 @@
     @ApiOperation("鏍规嵁ID淇敼")
     @PostMapping("/updateById")
     @CloudRequiredPermission("business:ywstocktaking:update")
-    public ApiResponse updateById(@RequestBody YwStocktaking ywStocktaking) {
+    public ApiResponse updateById(@RequestBody YwStocktaking ywStocktaking,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         ywStocktakingService.updateById(ywStocktaking);
         return ApiResponse.success(null);
     }
@@ -72,21 +79,51 @@
     @ApiOperation("鍒嗛〉鏌ヨ")
     @PostMapping("/page")
     @CloudRequiredPermission("business:ywstocktaking:query")
-    public ApiResponse<PageData<YwStocktaking>> findPage (@RequestBody PageWrap<YwStocktaking> pageWrap) {
+    public ApiResponse<PageData<YwStocktaking>> findPage (@RequestBody PageWrap<YwStocktaking> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         return ApiResponse.success(ywStocktakingService.findPage(pageWrap));
     }
 
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
     @CloudRequiredPermission("business:ywstocktaking:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<YwStocktaking> pageWrap, HttpServletResponse response) {
+    public void exportExcel (@RequestBody PageWrap<YwStocktaking> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         ExcelExporter.build(YwStocktaking.class).export(ywStocktakingService.findPage(pageWrap).getRecords(), "杩愮淮鐩樼偣淇℃伅琛�", response);
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
     @GetMapping("/{id}")
     @CloudRequiredPermission("business:ywstocktaking:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(ywStocktakingService.findById(id));
+    public ApiResponse<YwStocktaking> findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        return ApiResponse.success(ywStocktakingService.getDetail(id));
     }
+
+
+
+    @ApiOperation("鍙栨秷鐩樼偣鍗�")
+    @GetMapping("/cancelById")
+    @CloudRequiredPermission("business:ywstocktaking:delete")
+    public ApiResponse cancelById(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        ywStocktakingService.cancelById(id,getLoginUser(token));
+        return ApiResponse.success(null);
+    }
+
+
+    @ApiOperation("寮�濮嬬洏鐐瑰崟")
+    @GetMapping("/beginById")
+    @CloudRequiredPermission("business:ywstocktaking:delete")
+    public ApiResponse beginById(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        ywStocktakingService.beginById(id,getLoginUser(token));
+        return ApiResponse.success(null);
+    }
+
+
+    @ApiOperation("瀹屾垚鐩樼偣鍗�")
+    @GetMapping("/finishById")
+    @CloudRequiredPermission("business:ywstocktaking:delete")
+    public ApiResponse finishById(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        ywStocktakingService.finishById(id,ywOutinboundService,getLoginUser(token));
+        return ApiResponse.success(null);
+    }
+
+
 }

--
Gitblit v1.9.3