Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/mapper/report/ReportMapper.xml

@@ -828,6 +828,7 @@
     <!-- 出库明细报表主表 -->
     <select id="getOutboundReport" resultType="java.util.Map">
         SELECT
+        t.out_id as "outId",
         t.out_no as "outNo",
         t.from_no as "fromNo",
         tmo.org_name as "orgName",
@@ -884,7 +885,8 @@
     <!-- 出库明细报表明细 -->
     <select id="getOutboundDetailReport" resultType="java.util.Map">
         select
-        t.out_no as "outNo"
+        t.out_id as "outId"
+        ,t.out_no as "outNo"
         ,t.from_no as "fromNo"
         ,tmo.org_name as "orgName"
         ,tms.staff_name as "staffName"
@@ -966,6 +968,7 @@
     <!-- 入库明细报表主表 -->
     <select id="getInboundlReport" resultType="java.util.Map">
         SELECT
+        t.into_id as "intoId",
         t.into_no as "intoNo",
         t.from_no as "fromNo",
         tmo.org_name as "orgName",
@@ -1025,7 +1028,8 @@
     <!-- 入库明细报表明细 -->
     <select id="getInboundDetailReport" resultType="java.util.Map">
         select
-        t.into_no as "intoNo"
+        t.into_id as "intoId"
+        ,t.into_no as "intoNo"
         ,t.from_no as "fromNo"
         ,tmo.org_name as "orgName"
         ,tms.staff_name as "staffName"