From 45176c40fa2c3fc3e0c06eb47e8e87442fa93e25 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Tue, 21 May 2024 00:43:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=A0=B9=E6=8D=AE=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E5=92=8C=E5=95=86=E5=93=81=E6=9F=A5=E8=AF=A2=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E5=8D=95?=
 =?UTF-8?q?=E4=BB=B7=E5=92=8C=E9=87=91=E9=A2=9D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/controller/DepotItemController.java   |  2 ++
 .../DepotItemVo4DetailByTypeAndMId.java       | 20 +++++++++++++++++++
 .../mapper_xml/DepotItemMapperEx.xml          |  8 +++++---
 .../report/modules/MaterialInOutList.vue      |  4 +++-
 4 files changed, 30 insertions(+), 4 deletions(-)

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 @@
         <result column="material_name" jdbcType="VARCHAR" property="materialName" />
         <result column="type" jdbcType="VARCHAR" property="type" />
         <result column="sub_type" jdbcType="VARCHAR" property="subType" />
-        <result column="b_num" jdbcType="BIGINT" property="bnum" />
+        <result column="b_num" jdbcType="DECIMAL" property="bnum" />
+        <result column="unit_price" jdbcType="DECIMAL" property="unitPrice" />
+        <result column="all_price" jdbcType="DECIMAL" property="allPrice" />
         <result column="depotName" jdbcType="VARCHAR" property="depotName" />
         <result column="oTime" jdbcType="TIMESTAMP" property="otime" />
     </resultMap>
@@ -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 @@
   <div ref="container">
     <a-modal
       :title="title"
-      :width="1200"
+      :width="1400"
       :visible="visible"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
@@ -121,6 +121,8 @@
           { title: '名称', dataIndex: 'materialName', width: 200},
           { title: '仓库名称', dataIndex: 'depotName', width: 80},
           { title: '数量', dataIndex: 'basicNumber', width: 70},
+          { title: '单价', dataIndex: 'unitPrice', width: 70},
+          { title: '金额', dataIndex: 'allPrice', width: 70},
           { title: '日期', dataIndex: 'operTime', width: 110}
         ],
         labelCol: {