pang.jiabao
2 天以前 25a607ee3ccb7e25906c17e3089794399c437e2e
src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -67,10 +67,10 @@
                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);
                    wrapper.eq(entry.getKey(), val);
                }
            }
        }
@@ -164,11 +164,21 @@
                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 userConfirmBay = -1;
                    try {
                        userConfirmBay = (int) Double.parseDouble(value);
                    }catch (Exception e){}
                    if (userConfirmBay != -1) {
                        initBay = userConfirmBay;
                    }
                    HashMap<String, Object> locNoMap = new HashMap<>();
                    locNoMap.put("row", initRow);
                    locNoMap.put("bay", initBay);