Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs

whycq

2023-10-18 bb5bb4094dfc9c4a691692d0275cb24bedbc732c

 src/main/java/com/zy/asrs/utils/Utils.java

@@ -229,6 +229,7 @@
            for (Integer row0 : CommonService.SIXTH_GROUP_ROW_LIST) {
                result.add(zerofill(String.valueOf(row0), 2) + locNo.substring(2));
            }
            Collections.reverse(result);
            return result;
        }
        if (CommonService.SEVENTH_GROUP_ROW_LIST.contains(row) && bay < 59) {
@@ -249,7 +250,7 @@
    }

    public static void main(String[] args) {
        System.out.println(JSON.toJSONString(getGroupLoc("0703409")));
        System.out.println(JSON.toJSONString(getGroupLoc("1305908")));
    }

    /**
@@ -386,8 +387,8 @@
    }

    public static void wapperSetCondition(Wrapper wrapper, String column, String condition){
        if(Cools.isEmpty(condition)){
            wrapper.isNull(column);
        if(Cools.isEmpty(condition) || "null".equals(condition)){
            wrapper.andNew().eq(column,"").or().isNull(column);
        }else {
            wrapper.eq(column,condition);
        }