From 29d3f24dc43df41103bc5f483bfc439494a80971 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 17 十二月 2025 09:30:32 +0800
Subject: [PATCH] 对接mes 对接华晓agv 对接海康agv 初始化开发
---
src/main/resources/mapper/LocDetlMapper.xml | 60 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 31cc31b..9db0603 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -125,65 +125,65 @@
<when test="batch != null and batch != ''">
and a.batch = #{batch}
</when>
- <otherwise>
- and (a.batch IS NULL OR a.batch = '')
- </otherwise>
+<!-- <otherwise>-->
+<!-- and (a.batch IS NULL OR a.batch = '')-->
+<!-- </otherwise>-->
</choose>
<choose>
<when test="brand != null and brand != ''">
and a.brand = #{brand}
</when>
- <otherwise>
- and (a.brand IS NULL OR a.brand = '')
- </otherwise>
+<!-- <otherwise>-->
+<!-- and (a.brand IS NULL OR a.brand = '')-->
+<!-- </otherwise>-->
</choose>
<choose>
<when test="standby1 != null and standby1 != ''">
and a.standby1 = #{standby1}
</when>
- <otherwise>
- and (a.standby1 IS NULL OR a.standby1 = '')
- </otherwise>
+<!-- <otherwise>-->
+<!-- and (a.standby1 IS NULL OR a.standby1 = '')-->
+<!-- </otherwise>-->
</choose>
<choose>
<when test="standby2 != null and standby2 != ''">
and a.standby2 = #{standby2}
</when>
- <otherwise>
- and (a.standby2 IS NULL OR a.standby2 = '')
- </otherwise>
+<!-- <otherwise>-->
+<!-- and (a.standby2 IS NULL OR a.standby2 = '')-->
+<!-- </otherwise>-->
</choose>
<choose>
<when test="standby3 != null and standby3 != ''">
and a.standby3 = #{standby3}
</when>
- <otherwise>
- and (a.standby3 IS NULL OR a.standby3 = '')
- </otherwise>
+<!-- <otherwise>-->
+<!-- and (a.standby3 IS NULL OR a.standby3 = '')-->
+<!-- </otherwise>-->
</choose>
<choose>
<when test="boxType1 != null and boxType1 != ''">
and a.box_type1 = #{boxType1}
</when>
- <otherwise>
- and (a.box_type1 IS NULL OR a.box_type1 = '')
- </otherwise>
+<!-- <otherwise>-->
+<!-- and (a.box_type1 IS NULL OR a.box_type1 = '')-->
+<!-- </otherwise>-->
</choose>
<choose>
<when test="boxType2 != null and boxType2 != ''">
and a.box_type2 = #{boxType2}
</when>
- <otherwise>
- and (a.box_type2 IS NULL OR a.box_type2 = '')
- </otherwise>
+<!-- <otherwise>-->
+<!-- and (a.box_type2 IS NULL OR a.box_type2 = '')-->
+<!-- </otherwise>-->
</choose>
<choose>
<when test="boxType3 != null and boxType3 != ''">
and a.box_type3 = #{boxType3}
</when>
- <otherwise>
- and (a.box_type3 IS NULL OR a.box_type3 = '')
- </otherwise>
+<!-- <otherwise>-->
+<!-- and (a.box_type3 IS NULL OR a.box_type3 = '')-->
+<!-- </otherwise>-->
</choose>
</sql>
<sql id="batchSeqNew">
@@ -545,12 +545,12 @@
<include refid="batchSeqA"></include>
- <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>
+<!-- <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), a.anfme
--
Gitblit v1.9.1