From 2c395b39d110f6859dd7605deeff42ecd864bd0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 5 Dec 2021 22:23:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B9=E6=8D=AE=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2=E5=8D=95=E6=8D=AE=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/datasource/vo/DepotHeadVo4List.java   | 40 +++++++++++++++++++
 .../service/depotHead/DepotHeadService.java   |  1 +
 .../mapper_xml/DepotHeadMapperEx.xml          |  6 ++-
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java
index 9ac06abd..1de67b5f 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java
@@ -27,6 +27,14 @@ public class DepotHeadVo4List extends DepotHead{
 
     private String depotHeadType;
 
+    private String creatorName;
+
+    private String contacts;
+
+    private String telephone;
+
+    private String address;
+
     public String getProjectName() {
         return projectName;
     }
@@ -106,4 +114,36 @@ public class DepotHeadVo4List extends DepotHead{
     public void setDepotHeadType(String depotHeadType) {
         this.depotHeadType = depotHeadType;
     }
+
+    public String getCreatorName() {
+        return creatorName;
+    }
+
+    public void setCreatorName(String creatorName) {
+        this.creatorName = creatorName;
+    }
+
+    public String getContacts() {
+        return contacts;
+    }
+
+    public void setContacts(String contacts) {
+        this.contacts = contacts;
+    }
+
+    public String getTelephone() {
+        return telephone;
+    }
+
+    public void setTelephone(String telephone) {
+        this.telephone = telephone;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
 }
\ No newline at end of file
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
index 2f5d5a58..ae8afbc8 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
@@ -652,6 +652,7 @@ public class DepotHeadService {
                     }
                     dh.setOperTimeStr(getCenternTime(dh.getOperTime()));
                     dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId()));
+                    dh.setCreatorName(userService.getUser(dh.getCreator()).getUsername());
                     resList.add(dh);
                 }
             }
diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
index 27e53ec0..57b49ee0 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
@@ -7,6 +7,9 @@
         <result column="OrganName" jdbcType="VARCHAR" property="organName" />
         <result column="userName" jdbcType="VARCHAR" property="userName" />
         <result column="AccountName" jdbcType="VARCHAR" property="accountName" />
+        <result column="contacts" jdbcType="VARCHAR" property="contacts" />
+        <result column="telephone" jdbcType="VARCHAR" property="telephone" />
+        <result column="address" jdbcType="VARCHAR" property="address" />
     </resultMap>
 
     <resultMap id="ResultWithInfoExMap" type="com.jsh.erp.datasource.vo.DepotHeadVo4InDetail">
@@ -447,7 +450,8 @@
     </select>
 
     <select id="getDetailByNumber" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="ResultMapEx">
-        select dh.*, concat(dh.sub_type,dh.type) as depotHeadType, s.supplier OrganName, a.name AccountName
+        select dh.*, concat(dh.sub_type,dh.type) as depotHeadType, a.name AccountName,
+               s.supplier OrganName, s.contacts, s.telephone, s.address
         from jsh_depot_head dh
         left join jsh_supplier s on dh.organ_id=s.id and ifnull(s.delete_Flag,'0') !='1'
         left join jsh_account a on dh.account_id=a.id and ifnull(a.delete_Flag,'0') !='1'