#

Junjie

昨天 8a46532e000f125bf885e2ee4de99c81c3b6d803

 src/main/java/com/zy/asrs/controller/LocMastController.java

@@ -67,7 +67,7 @@
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                if (entry.getKey().equals("loc_no")) {
                if (entry.getKey().equals("loc_no") || entry.getKey().equals("row1") ||  entry.getKey().equals("bay1") || entry.getKey().equals("lev1")) {
                    wrapper.eq(entry.getKey(), val);
                }else {
                    wrapper.like(entry.getKey(), val);
@@ -164,9 +164,23 @@
                JSONObject map = row.get(j);

                String nodeType = map.getString("type");
                String value = map.getString("value");
                if("shelf".equals(nodeType)) {
                    if(initBay == -1) {
                        initBay = 2;
                    }

                    int userConfigRow = -1;
                    int userConfirmBay = -1;
                    try {
                        String[] split = value.split("-");
                        userConfigRow = Integer.parseInt(split[0]);
                        userConfirmBay = Integer.parseInt(split[1]);
                    }catch (Exception e){}

                    if (userConfirmBay != -1) {
                        initRow = userConfigRow;
                        initBay = userConfirmBay;
                    }

                    HashMap<String, Object> locNoMap = new HashMap<>();
@@ -209,6 +223,7 @@
        }

        redisUtil.del(RedisKeyType.LOC_MAP_BASE.key);
        redisUtil.del(RedisKeyType.LOC_MAST_MAP_LIST.key);
        return R.ok();
    }