Browse Source

Revert "出入库结存单价未完成"

This reverts commit 5ba290fc8cc1b2a721a7c421ababf2219ef07f4e.
24282 1 year ago
parent
commit
2355b364cf

+ 0 - 40
sd-business/src/main/java/com/sd/business/entity/in/po/InOutRunningWater.java

@@ -1,40 +0,0 @@
-package com.sd.business.entity.in.po;
-
-import com.ruoyi.common.core.domain.BasePo;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.math.BigDecimal;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 记录流水表
- * </p>
- *
- * @author 彭嘉俊
- * @since 2023-07-17
- */
-@Getter
-@Setter
-@TableName("in_out_running_water")
-public class InOutRunningWater extends BasePo {
-
-    /**
-     * 仓库id
-     */
-    private Long warehouseId;
-
-    /**
-     * 数量
-     */
-    private BigDecimal quantity;
-
-    /**
-     * 采购单价
-     */
-    private BigDecimal purchasePrice;
-
-}

+ 0 - 2
sd-business/src/main/java/com/sd/business/entity/in/po/InOutStorageBom.java

@@ -41,6 +41,4 @@ public class InOutStorageBom extends BasePo implements InOutFun {
     @DecimalMin(value = "0.01", message = "出入库数量必须大于0")
     private BigDecimal quantity;
 
-/*
-    private BigDecimal purchasePrice;*/
 }

+ 0 - 3
sd-business/src/main/java/com/sd/business/entity/inventory/bo/InOutFun.java

@@ -14,7 +14,4 @@ public interface InOutFun {
      */
     BigDecimal getQuantity();
 
-
-/*    BigDecimal getPurchasePrice();*/
-
 }

+ 3 - 20
sd-business/src/main/java/com/sd/business/service/inventory/impl/InventoryServiceImpl.java

@@ -6,7 +6,6 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.sd.business.entity.bom.po.Bom;
 import com.sd.business.entity.bom.po.BomSpec;
-import com.sd.business.entity.in.po.InOutRunningWater;
 import com.sd.business.entity.inventory.bo.InOutFun;
 import com.sd.business.entity.inventory.dto.InventorySelectDto;
 import com.sd.business.entity.inventory.po.Inventory;
@@ -21,7 +20,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -100,24 +101,6 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
             saveOrUpdateBatch(inventoryList);
         }
 
-/*        InOutRunningWater inOutRunningWater2 = new InOutRunningWater();
-        BigDecimal quantity1 = inOutRunningWater2.getQuantity();
-        ArrayList<BigDecimal> bigDecimals = new ArrayList<>(Arrays.asList(quantity1));
-        IntSummaryStatistics summaryStatistics = bigDecimals.stream().mapToInt((s) -> s).summaryStatistics();
-        long sum = summaryStatistics.getSum();
-
-
-        for (InOutFun inOutFun : list) {
-            BigDecimal quantity = inOutFun.getQuantity();
-            BigDecimal purchasePrice = inOutFun.getPurchasePrice();
-            InOutRunningWater inOutRunningWater = new InOutRunningWater();
-            inOutRunningWater.setWarehouseId(warehouseId);
-            inOutRunningWater.setQuantity(quantity);
-            inOutRunningWater.setPurchasePrice(purchasePrice);
-
-            BigDecimal depositAmount = quantity.multiply(purchasePrice);
-        }*/
-
     }
 
     @Override