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 | 53 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 8 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 4495912..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
@@ -5,17 +5,16 @@
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.TErpGoodsQuery;
-import com.ruoyi.system.query.TErpGoodsWarehouseQuery;
-import com.ruoyi.system.query.ValidityPeriodWarningQuery;
+import com.ruoyi.system.query.*;
+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.ValidityPeriodWarningVo;
+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.*;
@@ -36,11 +35,13 @@
public class TErpSupplierWarehousingController {
private final TErpSupplierWarehousingService erpSupplierWarehousingService;
+ private final TErpGoodsService erpGoodsService;
private final TokenService tokenService;
@Autowired
- public TErpSupplierWarehousingController(TErpSupplierWarehousingService erpSupplierWarehousingService, TokenService tokenService) {
+ public TErpSupplierWarehousingController(TErpSupplierWarehousingService erpSupplierWarehousingService, TErpGoodsService erpGoodsService, TokenService tokenService) {
this.erpSupplierWarehousingService = erpSupplierWarehousingService;
+ this.erpGoodsService = erpGoodsService;
this.tokenService = tokenService;
}
@@ -93,6 +94,42 @@
}
+
+
+
+ @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