From 660f4451c140a9da1f4bb92721a403b128dbdaf7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 30 十月 2024 17:15:26 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderStockController.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderStockController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderStockController.java
index bb9b17b..b223e2a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderStockController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderStockController.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.system.domain.TGoodsType;
+import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.domain.TOrderStock;
import com.ruoyi.system.domain.TOrderStockGoods;
import com.ruoyi.system.dto.TOrderStockDTO;
@@ -34,11 +34,13 @@
public class TOrderStockController {
private final TOrderStockService orderStockService;
private final TOrderStockGoodsService orderStockGoodsService;
+ private final TokenService tokenService;
@Autowired
- public TOrderStockController(TOrderStockService orderStockService, TOrderStockGoodsService orderStockGoodsService) {
+ public TOrderStockController(TOrderStockService orderStockService, TOrderStockGoodsService orderStockGoodsService, TokenService tokenService) {
this.orderStockService = orderStockService;
this.orderStockGoodsService = orderStockGoodsService;
+ this.tokenService = tokenService;
}
/**
@@ -47,6 +49,8 @@
@ApiOperation( value = "查询进货单分页列表")
@PostMapping(value = "/pageList")
public AjaxResult<PageInfo<TOrderStockVO>> pageList(@RequestBody TOrderStockQuery query) {
+ query.setShopId(tokenService.getLoginUser().getObjectId());
+ query.setIsCover(1);
return AjaxResult.success(orderStockService.pageList(query));
}
@@ -56,6 +60,7 @@
@ApiOperation( value = "进货单下单接口")
@PostMapping(value = "/add")
public AjaxResult<String> add(@RequestBody TOrderStockDTO dto) {
+ dto.setShopId(tokenService.getLoginUser().getObjectId());
orderStockService.add(dto);
return AjaxResult.success();
}
@@ -67,6 +72,16 @@
@PostMapping(value = "/edit")
public AjaxResult<String> edit(@RequestBody TOrderStockDTO dto) {
orderStockService.edit(dto);
+ return AjaxResult.success();
+ }
+
+ /**
+ * 编辑进货单下单接口
+ */
+ @ApiOperation( value = "编辑生成进货单接口")
+ @PostMapping(value = "/editGenerator")
+ public AjaxResult<String> editGenerator(@RequestBody TOrderStockDTO dto) {
+ orderStockService.editGenerator(dto);
return AjaxResult.success();
}
@@ -95,7 +110,7 @@
// 删除进货商品
orderStockGoodsService.remove(Wrappers.lambdaQuery(TOrderStockGoods.class)
.eq(TOrderStockGoods::getOrderId, id));
- return AjaxResult.success(orderStockGoodsService.removeById(id));
+ return AjaxResult.success(orderStockService.removeById(id));
}
/**
@@ -106,7 +121,7 @@
public AjaxResult<Boolean> deleteByIds(@RequestBody List<Long> ids) {
orderStockGoodsService.remove(Wrappers.lambdaQuery(TOrderStockGoods.class)
.in(TOrderStockGoods::getOrderId, ids));
- return AjaxResult.success(orderStockGoodsService.removeByIds(ids));
+ return AjaxResult.success(orderStockService.removeByIds(ids));
}
}
--
Gitblit v1.7.1