自动化立体仓库 - WMS系统
skyouc
16 小时以前 d887f786e04e32e286afa35aa9e7d5f79c73384c
no message
2个文件已修改
68 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/LocDetlMapper.xml 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -60,14 +60,14 @@
        LocDetl locDetl = this.selectOne(new EntityWrapper<LocDetl>()
                .eq(!Cools.isEmpty(locNo),"loc_no", locNo)
                .eq(!Cools.isEmpty(locNo),"matnr", matnr)
                .eq(!Cools.isEmpty(locNo),"batch", batch)
//                .eq(!Cools.isEmpty(locNo),"batch", batch)
                .eq(!Cools.isEmpty(brand),"brand", brand)
                .eq(!Cools.isEmpty(standby1),"standby1", standby1)
                .eq(!Cools.isEmpty(standby2),"standby2", standby2)
                .eq(!Cools.isEmpty(standby3),"standby3", standby3)
                .eq(!Cools.isEmpty(boxType1),"box_type1", boxType1)
                .eq(!Cools.isEmpty(boxType2),"box_type2", boxType2)
                .eq(!Cools.isEmpty(boxType3),"box_type3", boxType3)
//                .eq(!Cools.isEmpty(standby2),"standby2", standby2)
//                .eq(!Cools.isEmpty(standby3),"standby3", standby3)
//                .eq(!Cools.isEmpty(boxType1),"box_type1", boxType1)
//                .eq(!Cools.isEmpty(boxType2),"box_type2", boxType2)
//                .eq(!Cools.isEmpty(boxType3),"box_type3", boxType3)
        );
        if (Cools.isEmpty(locDetl)) {
            return false;
src/main/resources/mapper/LocDetlMapper.xml
@@ -187,67 +187,11 @@
    </sql>
    <sql id="batchSeqNew">
        <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>
            <otherwise>
                and (standby1 IS NULL OR standby1 = '')
            </otherwise>
        </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>