From bfdb3faf4f27df01718f58ac8c4ec0bcc092e7b6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 30 十一月 2024 18:50:47 +0800
Subject: [PATCH] 生成数据明细导出修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java
index 809a87f..d8182d0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java
@@ -69,7 +69,13 @@
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@RequestBody TGoods dto) {
dto.setShopId(tokenService.getLoginUser().getObjectId());
- dto.setGoodsNum(CodeGenerateUtils.generateVolumeSn());
+ String num = CodeGenerateUtils.generateVolumeSn();
+ long count = goodsService.count(Wrappers.lambdaQuery(TGoods.class)
+ .eq(TGoods::getGoodsNum, num));
+ if(count>0){
+ num = CodeGenerateUtils.generateVolumeSn();
+ }
+ dto.setGoodsNum(num);
return AjaxResult.success(goodsService.save(dto));
}
@@ -84,17 +90,17 @@
if(!goods.getGoodsName().equals(dto.getGoodsName())){
List<TOrderStockGoods> orderStockGoods = orderStockGoodsService.list(Wrappers.lambdaQuery(TOrderStockGoods.class)
.eq(TOrderStockGoods::getGoodsNum, goods.getGoodsNum()));
- orderStockGoods.stream().forEach(tOrderStockGoods -> tOrderStockGoods.setGoodsNum(dto.getGoodsNum()));
+ orderStockGoods.stream().forEach(tOrderStockGoods -> tOrderStockGoods.setGoodsName(dto.getGoodsName()));
orderStockGoodsService.updateBatchById(orderStockGoods);
List<TOrderMealGoods> orderMealGoods = orderMealGoodsService.list(Wrappers.lambdaQuery(TOrderMealGoods.class)
.eq(TOrderMealGoods::getGoodsNum, goods.getGoodsNum()));
- orderMealGoods.stream().forEach(tOrderMealGoods -> tOrderMealGoods.setGoodsNum(dto.getGoodsNum()));
+ orderMealGoods.stream().forEach(tOrderMealGoods -> tOrderMealGoods.setGoodsName(dto.getGoodsName()));
orderMealGoodsService.updateBatchById(orderMealGoods);
List<TOrderSaleGoods> list = orderSaleGoodsService.list(Wrappers.lambdaQuery(TOrderSaleGoods.class)
.eq(TOrderSaleGoods::getGoodsNum, goods.getGoodsNum()));
- list.stream().forEach(tOrderSaleGoods -> tOrderSaleGoods.setGoodsNum(dto.getGoodsNum()));
+ list.stream().forEach(tOrderSaleGoods -> tOrderSaleGoods.setGoodsName(dto.getGoodsName()));
orderSaleGoodsService.updateBatchById(list);
}
return AjaxResult.success(goodsService.updateById(dto));
--
Gitblit v1.7.1