From 3f1b4410d6c28f4d63a1f44ccd81a939456a04ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 19 Oct 2022 21:00:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=80=BB?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsh/erp/datasource/mappers/DepotHeadMapperEx.java |  3 +++
 .../com/jsh/erp/datasource/vo/DepotHeadVo4List.java   | 10 ++++++++++
 .../jsh/erp/service/depotHead/DepotHeadService.java   | 11 +++++++++++
 .../main/resources/mapper_xml/DepotHeadMapperEx.xml   |  7 ++++++-
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
index cccaaca2..ed6e4507 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
@@ -61,6 +61,9 @@ public interface DepotHeadMapperEx {
     String findMaterialsListByHeaderId(
             @Param("id") Long id);
 
+    BigDecimal getMaterialCountByHeaderId(
+            @Param("id") Long id);
+
     List<DepotHeadVo4InDetail> findInOutDetail(
             @Param("beginTime") String beginTime,
             @Param("endTime") String endTime,
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 53a55830..6badbd61 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
@@ -41,6 +41,8 @@ public class DepotHeadVo4List extends DepotHead{
 
     private BigDecimal debt;
 
+    private BigDecimal materialCount;
+
     public String getProjectName() {
         return projectName;
     }
@@ -176,4 +178,12 @@ public class DepotHeadVo4List extends DepotHead{
     public void setDebt(BigDecimal debt) {
         this.debt = debt;
     }
+
+    public BigDecimal getMaterialCount() {
+        return materialCount;
+    }
+
+    public void setMaterialCount(BigDecimal materialCount) {
+        this.materialCount = materialCount;
+    }
 }
\ 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 42454e84..43274b04 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
@@ -151,6 +151,7 @@ public class DepotHeadService {
                         dh.setOperTimeStr(getCenternTime(dh.getOperTime()));
                     }
                     dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId()));
+                    dh.setMaterialCount(getMaterialCountByHeaderId(dh.getId()));
                     resList.add(dh);
                 }
             }
@@ -486,6 +487,16 @@ public class DepotHeadService {
         return result;
     }
 
+    private BigDecimal getMaterialCountByHeaderId(Long id) {
+        BigDecimal result = null;
+        try{
+            result = depotHeadMapperEx.getMaterialCountByHeaderId(id);
+        }catch(Exception e){
+            JshException.readFail(logger, e);
+        }
+        return result;
+    }
+
     public List<DepotHeadVo4InDetail> findInOutDetail(String beginTime, String endTime, String type, String [] creatorArray,
                                                 String [] organArray, String materialParam, List<Long> depotList, Integer oId, String number,
                                                 String remark, Integer offset, Integer rows) throws Exception{
diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
index 51a56880..5d6f7a47 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
@@ -239,6 +239,12 @@
         and ifnull(jsh_depot_item.delete_flag,'0') !='1'
     </select>
 
+    <select id="getMaterialCountByHeaderId" resultType="java.math.BigDecimal">
+        select sum(oper_number) from jsh_depot_item
+        where header_id = #{id}
+        and ifnull(delete_flag,'0') !='1'
+    </select>
+
     <select id="findInOutDetail" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultWithInfoExMap">
         select dh.number,me.bar_code, m.`name` MName,m.model,m.standard,di.unit_price,di.material_unit as mUnit,
         di.oper_number,di.all_price, ifnull(di.tax_rate,0) tax_rate, ifnull(di.tax_money,0) tax_money, ifnull(di.tax_last_money,0) tax_last_money,
@@ -908,5 +914,4 @@
         and dh.number!=#{number}
         and ifnull(dh.delete_flag,'0') !='1'
     </select>
-
 </mapper>
\ No newline at end of file