From 2b0d8d7d4e96711c158e1a95bb8f655bcfc165ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 7 Jan 2021 00:25:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E7=9A=84?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84=E5=BA=93=E5=AD=98=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BB=93=E5=BA=93=E5=88=97=E7=9A=84?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/materials/material.html                  |  1 +
 .../com/jsh/erp/controller/DepotItemController.java    |  1 +
 .../entities/DepotItemVo4DetailByTypeAndMId.java       | 10 ++++++++++
 src/main/resources/mapper_xml/DepotItemMapperEx.xml    |  2 ++
 4 files changed, 14 insertions(+)

diff --git a/erp_web/pages/materials/material.html b/erp_web/pages/materials/material.html
index 48ae2b17..4d8e6415 100644
--- a/erp_web/pages/materials/material.html
+++ b/erp_web/pages/materials/material.html
@@ -547,6 +547,7 @@
                         }
                     },
                     {title: '类型', field: 'Type', width: 100},
+                    {title: '仓库名称', field: 'depotName', width: 80},
                     {title: '数量', field: 'BasicNumber', width: 80},
                     {title: '日期', field: 'OperTime', width: 180, formatter: function (value) {
                             return formatTime(value, 'Y-M-D h:m:s');
diff --git a/src/main/java/com/jsh/erp/controller/DepotItemController.java b/src/main/java/com/jsh/erp/controller/DepotItemController.java
index 09b0bfe9..92ca7166 100644
--- a/src/main/java/com/jsh/erp/controller/DepotItemController.java
+++ b/src/main/java/com/jsh/erp/controller/DepotItemController.java
@@ -78,6 +78,7 @@ public class DepotItemController {
                 } else {
                     item.put("Type", subType + type); //进出类型
                 }
+                item.put("depotName", d.getDepotName()); //仓库名称
                 item.put("BasicNumber", d.getBnum()); //数量
                 item.put("OperTime", d.getOtime().getTime()); //时间
                 dataArray.add(item);
diff --git a/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4DetailByTypeAndMId.java b/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4DetailByTypeAndMId.java
index ec835eb4..2d01d245 100644
--- a/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4DetailByTypeAndMId.java
+++ b/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4DetailByTypeAndMId.java
@@ -13,6 +13,8 @@ public class DepotItemVo4DetailByTypeAndMId {
 
     private BigDecimal bnum;
 
+    private String depotName;
+
     private Date otime;
 
     public String getNumber() {
@@ -47,6 +49,14 @@ public class DepotItemVo4DetailByTypeAndMId {
         this.bnum = bnum;
     }
 
+    public String getDepotName() {
+        return depotName;
+    }
+
+    public void setDepotName(String depotName) {
+        this.depotName = depotName;
+    }
+
     public Date getOtime() {
         return otime;
     }
diff --git a/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index 8f498b36..4eebd44f 100644
--- a/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -7,6 +7,7 @@
         <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="depotName" jdbcType="VARCHAR" property="depotName" />
         <result column="oTime" jdbcType="TIMESTAMP" property="otime" />
     </resultMap>
 
@@ -119,6 +120,7 @@
             else 0
         end
         as b_num,
+        (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
         INNER JOIN jsh_depot_item di on dh.id=di.header_id and ifnull(di.delete_flag,'0') !='1'