From a7c56d6b273f09935c834a898906cc8c5881d1c4 Mon Sep 17 00:00:00 2001
From: qiankunpingtai <qiankunpingtai@163.com>
Date: Fri, 24 May 2019 09:16:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper_xml/DepotItemMapperEx.xml          | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index 66c36b2e..edb3caa6 100644
--- a/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -611,24 +611,24 @@
         AND intype.BasicInNumber > 0
     </select>
     <select id="getCurrentRepByMaterialIdAndDepotId" resultType="java.math.BigDecimal">
-        select  ((curep.inTotal+curep.transfInTotal+curep.assemInTotal+curep.disAssemInTotal)
-        -(curep.transfOutTotal+curep.outTotal+curep.assemOutTotal+curep.disAssemOutTotal)) as currentRepo
-        from
-        (select sum(dh.type='入库' and di.DepotId=#{depotId}) as inTotal,
-        sum(dh.SubType='调拨' and di.AnotherDepotId=#{depotId}) as transfInTotal,
-        sum(dh.SubType='调拨' and di.DepotId=#{depotId}) as transfOutTotal,
-        sum(dh.type='出库' and dh.SubType!='调拨' and di.DepotId=#{depotId}) as outTotal,
-        sum(dh.SubType='组装单' and di.MType='组合件' and di.DepotId=#{depotId}) as assemInTotal,
-        sum(dh.SubType='组装单' and di.MType='普通子件' and di.DepotId=#{depotId}) as assemOutTotal,
-        sum(dh.SubType='拆卸单' and di.MType='普通子件' and di.DepotId=#{depotId}) as disAssemInTotal,
-        sum(dh.SubType='拆卸单' and di.MType='组合件' and di.DepotId=#{depotId}) as disAssemOutTotal
-        from
-        jsh_depothead dh,jsh_depotitem di
-        where 1=1
-        and dh.id=di.HeaderId
-        and di.MaterialId=#{materialId}
-        and ifnull(dh.delete_Flag,'0') !='1'
-        and ifnull(di.delete_Flag,'0') !='1') curep
+    select  ((curep.inTotal+curep.transfInTotal+curep.assemInTotal+curep.disAssemInTotal)
+    -(curep.transfOutTotal+curep.outTotal+curep.assemOutTotal+curep.disAssemOutTotal)) as currentRepo
+    from
+    (select sum(if(dh.type='入库' and di.DepotId=#{depotId},di.BasicNumber,0)) as inTotal,
+    sum(if(dh.SubType='调拨' and di.AnotherDepotId=#{depotId},di.BasicNumber,0)) as transfInTotal,
+    sum(if(dh.SubType='调拨' and di.DepotId=#{depotId},di.BasicNumber,0)) as transfOutTotal,
+    sum(if(dh.type='出库' and dh.SubType!='调拨' and di.DepotId=#{depotId},di.BasicNumber,0)) as outTotal,
+    sum(if(dh.SubType='组装单' and di.MType='组合件' and di.DepotId=#{depotId},di.BasicNumber,0)) as assemInTotal,
+    sum(if(dh.SubType='组装单' and di.MType='普通子件' and di.DepotId=#{depotId},di.BasicNumber,0)) as assemOutTotal,
+    sum(if(dh.SubType='拆卸单' and di.MType='普通子件' and di.DepotId=#{depotId},di.BasicNumber,0)) as disAssemInTotal,
+    sum(if(dh.SubType='拆卸单' and di.MType='组合件' and di.DepotId=#{depotId},di.BasicNumber,0)) as disAssemOutTotal
+    from
+    jsh_depothead dh,jsh_depotitem di
+    where 1=1
+    and dh.id=di.HeaderId
+    and di.MaterialId=#{materialId}
+    and ifnull(dh.delete_Flag,'0') !='1'
+    and ifnull(di.delete_Flag,'0') !='1') curep
     </select>
 
 </mapper>