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

zjj

2024-11-09 728ae1ba12ed4f59fa4dd897b74dd55b415856e5

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

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

@@ -85,6 +85,30 @@
        param.remove("curr");
        param.remove("limit");
        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
        if (!Cools.isEmpty(param.get("crnNo"))) {
            switch ((String) param.get("crnNo")) {
                case "1": wrapper.le("SUBSTRING(loc_no, 1, 2)",4);
                    break;
                case "2":wrapper.ge("SUBSTRING(loc_no, 1, 2)",5).le("SUBSTRING(loc_no, 1, 2)",8);
                    break;
                case "3":wrapper.ge("SUBSTRING(loc_no, 1, 2)",9).le("SUBSTRING(loc_no, 1, 2)",12);
                    break;
                case "4":wrapper.ge("SUBSTRING(loc_no, 1, 2)",13).le("SUBSTRING(loc_no, 1, 2)",16);
                    break;
                case "5":
                    break;
                case "6":
                    break;
                case "7":wrapper.ge("SUBSTRING(loc_no, 1, 2)",17).le("SUBSTRING(loc_no, 1, 2)",37);
                    break;
                case "8":wrapper.ge("SUBSTRING(loc_no, 1, 2)",38).le("SUBSTRING(loc_no, 1, 2)",45);
                    break;
                case "9":wrapper.ge("SUBSTRING(loc_no, 1, 2)",46).le("SUBSTRING(loc_no, 1, 2)",53);
                    break;
                default:
            }
            param.remove("crnNo");
        }
        convert(param, wrapper);
        // 不同继承角色显示不同库信息
        RoleUtils.addRoleWrapperByLocNo(getUserId(),wrapper);