From c92aa3899e11a355cddfcfeaececcc843d7ad1bb Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 04 九月 2024 19:14:18 +0800
Subject: [PATCH] 修改

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java
index 4aa239d..a2d8b03 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.constant.OrderNumConstants;
 import com.ruoyi.common.utils.CodeGenerateUtils;
 import com.ruoyi.system.domain.TOrderSaleGoods;
 import com.ruoyi.system.domain.TOrderStock;
@@ -38,10 +39,10 @@
     @Override
     public void add(TOrderStockDTO dto) {
         // 进货单号
-        dto.setStockNum("JH" + CodeGenerateUtils.generateOrderSn());
+        dto.setStockNum(OrderNumConstants.STOCK + CodeGenerateUtils.generateOrderSn());
         List<TOrderStockGoods> orderStockGoods = dto.getOrderStockGoods();
-        BigDecimal sum = orderStockGoods.stream().map(TOrderStockGoods::getStockPrice).reduce(BigDecimal::add).get();
-        dto.setStockTotalPrice(sum);
+//        BigDecimal sum = orderStockGoods.stream().map(TOrderStockGoods::getStockPrice).reduce(BigDecimal::add).get();
+//        dto.setStockTotalPrice(sum);
         this.save(dto);
         // 添加商品
         orderStockGoods.forEach(orderSaleGoods1 -> orderSaleGoods1.setOrderId(dto.getId()));
@@ -51,8 +52,8 @@
     @Override
     public void edit(TOrderStockDTO dto) {
         List<TOrderStockGoods> orderStockGoods = dto.getOrderStockGoods();
-        BigDecimal sum = orderStockGoods.stream().map(TOrderStockGoods::getStockPrice).reduce(BigDecimal::add).get();
-        dto.setStockTotalPrice(sum);
+//        BigDecimal sum = orderStockGoods.stream().map(TOrderStockGoods::getStockPrice).reduce(BigDecimal::add).get();
+//        dto.setStockTotalPrice(sum);
         this.updateById(dto);
         // 刪除原有商品
         tOrderStockGoodsService.remove(Wrappers.lambdaQuery(TOrderStockGoods.class)

--
Gitblit v1.7.1