From 11ecb9ee39fc61af04cd8d462faf9dce496d1773 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 11 九月 2025 15:19:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 117 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java
index 93e9a1f..d24c26d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java
@@ -1,8 +1,25 @@
package com.ruoyi.web.controller.api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+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.dto.InventoryDto;
+import com.ruoyi.system.dto.InventoryGoodsDto;
+import com.ruoyi.system.dto.WarehousingGoodsDto;
+import com.ruoyi.system.query.*;
+import com.ruoyi.system.service.TErpGoodsService;
+import com.ruoyi.system.service.TErpSupplierWarehousingService;
+import com.ruoyi.system.vo.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
/**
* <p>
@@ -14,7 +31,105 @@
*/
@RestController
@RequestMapping("/t-erp-supplier-warehousing")
+@Api(tags = "供应商库存管理")
public class TErpSupplierWarehousingController {
+ private final TErpSupplierWarehousingService erpSupplierWarehousingService;
+ private final TErpGoodsService erpGoodsService;
+ private final TokenService tokenService;
+
+ @Autowired
+ public TErpSupplierWarehousingController(TErpSupplierWarehousingService erpSupplierWarehousingService, TErpGoodsService erpGoodsService, TokenService tokenService) {
+ this.erpSupplierWarehousingService = erpSupplierWarehousingService;
+ this.erpGoodsService = erpGoodsService;
+ 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(@RequestParam String id, String warehouseName) {
+ SysUser user = tokenService.getLoginUser().getUser();
+ return R.ok(erpSupplierWarehousingService.detail(id,warehouseName,user));
+ }
+
+
+ @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));
+ }
+
+
+
+ @ApiOperation(value = "供应商库存入库")
+ @PostMapping(value = "/warehousingGoods")
+ public R<?> warehousingGoods(@RequestBody @Valid List<WarehousingGoodsDto> dtos) {
+ SysUser user = tokenService.getLoginUser().getUser();
+ erpSupplierWarehousingService.warehousingGoods(dtos,user);
+ return R.ok();
+ }
+
+
+ @ApiOperation(value = "有效期预警")
+ @PostMapping(value = "/validityPeriodWarning")
+ public R<PageInfo<ValidityPeriodWarningVo>> validityPeriodWarning(@RequestBody ValidityPeriodWarningQuery query) {
+ SysUser user = tokenService.getLoginUser().getUser();
+ PageInfo<ValidityPeriodWarningVo> pageInfo =erpSupplierWarehousingService.validityPeriodWarning(query,user);
+ return R.ok(pageInfo);
+ }
+
+
+
+
+
+ @ApiOperation(value = "供应商 盘点")
+ @PostMapping(value = "/pageInventoryList")
+ public R<PageInfo<PageInventoryListVo>> pageInventoryList(@RequestBody TErpInventoryQuery query) {
+ SysUser user = tokenService.getLoginUser().getUser();
+ return R.ok(erpSupplierWarehousingService.pageInventoryList(query,user));
+ }
+
+ @ApiOperation(value = "供应商 盘点详情")
+ @GetMapping(value = "/detailInventory/{id}")
+ public R<List<InventoryDetailVo>> detailInventory(@PathVariable String id) {
+ SysUser user = tokenService.getLoginUser().getUser();
+ return R.ok(erpSupplierWarehousingService.detailInventory(id,user));
+ }
+
+
+ @ApiOperation(value = "供应商 盘点 商品选择")
+ @PostMapping(value = "/pageInventoryGoodsPageList")
+ public R<PageInfo<TErpGoodsInventoryVO>> pageInventoryGoodsPageList(@RequestBody @Valid TErpGoodsInventoryQuery query) {
+ SysUser user = tokenService.getLoginUser().getUser();
+ return R.ok(erpGoodsService.pageInventoryGoodsPageList(query,user));
+ }
+
+ @ApiOperation(value = "供应商 确认盘点")
+ @PostMapping(value = "/inventoryGoods")
+ public R<?> inventoryGoods(@RequestBody @Valid InventoryDto dto) {
+ SysUser user = tokenService.getLoginUser().getUser();
+ erpGoodsService.inventoryGoods(dto,user);
+ return R.ok();
+ }
+
+
+
+
}
+
--
Gitblit v1.7.1