From ec5c46f03fc588378b7ed0d1e1a63119f9f7795c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?=
 <852955+jishenghua@users.noreply.gitee.com>
Date: Thu, 28 Feb 2019 23:09:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E5=92=8C?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E7=9A=84=E5=AF=B9=E8=B4=A6=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84sql=EF=BC=88=E5=B1=8F=E8=94=BD=E6=8E=89=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper_xml/DepotHeadMapperEx.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
index 2968af3f..407331df 100644
--- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
@@ -225,7 +225,7 @@
     <select id="findStatementAccount" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultStatementAccount">
         select dh.Number,concat(dh.SubType,dh.Type) as type,dh.DiscountLastMoney,dh.ChangeAmount,s.supplier supplierName,
         date_format(dh.OperTime,'%Y-%m-%d %H:%i:%S') as oTime from jsh_depothead dh
-        inner join jsh_supplier s on s.id=dh.OrganId where s.type='${supType}' and dh.SubType!='其它'
+        inner join jsh_supplier s on s.id=dh.OrganId where s.type='${supType}' and (dh.SubType!='其它' and dh.SubType!='采购订单' and dh.SubType!='销售订单')
         and dh.OperTime >='${beginTime}' and dh.OperTime &lt;='${endTime}'
         <if test="organId != null">
             and dh.OrganId=${organId}
@@ -248,7 +248,7 @@
         select sum(a) from
         (
             select count(1) a from jsh_depothead dh
-            inner join jsh_supplier s on s.id=dh.OrganId where s.type='${supType}' and dh.SubType!='其它'
+            inner join jsh_supplier s on s.id=dh.OrganId where s.type='${supType}' and (dh.SubType!='其它' and dh.SubType!='采购订单' and dh.SubType!='销售订单')
             and dh.OperTime >='${beginTime}' and dh.OperTime &lt;='${endTime}'
             <if test="organId != null">
                 and dh.OrganId=${organId}