From 3c8343535bec2a53855956e25598e2271fc84c0d Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期日, 07 七月 2024 10:28:21 +0800
Subject: [PATCH] 更新测试管理搜索功能

---
 src/main/resources/mapper/LocDetlMapper.xml |   66 +++++++++++++++++++++++++++------
 1 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 8a2ebea..3d1dedc 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -36,7 +36,7 @@
         <result column="dead_time" property="deadTime" />
         <result column="dead_warn" property="deadWarn" />
         <result column="source" property="source" />
-        <result column="check" property="check" />
+        <result column="inspect" property="inspect" />
         <result column="danger" property="danger" />
 
         <result column="modi_user" property="modiUser" />
@@ -99,6 +99,9 @@
         </if>
         <if test="startTime!=null and endTime!=null">
             and a.modi_time between #{startTime} and #{endTime}
+        </if>
+        <if test="crnNo!=null and crnNo!='' ">
+            and b.crn_no=#{crnNo}
         </if>
     </sql>
 
@@ -199,19 +202,30 @@
         where 1=1
         and b.loc_sts = 'F'
         and a.matnr = #{matnr}
-        <choose>
-            <when test="batch != null and batch != ''">
-                and a.batch = #{batch}
-            </when>
-            <otherwise>
-                and (a.batch IS NULL OR a.batch = '')
-            </otherwise>
-        </choose>
-        <if test="orderNo != null and orderNo != ''">
-            and a.orderNo = #{orderNo}
+<!--        <choose>-->
+<!--            <when test="batch != null and batch != ''">-->
+<!--                and a.batch = #{batch}-->
+<!--            </when>-->
+<!--            <otherwise>-->
+<!--                and (a.batch IS NULL OR a.batch = '')-->
+<!--            </otherwise>-->
+<!--        </choose>-->
+        <if test="batch != null and batch != ''">
+            and a.batch = #{batch}
         </if>
+        <if test="orderNo != null and orderNo != ''">
+            and a.order_no = #{orderNo}
+        </if>
+
+        <if test="locNos != null and locNos.size > 0">
+            and b.loc_no not in
+            <foreach item="item" collection="locNos" index="index"  separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+
         order by
-        DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time)
+        DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
         desc,
         NEWID(),
         case
@@ -277,4 +291,32 @@
         </if>
     </select>
 
+    <select id="queryStockTotal" resultType="com.zy.asrs.entity.result.StockVo">
+        select
+        matnr,
+        batch,
+        count(anfme) as count
+        from asr_loc_detl
+        where 1=1
+        group by matnr,batch
+    </select>
+    <select id="sum" resultType="java.lang.Integer">
+        SELECT SUM(anfme) FROM asr_loc_detl
+    </select>
+    <select id="unreason" resultMap="BaseResultMap">
+        SELECT
+            *
+        FROM
+            [dbo].[asr_loc_detl]
+        WHERE
+            DATALENGTH( batch ) != 11 or
+            batch LIKE '%[a-z]%'
+    </select>
+
+    <select id="selectLocDetlSumQty" resultType="double">
+        select SUM(anfme) anfme
+        from asr_loc_detl
+        where loc_no=#{locNo}
+    </select>
+
 </mapper>

--
Gitblit v1.9.1