Merge branch 'dev' of http://git.echepei.com/lazhaoqian/bladex into dev

blade-service-api/blade-stock-api/src/main/java/org/springblade/stock/entity/StockGoods.java

@@ -90,9 +90,9 @@ public class StockGoods implements Serializable {
 		@ApiModelProperty(value = "锁定重量")
 		private BigDecimal lockingWeight;
 	/**
-	* 结余数量
+	* 结余重量
 	*/
-		@ApiModelProperty(value = "结余数量")
+		@ApiModelProperty(value = "结余重量")
 		private BigDecimal balanceWeight;
 	/**
 	* 入库体积
@@ -200,15 +200,30 @@ public class StockGoods implements Serializable {
 		@ApiModelProperty(value = "产品型号")
 		private String itemType;
 	/**
-	 * 结余数量
+	 * 在途数量
 	 */
-		@ApiModelProperty(value = "结余数量")
+		@ApiModelProperty(value = "在途数量")
 		private BigDecimal enRouteQuantity;
 	/**
 	 * 可用数量
 	 */
 		@ApiModelProperty(value = "可用数量")
 		private BigDecimal surplusRouteQuantity;
+	/**
+	 * 入库金额
+	 */
+		@ApiModelProperty(value = "入库金额")
+		private BigDecimal inAmount;
+	/**
+	 * 出库金额
+	 */
+		@ApiModelProperty(value = "出库金额")
+		private BigDecimal outAmount;
+	/**
+	 * 结余金额
+	 */
+		@ApiModelProperty(value = "结余金额")
+		private BigDecimal balanceAmount;
 
 
 }

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

@@ -37,6 +37,9 @@
         <result column="item_type" property="itemType"/>
         <result column="en_route_quantity" property="enRouteQuantity"/>
         <result column="surplus_route_quantity" property="surplusRouteQuantity"/>
+        <result column="in_amount" property="inAmount"/>
+        <result column="out_amount" property="outAmount"/>
+        <result column="balance_amount" property="balanceAmount"/>
     </resultMap>