From 43ff5a9617f0d2648bf987335d3e27d36cda6f60 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 08 十二月 2023 13:20:11 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/LocDetlMapper.xml |  164 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 153 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index dd8592b..eda904e 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -106,6 +106,9 @@
         <if test="crnNo!=null and crnNo!='' ">
             and b.crn_no=#{crnNo}
         </if>
+        <if test="owner !=null and owner!='' ">
+            and a.owner =  #{owner}
+        </if>
     </sql>
 
     <select id="getStockOutPage" resultMap="BaseResultMap">
@@ -219,7 +222,7 @@
         ROW_NUMBER() over (order by sum(a.anfme) desc) as row
         , a.matnr
         , sum(a.anfme) as anfme
-        from asr_loc_detl a
+        from asr_loc_detl_all a
         where 1=1
         group by a.matnr
     </select>
@@ -386,7 +389,15 @@
         from asr_loc_detl_merge a
         left join asr_loc_mast_man_node_merge b on a.loc_no = b.loc_no
         where 1=1
-        and a.loc_no = #{locNo}
+        <if test="locNo != null and locNo !=''">
+            and a.loc_no = #{locNo}
+        </if>
+        <if test="zpallet != null and zpallet !=''">
+            and a.zpallet = #{zpallet}
+        </if>
+        <if test="matnr != null and matnr !='' and matnr !='null'">
+            and a.matnr like '%'+#{matnr}+'%'
+        </if>
     </select>
     <select id="queryStockViewMergeCount" resultType="java.lang.Integer">
         select count(1) from asr_loc_mast_man_node_merge
@@ -443,7 +454,7 @@
         </choose>
 
         order by
-        a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
+        a.price asc,a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
         desc,
         NEWID(),
         case
@@ -506,8 +517,11 @@
         <if test="matnr != null and matnr !='' ">
             and t.matnr like '%' + #{matnr} + '%'
         </if>
-        <if test="owner != null and owner !='' ">
-            and t.owner like '%' + #{owner} + '%'
+        <if test="owner != null">
+            and t.owner =  #{owner}
+        </if>
+        <if test="payment != null">
+            and t.payment = #{payment}
         </if>
 
     </sql>
@@ -536,7 +550,8 @@
         SELECT ROW_NUMBER() over(order by matnr) as row,* FROM (
         SELECT * FROM asr_loc_detl_all
         ) t
-        WHERE 1=1 and t.payment = 0
+        WHERE 1=1
+
         <include refid="selectAllSql"></include>
         ) a
         WHERE a.row BETWEEN ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
@@ -549,23 +564,27 @@
         SELECT ROW_NUMBER() over(order by matnr) as row,* FROM (
         SELECT * FROM asr_loc_detl_all
         ) t
-        WHERE 1=1 and t.payment = 0
+        WHERE 1=1
         <include refid="selectAllSql"></include>
         ) a
 
     </select>
     <select id="getStockStatisAll" resultType="com.zy.asrs.entity.result.LocDetlAll">
-        select * from
+        select t.*,m.specs from
         (
         select
         ROW_NUMBER() over (order by sum(a.anfme) desc) as row
         , a.matnr
         , sum(a.anfme) as anfme
+        ,owner
+        ,payment
         from asr_loc_detl_all a
         where 1=1
         <include refid="stockOutCondition"></include>
-        group by a.matnr
-        ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+        group by a.matnr,a.owner,a.payment
+        ) t
+        LEFT JOIN man_mat m on t.matnr = m.matnr
+        where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
     </select>
 
     <select id="getStockStatisCountAll" parameterType="java.util.Map" resultType="java.lang.Integer">
@@ -573,16 +592,139 @@
         (
         select
         a.matnr
+        ,owner
+        ,payment
         from asr_loc_detl_all a
         where 1=1
         <include refid="stockOutCondition"></include>
-        group by a.matnr
+        group by a.matnr,a.owner,a.payment
         ) b
+    </select>
+
+    <select id="getOwnerStatisAll" resultType="com.zy.asrs.entity.result.LocDetlAll">
+        select t.* from
+            (
+            select
+            ROW_NUMBER() over (order by sum(1) desc) as row
+            , sum(anfme) as anfme
+            ,owner
+            from asr_loc_detl_all a
+            where 1=1
+            <include refid="stockOutCondition"></include>
+            group by a.owner
+            ) t
+        where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+    </select>
+
+    <select id="getOwnerStatisAllCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select count(1) as count from
+        (
+        select
+        ROW_NUMBER() over (order by sum(1) desc) as row
+        , sum(anfme) as anfme
+        ,owner
+        from asr_loc_detl_all a
+        where 1=1
+        <include refid="stockOutCondition"></include>
+        group by a.owner
+        ) t
     </select>
 
     <select id="sumAll" resultType="java.lang.Double">
         SELECT SUM(anfme) FROM asr_loc_detl_all
     </select>
+    <select id="selectLocNoF" resultType="java.lang.String">
+        select loc_sts from asr_loc_detl_F_view
+        where loc_no = #{locNo}
+
+    </select>
+    <select id="queryStock3" resultMap="BaseResultMap">
+        select a.*
+        from asr_loc_detl_merge a
+        left join asr_loc_detl_F_view b on a.loc_no = b.loc_no
+        where 1=1
+        and b.loc_sts = 'F'
+        and a.matnr = #{matnr}
+        and a.payment = 1
+        <!--        <choose>-->
+        <!--            <when test="batch != null and batch != ''">-->
+        <!--                and a.batch = #{batch}-->
+        <!--            </when>-->
+        <!--            <otherwise>-->
+        <!--                and (a.batch IS NULL OR a.batch = '')-->
+        <!--            </otherwise>-->
+        <!--        </choose>-->
+
+        <choose>
+            <when test="owner != null and owner !=0">
+                and a.owner = #{owner}
+            </when>
+            <otherwise>
+                and 1!=1
+            </otherwise>
+        </choose>
+
+        order by
+        a.price desc,a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
+        desc,
+        NEWID(),
+        case
+        when (left(a.loc_no, 2) = '01') then 0
+        when (left(a.loc_no, 2) = '02') then 1
+        when (left(a.loc_no, 2) = '03') then 1
+        when (left(a.loc_no, 2) = '04') then 0
+        when (left(a.loc_no, 2) = '05') then 0
+        when (left(a.loc_no, 2) = '06') then 1
+        when (left(a.loc_no, 2) = '07') then 1
+        when (left(a.loc_no, 2) = '08') then 0
+        when (left(a.loc_no, 2) = '09') then 0
+        when (left(a.loc_no, 2) = '10') then 1
+        when (left(a.loc_no, 2) = '11') then 1
+        when (left(a.loc_no, 2) = '12') then 0
+        when (left(a.loc_no, 2) = '13') then 0
+        when (left(a.loc_no, 2) = '14') then 1
+        when (left(a.loc_no, 2) = '15') then 1
+        when (left(a.loc_no, 2) = '16') then 0
+        when (left(a.loc_no, 2) = '17') then 0
+        when (left(a.loc_no, 2) = '18') then 1
+        when (left(a.loc_no, 2) = '19') then 1
+        when (left(a.loc_no, 2) = '20') then 0
+        when (left(a.loc_no, 2) = '21') then 0
+        when (left(a.loc_no, 2) = '22') then 1
+        when (left(a.loc_no, 2) = '23') then 1
+        when (left(a.loc_no, 2) = '24') then 0
+        when (left(a.loc_no, 2) = '25') then 0
+        when (left(a.loc_no, 2) = '26') then 1
+        when (left(a.loc_no, 2) = '27') then 1
+        when (left(a.loc_no, 2) = '28') then 0
+        when (left(a.loc_no, 2) = '29') then 0
+        when (left(a.loc_no, 2) = '30') then 1
+        when (left(a.loc_no, 2) = '31') then 1
+        when (left(a.loc_no, 2) = '32') then 0
+        when (left(a.loc_no, 2) = '33') then 0
+        when (left(a.loc_no, 2) = '34') then 1
+        when (left(a.loc_no, 2) = '35') then 1
+        when (left(a.loc_no, 2) = '36') then 0
+        when (left(a.loc_no, 2) = '37') then 0
+        when (left(a.loc_no, 2) = '38') then 1
+        when (left(a.loc_no, 2) = '39') then 1
+        when (left(a.loc_no, 2) = '40') then 0
+        when (left(a.loc_no, 2) = '41') then 0
+        when (left(a.loc_no, 2) = '42') then 1
+        when (left(a.loc_no, 2) = '43') then 1
+        when (left(a.loc_no, 2) = '44') then 0
+        when (left(a.loc_no, 2) = '45') then 0
+        when (left(a.loc_no, 2) = '46') then 1
+        when (left(a.loc_no, 2) = '47') then 1
+        when (left(a.loc_no, 2) = '48') then 0
+        else 0
+        end
+        desc
+    </select>
+
+    <select id="selectOwnerAllAnfme" resultType="com.zy.asrs.entity.result.LocDetlAll">
+        select SUM(anfme) as anfme,owner from asr_loc_detl_all GROUP BY owner ORDER BY anfme DESC
+    </select>
 
 
 </mapper>

--
Gitblit v1.9.1