From a2299a6d4a6f99e9c11132138f5d3e9ec68f03ea Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 06 六月 2025 19:19:34 +0800 Subject: [PATCH] 开发更新 --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwStocktakingController.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 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 97e1230..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; @@ -31,6 +34,9 @@ @Autowired private YwStocktakingService ywStocktakingService; + + @Autowired + private YwOutinboundServiceImpl ywOutinboundService; @PreventRepeat @ApiOperation("鏂板缓") @@ -87,7 +93,7 @@ @ApiOperation("鏍规嵁ID鏌ヨ") @GetMapping("/{id}") @CloudRequiredPermission("business:ywstocktaking:query") - public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { + public ApiResponse<YwStocktaking> findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { return ApiResponse.success(ywStocktakingService.getDetail(id)); } @@ -115,7 +121,7 @@ @GetMapping("/finishById") @CloudRequiredPermission("business:ywstocktaking:delete") public ApiResponse finishById(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { - ywStocktakingService.finishById(id,getLoginUser(token)); + ywStocktakingService.finishById(id,ywOutinboundService,getLoginUser(token)); return ApiResponse.success(null); } -- Gitblit v1.9.3