diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
index 739778e2..a4cb3338 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
@@ -121,6 +121,8 @@ public class DepotItemController {
}
item.put("depotName", d.getDepotName()); //仓库名称
item.put("basicNumber", d.getBnum()); //数量
+ item.put("unitPrice", d.getUnitPrice()); //单价
+ item.put("allPrice", d.getAllPrice()); //金额
item.put("operTime", Tools.getCenternTime(d.getOtime())); //时间
dataArray.add(item);
}
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4DetailByTypeAndMId.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4DetailByTypeAndMId.java
index b348b3c7..5f196231 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4DetailByTypeAndMId.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4DetailByTypeAndMId.java
@@ -17,6 +17,10 @@ public class DepotItemVo4DetailByTypeAndMId {
private BigDecimal bnum;
+ private BigDecimal unitPrice;
+
+ private BigDecimal allPrice;
+
private String depotName;
private Date otime;
@@ -69,6 +73,22 @@ public class DepotItemVo4DetailByTypeAndMId {
this.bnum = bnum;
}
+ public BigDecimal getUnitPrice() {
+ return unitPrice;
+ }
+
+ public void setUnitPrice(BigDecimal unitPrice) {
+ this.unitPrice = unitPrice;
+ }
+
+ public BigDecimal getAllPrice() {
+ return allPrice;
+ }
+
+ public void setAllPrice(BigDecimal allPrice) {
+ this.allPrice = allPrice;
+ }
+
public String getDepotName() {
return depotName;
}
diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index d03121c0..82420f18 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -8,7 +8,9 @@