优化商品的模块的库存明细，增加仓库列的展示

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');

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);

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;
     }

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'