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 @@ - + + + @@ -155,7 +157,7 @@ when dh.sub_type='盘点复盘' then ifnull(di.basic_number,0) else 0 end - as b_num, + as b_num, di.unit_price, di.all_price, (select name from jsh_depot d where d.id=di.depot_id and ifnull(d.delete_flag,'0') !='1') as depotName, date_format(dh.oper_time,'%Y-%m-%d %H:%i:%S') as oTime from jsh_depot_head dh @@ -198,7 +200,7 @@ union all --单独构造记录:调拨入库 select dh.number,me.bar_code,m.name material_name,dh.type,dh.sub_type, - ifnull(di.basic_number,0) as b_num, + ifnull(di.basic_number,0) as b_num, di.unit_price, di.all_price, (select concat(name,'[调入]') from jsh_depot d where d.id=di.another_depot_id and ifnull(d.delete_flag,'0') !='1') as depotName, date_format(dh.oper_time,'%Y-%m-%d %H:%i:%S') as oTime from jsh_depot_head dh diff --git a/jshERP-web/src/views/report/modules/MaterialInOutList.vue b/jshERP-web/src/views/report/modules/MaterialInOutList.vue index 1739960a..2004c5de 100644 --- a/jshERP-web/src/views/report/modules/MaterialInOutList.vue +++ b/jshERP-web/src/views/report/modules/MaterialInOutList.vue @@ -2,7 +2,7 @@