diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java index db3c75ec..08c19e03 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java @@ -320,10 +320,6 @@ public class TbProduct implements Serializable { @ApiModelProperty("库存数量") private Integer stockNumber; - @Column(name = "`total_cost_price`") - @ApiModelProperty(value = "总成本价") - private BigDecimal totalCostPrice = BigDecimal.ZERO; - public void copy(TbProduct source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java index f29826ac..4c83db0a 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java @@ -140,7 +140,5 @@ public class TbProductSku implements Serializable { @ApiModelProperty(value = "是否暂停销售") private Integer isPauseSale = 0; - @Column(name = "`total_cost_price`") - @ApiModelProperty(value = "总成本价") - private BigDecimal totalCostPrice = BigDecimal.ZERO; + } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockOperateServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockOperateServiceImpl.java index 7520fd06..8be114b1 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockOperateServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockOperateServiceImpl.java @@ -248,7 +248,6 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe productStockDetail.setSubType(1); totalCostPrice = productListDto.getCostPrice().multiply(BigDecimal.valueOf(productListDto.getNumber())); productStockDetail.setCostAmount(totalCostPrice); - setProOrSkuCost(product, tbProductSku,totalCostPrice, false); productStockDetail.setType("供应商出库"); break; @@ -262,7 +261,6 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe productStockDetail.setSubType(1); totalCostPrice = productListDto.getCostPrice().multiply(BigDecimal.valueOf(productListDto.getNumber())); productStockDetail.setCostAmount(totalCostPrice); - setProOrSkuCost(product, tbProductSku,totalCostPrice, true); productStockDetail.setType("供应商入库"); break; @@ -299,29 +297,6 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe return resources; } - /** - * 根据是否共享库存调整成本价 - * @param product 商品 - * @param tbProductSku sku商品 - * @param cost 成本价 - * @param isAdd true 增加 false 减少 - */ - private void setProOrSkuCost(TbProduct product, TbProductSku tbProductSku, BigDecimal cost, boolean isAdd) { - if (product.getTotalCostPrice() == null) { - product.setTotalCostPrice(BigDecimal.ZERO); - } - - if (tbProductSku.getTotalCostPrice() == null) { - tbProductSku.setTotalCostPrice(BigDecimal.ZERO); - } - - if (product.getIsDistribute() == 1) { - product.setTotalCostPrice(isAdd ? product.getTotalCostPrice().add(cost) : product.getTotalCostPrice().subtract(cost)); - }else { - tbProductSku.setTotalCostPrice(isAdd ? tbProductSku.getTotalCostPrice().add(cost) : tbProductSku.getTotalCostPrice().subtract(cost)); - } - } - @Override @Transactional(rollbackFor = Exception.class)