入库明细统计接口增加返回单价信息

src/main/java/com/jeeplus/modules/warehouse/storage/dto/CountStorageInfo.java

@@ -22,7 +22,8 @@ public class CountStorageInfo  extends DataEntity<StorageInfo> {
     private GoodsInfo goodsInfo;		// 货品明细id
     private Shelves shelves;		// 货架id
     private Warehouse warehouse; // 仓库外键
-    private BigDecimal sum; // 单价
+    private BigDecimal sum; // 总价
+    private BigDecimal amount; // 单价
     private int num; // 数量
     private String state; // 入库状态
 
@@ -132,4 +133,12 @@ public class CountStorageInfo  extends DataEntity<StorageInfo> {
     public void setState(String state) {
         this.state = state;
     }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
 }

src/main/java/com/jeeplus/modules/warehouse/storage/mapper/xml/StorageInfoMapper.xml

@@ -202,6 +202,7 @@
 		type.name AS "type.name",
 		a.model AS "model",
 		sum(a.amount) AS "sum",
+		a.amount AS "amount",
 		a.goods_info_id AS "goodsInfo.id",
 		a.shelves_id AS "shelves.id",
 		s.name AS "shelves.name",
@@ -221,7 +222,7 @@
 				AND a.storage_id = #{storage.id}
 			</if>
 		</where>
-		GROUP BY a.goods_info_id,a.shelves_id,qr.state
+		GROUP BY a.goods_info_id,a.shelves_id,qr.state,a.amount
 	</select>
 
 </mapper>
\ No newline at end of file

src/main/java/com/jeeplus/modules/warehouse/storage/service/StorageService.java

@@ -90,6 +90,7 @@ public class StorageService extends CrudService<StorageMapper, Storage> {
 					csi.setName(c.getName());
 					csi.setType(c.getType());
 					csi.setState(c.getState());
+                    csi.setAmount(c.getAmount());
 				}
 				if (i != list.size() - 1) {
 					shelvesNames = shelvesNames + c.getShelves().getName() + ",";