#

Junjie

1 天以前 8dc960dd9fda130ff19faaafed6b1234e622610b

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

@@ -17,12 +17,9 @@
import com.zy.asrs.service.BasMapService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.NavigateNode;
import com.zy.common.utils.RedisUtil;
import com.zy.common.web.BaseController;
import com.zy.core.enums.LocStsType;
import com.zy.core.enums.MapNodeType;

import com.zy.core.enums.RedisKeyType;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -70,7 +67,11 @@
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), val);
                if (entry.getKey().equals("loc_no")) {
                    wrapper.eq(entry.getKey(), val);
                }else {
                    wrapper.like(entry.getKey(), val);
                }
            }
        }
    }
@@ -165,7 +166,7 @@
                String nodeType = map.getString("type");
                if("shelf".equals(nodeType)) {
                    if(initBay == -1) {
                        initBay = 1;
                        initBay = 2;
                    }

                    HashMap<String, Object> locNoMap = new HashMap<>();