From d55a512c442dc258b0c78e519a997d4f1c614b00 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 02 四月 2026 10:24:16 +0800
Subject: [PATCH] no message
---
src/main/resources/mapper/LocDetlMapper.xml | 120 ----------------------------------------
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 1
src/main/resources/mapper/OrderDetlPakinMapper.xml | 50 ----------------
3 files changed, 1 insertions(+), 170 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 6fbcdb1..a900c9f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -3171,6 +3171,7 @@
detl.setSupp(combMat.getSuppCode());
if (!taskDetlService.update(detl, new EntityWrapper<TaskDetl>()
.eq("matnr", detl.getMatnr())
+ .eq("order_no", detl.getOrderNo())
.eq("supp_code", detl.getSuppCode())
.eq("wrk_no", task.getWrkNo()))) {
throw new CoolException("浠诲姟鍙蜂俊鎭洿鏂板け璐ワ紒锛�");
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index efa2463..a4dd168 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -55,22 +55,6 @@
<sql id="batchSeq">
<choose>
- <when test="batch != null and batch != ''">
- and d.batch = #{batch}
- </when>
- <otherwise>
- and (d.batch IS NULL OR d.batch = '')
- </otherwise>
- </choose>
- <choose>
- <when test="brand != null and brand != ''">
- and d.brand = #{brand}
- </when>
- <otherwise>
- and (d.brand IS NULL OR d.brand = '')
- </otherwise>
- </choose>
- <choose>
<when test="standby1 != null and standby1 != ''">
and d.standby1 = #{standby1}
</when>
@@ -78,64 +62,8 @@
and (d.standby1 IS NULL OR d.standby1 = '')
</otherwise>
</choose>
- <choose>
- <when test="standby2 != null and standby2 != ''">
- and d.standby2 = #{standby2}
- </when>
- <otherwise>
- and (d.standby2 IS NULL OR d.standby2 = '')
- </otherwise>
- </choose>
- <choose>
- <when test="standby3 != null and standby3 != ''">
- and d.standby3 = #{standby3}
- </when>
- <otherwise>
- and (d.standby3 IS NULL OR d.standby3 = '')
- </otherwise>
- </choose>
-<!-- <choose>-->
-<!-- <when test="boxType1 != null and boxType1 != ''">-->
-<!-- and d.box_type1 = #{boxType1}-->
-<!-- </when>-->
-<!-- <otherwise>-->
-<!-- and (d.box_type1 IS NULL OR d.box_type1 = '')-->
-<!-- </otherwise>-->
-<!-- </choose>-->
- <choose>
- <when test="boxType2 != null and boxType2 != ''">
- and d.box_type2 = #{boxType2}
- </when>
- <otherwise>
- and (d.box_type2 IS NULL OR d.box_type2 = '')
- </otherwise>
- </choose>
- <choose>
- <when test="boxType3 != null and boxType3 != ''">
- and d.box_type3 = #{boxType3}
- </when>
- <otherwise>
- and (d.box_type3 IS NULL OR d.box_type3 = '')
- </otherwise>
- </choose>
</sql>
<sql id="batchSeqA">
-<!-- <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="brand != null and brand != ''">-->
-<!-- and a.brand = #{brand}-->
-<!-- </when>-->
-<!-- <otherwise>-->
-<!-- and (a.brand IS NULL OR a.brand = '')-->
-<!-- </otherwise>-->
-<!-- </choose>-->
<choose>
<when test="standby1 != null and standby1 != ''">
and a.standby1 = #{standby1}
@@ -144,46 +72,6 @@
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>-->
-<!-- </choose>-->
-<!-- <choose>-->
-<!-- <when test="standby3 != null and standby3 != ''">-->
-<!-- and a.standby3 = #{standby3}-->
-<!-- </when>-->
-<!-- <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>-->
-<!-- </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>-->
-<!-- </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>-->
-<!-- </choose>-->
</sql>
<sql id="batchSeqNew">
<choose>
@@ -567,20 +455,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="areaIds != null and areaIds.size > 0">
and a.area_id in
<foreach item="item" collection="areaIds" 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
diff --git a/src/main/resources/mapper/OrderDetlPakinMapper.xml b/src/main/resources/mapper/OrderDetlPakinMapper.xml
index 09cb98f..0cb8582 100644
--- a/src/main/resources/mapper/OrderDetlPakinMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakinMapper.xml
@@ -53,69 +53,19 @@
<result column="box_type1" property="boxType1" />
<result column="box_type2" property="boxType2" />
<result column="box_type3" property="boxType3" />
-
</resultMap>
-
<sql id="standbyAll">
-<!-- <choose>-->
-<!-- <when test="batch != null and batch != ''">-->
-<!-- and batch = #{batch}-->
-<!-- </when>-->
-<!-- <otherwise>-->
-<!-- and (batch IS NULL OR batch = '')-->
-<!-- </otherwise>-->
-<!-- </choose>-->
-<!-- <choose>-->
-<!-- <when test="brand != null and brand != ''">-->
-<!-- and brand = #{brand}-->
-<!-- </when>-->
-<!-- <otherwise>-->
-<!-- and (brand IS NULL OR brand = '')-->
-<!-- </otherwise>-->
-<!-- </choose>-->
<choose>
<when test="standby1 != null and standby1 != ''">
and standby1 = #{standby1}
</when>
</choose>
<!-- <choose>-->
-<!-- <when test="standby2 != null and standby2 != ''">-->
-<!-- and standby2 = #{standby2}-->
-<!-- </when>-->
-<!-- <otherwise>-->
-<!-- and (standby2 IS NULL OR standby2 = '')-->
-<!-- </otherwise>-->
-<!-- </choose>-->
-<!-- <choose>-->
-<!-- <when test="standby3 != null and standby3 != ''">-->
-<!-- and standby3 = #{standby3}-->
-<!-- </when>-->
-<!-- <otherwise>-->
-<!-- and (standby3 IS NULL OR standby3 = '')-->
-<!-- </otherwise>-->
-<!-- </choose>-->
-<!-- <choose>-->
<!-- <when test="boxType1 != null and boxType1 != ''">-->
<!-- and box_type1 = #{boxType1}-->
<!-- </when>-->
<!-- <otherwise>-->
<!-- and (box_type1 IS NULL OR box_type1 = '')-->
-<!-- </otherwise>-->
-<!-- </choose>-->
-<!-- <choose>-->
-<!-- <when test="boxType2 != null and boxType2 != ''">-->
-<!-- and box_type2 = #{boxType2}-->
-<!-- </when>-->
-<!-- <otherwise>-->
-<!-- and (box_type2 IS NULL OR box_type2 = '')-->
-<!-- </otherwise>-->
-<!-- </choose>-->
-<!-- <choose>-->
-<!-- <when test="boxType3 != null and boxType3 != ''">-->
-<!-- and box_type3 = #{boxType3}-->
-<!-- </when>-->
-<!-- <otherwise>-->
-<!-- and (box_type3 IS NULL OR box_type3 = '')-->
<!-- </otherwise>-->
<!-- </choose>-->
</sql>
--
Gitblit v1.9.1