From 0838f85fa74b36638adf2621bc2f49a345982dec Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期三, 03 九月 2025 17:21:04 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpClinicWarehousingController.java | 68 +--------------------------------- 1 files changed, 2 insertions(+), 66 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpClinicWarehousingController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpClinicWarehousingController.java index 477f9a5..6cc76ad 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpClinicWarehousingController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpClinicWarehousingController.java @@ -1,27 +1,8 @@ package com.ruoyi.web.controller.api; -import com.ruoyi.common.basic.PageInfo; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.system.query.TErpGoodsQuery; -import com.ruoyi.system.query.TErpGoodsWarehouseQuery; -import com.ruoyi.system.service.TErpClinicWarehousingService; -import com.ruoyi.system.service.TErpGoodsService; -import com.ruoyi.system.service.TErpSupplierWarehousingService; -import com.ruoyi.system.vo.TErpGoodsVO; -import com.ruoyi.system.vo.TErpGoodsWarehouseLastVO; -import com.ruoyi.system.vo.TErpGoodsWarehouseRecordLastVO; -import com.ruoyi.system.vo.TErpGoodsWarehouseVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; -import java.util.List; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * <p> @@ -33,52 +14,7 @@ */ @RestController @RequestMapping("/t-erp-clinic-warehousing") -@Api(tags = "供应商库存管理") public class TErpClinicWarehousingController { - - - - - private final TErpSupplierWarehousingService erpSupplierWarehousingService; - private final TokenService tokenService; - - @Autowired - public TErpClinicWarehousingController(TErpSupplierWarehousingService erpSupplierWarehousingService, TokenService tokenService) { - this.erpSupplierWarehousingService = erpSupplierWarehousingService; - this.tokenService = tokenService; - } - - - - /** - * 获取erp问题上报管理列表 - */ - @ApiOperation(value = "供应商获取库存分页列表") - @PostMapping(value = "/pageList") - public R<PageInfo<TErpGoodsVO>> pageList(@RequestBody TErpGoodsQuery query) { - SysUser user = tokenService.getLoginUser().getUser(); - return R.ok(erpSupplierWarehousingService.pageList(query,user)); - } - - - - @ApiOperation(value = "供应商库存详情") - @GetMapping(value = "/detail") - public R<List<TErpGoodsWarehouseLastVO>> detail(String id, String warehouseName) { - SysUser user = tokenService.getLoginUser().getUser(); - return R.ok(erpSupplierWarehousingService.detail(id,warehouseName,user)); - } - - - /** - * 获取erp问题上报管理列表 - */ - @ApiOperation(value = "供应商获取库存记录列表") - @PostMapping(value = "/pageWarehouseList") - public R<PageInfo<TErpGoodsWarehouseRecordLastVO>> pageWarehouseList(@RequestBody @Valid TErpGoodsWarehouseQuery query) { - SysUser user = tokenService.getLoginUser().getUser(); - return R.ok(erpSupplierWarehousingService.pageWarehouseList(query,user)); - } -- Gitblit v1.7.1