自动化立体仓库 - WMS系统
lsh
昨天 7e1420649451d5dc22ac49b3b31ba59df1edf19e
#getArmType$
11个文件已修改
167 ■■■■ 已修改文件
src/main/java/com/zy/asrs/entity/BasBoxType.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/LocDetl.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/OrderDetl.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/OrderDetlPakout.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/WaitPakin.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/WaitPakinLog.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/WrkDetl.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/WrkDetlLog.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/WrkDetlSingle.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/basBoxType/basBoxType.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/basBoxType/basBoxType.html 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/BasBoxType.java
@@ -50,7 +50,19 @@
        this.boxType = boxType;
    }
//    BasBoxType basBoxType = new BasBoxType(
    public String getArmType$() {
        if (Cools.isEmpty(armType))  return "请选择结果";
        switch (armType) {
            case 1:
                return "允许";
            case 999:
                return "不允许";
            default:
                return "请选择结果";
        }
    }
    //    BasBoxType basBoxType = new BasBoxType(
//            null,    // 任务号[非空]
//            null    // 堆垛机
//    );
src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -248,12 +248,19 @@
    }
    public int getBrandArmType$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return basBoxType.getArmType();
        try{
            BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
            List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
            for (BasBoxType basBoxType:basBoxTypes){
                if (basBoxType.getArmType()!=1){
                    return 999;
                }
                return basBoxType.getArmType();
            }
            return 999;
        } catch (Exception e){
            return 999;
        }
        return 999;
    }
    public String getModiTime$(){
src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -506,12 +506,19 @@
    }
    public int getBrandArmType$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return basBoxType.getArmType();
        try{
            BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
            List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
            for (BasBoxType basBoxType:basBoxTypes){
                if (basBoxType.getArmType()!=1){
                    return 999;
                }
                return basBoxType.getArmType();
            }
            return 999;
        } catch (Exception e){
            return 999;
        }
        return 999;
    }
}
src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
@@ -513,12 +513,19 @@
    }
    public int getBrandArmType$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return basBoxType.getArmType();
        try{
            BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
            List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
            for (BasBoxType basBoxType:basBoxTypes){
                if (basBoxType.getArmType()!=1){
                    return 999;
                }
                return basBoxType.getArmType();
            }
            return 999;
        } catch (Exception e){
            return 999;
        }
        return 999;
    }
}
src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -255,11 +255,18 @@
    }
    public int getBrandArmType$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return basBoxType.getArmType();
        try{
            BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
            List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
            for (BasBoxType basBoxType:basBoxTypes){
                if (basBoxType.getArmType()!=1){
                    return 999;
                }
                return basBoxType.getArmType();
            }
            return 999;
        } catch (Exception e){
            return 999;
        }
        return 999;
    }
}
src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -238,12 +238,19 @@
    }
    public int getBrandArmType$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return basBoxType.getArmType();
        try{
            BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
            List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
            for (BasBoxType basBoxType:basBoxTypes){
                if (basBoxType.getArmType()!=1){
                    return 999;
                }
                return basBoxType.getArmType();
            }
            return 999;
        } catch (Exception e){
            return 999;
        }
        return 999;
    }
}
src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -405,12 +405,19 @@
    }
    public int getBrandArmType$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return basBoxType.getArmType();
        try{
            BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
            List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
            for (BasBoxType basBoxType:basBoxTypes){
                if (basBoxType.getArmType()!=1){
                    return 999;
                }
                return basBoxType.getArmType();
            }
            return 999;
        } catch (Exception e){
            return 999;
        }
        return 999;
    }
    public void sync(Object source) {
src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -399,12 +399,19 @@
    }
    public int getBrandArmType$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return basBoxType.getArmType();
        try{
            BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
            List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
            for (BasBoxType basBoxType:basBoxTypes){
                if (basBoxType.getArmType()!=1){
                    return 999;
                }
                return basBoxType.getArmType();
            }
            return 999;
        } catch (Exception e){
            return 999;
        }
        return 999;
    }
src/main/java/com/zy/asrs/entity/WrkDetlSingle.java
@@ -480,12 +480,19 @@
    }
    public int getBrandArmType$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return basBoxType.getArmType();
        try{
            BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
            List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
            for (BasBoxType basBoxType:basBoxTypes){
                if (basBoxType.getArmType()!=1){
                    return 999;
                }
                return basBoxType.getArmType();
            }
            return 999;
        } catch (Exception e){
            return 999;
        }
        return 999;
    }
src/main/webapp/static/js/basBoxType/basBoxType.js
@@ -25,6 +25,7 @@
            {field: 'id', align: 'center',title: 'ID' ,hide : true},
            {field: 'boxSpecs', align: 'center',title: '箱型',hide : false}
            ,{field: 'boxType', align: 'center',title: '箱型编号',hide : false}
            ,{field: 'armType$', align: 'center',title: '是否允许机械臂执行',hide : false}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120}
        ]],
src/main/webapp/views/basBoxType/basBoxType.html
@@ -84,6 +84,22 @@
                        <input class="layui-input" name="boxType" placeholder="请输入箱型编号">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">箱型编号(桁架机械臂用): </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="armType" placeholder="请输入箱型编号">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">是否允许机械臂执行: </label>
                    <div class="layui-input-block">
                        <select name="armType">
                            <option value="0">请选择结果</option>
                            <option value="1">允许</option>
                            <option value="999">不允许</option>
                        </select>
                    </div>
                </div>
             </div>
        </div>