wangzhuo 3 years ago
parent
commit
65934a2054

+ 1 - 1
blade-service/blade-stock/src/main/java/org/springblade/stock/excel/StockGoodsExcel.java

@@ -39,7 +39,7 @@ public class StockGoodsExcel implements Serializable {
 	/**
 	 * 库存价
 	 */
-	@ExcelProperty("库存")
+	@ExcelProperty("库存金额")
 	private BigDecimal stockPrice;
 
 }

+ 1 - 1
blade-service/blade-stock/src/main/java/org/springblade/stock/mapper/StockGoodsMapper.xml

@@ -97,7 +97,7 @@
                t3.cname as storage,
                t1.surplus_route_quantity as balance,
                t2.brand_item as brandItem,
-               t4.sales_price as salesPrice
+               t4.sales_price AS salesPrice
         from business_stock_goods t1
                  left join basic_goods_desc t2 on t1.goods_id = t2.id
                  left join basic_storage_desc t3 on t1.storage_id = t3.id

+ 2 - 1
blade-service/blade-stock/src/main/java/org/springblade/stock/service/impl/StockGoodsServiceImpl.java

@@ -138,7 +138,8 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 			stockGoods.setBalanceQuantity(datum.getSurplusRouteQuantity());//结余数量
 			stockGoods.setSurplusRouteQuantity(datum.getSurplusRouteQuantity());//可用数量
 			stockGoods.setInQuantity(datum.getSurplusRouteQuantity());//入库数量
-			stockGoods.setStockPrice(datum.getStockPrice());//库存价
+			stockGoods.setInAmount(datum.getStockPrice());//入库金额
+			stockGoods.setBalanceAmount(datum.getStockPrice());//结余金额
 			stockGoods.setOutQuantity(BigDecimal.ZERO);//出库数量
 			stockGoods.setEnRouteQuantity(BigDecimal.ZERO);//在途数量
 			stockGoods.setTradeType("GN");