*

lsh

2025-10-22 b68d5f1ee33498ea2c2aa9b29ba532b62fa4a8cb

*

 src/main/java/basArm.sql

@@ -9,10 +9,10 @@
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArm#btn-export', '导出', '', '3', '4', '1');

-- sqlserver
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm/basArm.html', N'basArm管理', null, '2', null, '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm/basArm.html', N'机械臂配置', '40541', '2', '5', '1');

insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#view', N'查询', '', '3', '0', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-add', N'新增', '', '3', '1', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-edit', N'编辑', '', '3', '2', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-delete', N'删除', '', '3', '3', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-export', N'导出', '', '3', '4', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#view', N'查询', '90596', '3', '0', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-add', N'新增', '90596', '3', '1', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-edit', N'编辑', '90596', '3', '2', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-delete', N'删除', '90596', '3', '3', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-export', N'导出', '90596', '3', '4', '1');

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

@@ -43,6 +43,7 @@
        convert(param, wrapper);
        allLike(BasArm.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        wrapper.orderBy("arm_no",true);
        return R.ok(basArmService.selectPage(new Page<>(curr, limit), wrapper));
    }


 src/main/java/com/zy/asrs/entity/BasArm.java

@@ -62,6 +62,10 @@
    @TableField("sta_no_sou")
    private Integer staNoSou;

    @ApiModelProperty(value= "输送PLCId")
    @TableField("devp_id")
    private Integer devpId;

    public BasArm() {}

    public BasArm(Integer armNo,Integer staNo,Integer sortingLine,Integer status) {
@@ -79,4 +83,26 @@
//    );


    public String getStatus$() {
        switch (status){
            case 1:
                return "正常";
            case 2:
                return "关闭";
            default:
                return "异常";
        }
    }

    public String getDevpId$() {
        if (devpId == null){return "未知";}
        switch (devpId) {
            case 1:
                return "1楼";
            case 2:
                return "2楼";
            default:
                return "未知";
        }
    }
}

 src/main/resources/mapper/BasArmMapper.xml

@@ -11,6 +11,7 @@
        <result column="status" property="status" />
        <result column="sta_no_sou" property="staNoSou" />
        <result column="sorting_line_sou" property="sortingLineSou" />
        <result column="devp_id" property="devpId" />

    </resultMap>


 src/main/webapp/static/js/basArm/basArm.js

@@ -15,18 +15,22 @@
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/basArm/list/auth',
        page: true,
        limit: 15,
        limit: 24,
        limits: [15, 30, 50, 100, 200, 500],
        toolbar: '#toolbar',
        cellMinWidth: 50,
        height: 'full-120',
        cols: [[
            {type: 'checkbox'}
            ,{field: 'id', align: 'center',title: 'ID'}
            ,{field: 'armNo', align: 'center',title: '机械臂编号'}
            ,{field: 'staNo', align: 'center',title: '码垛位'}
            ,{field: 'sortingLine', align: 'center',title: '拆垛位'}
            ,{field: 'status', align: 'center',title: ''}
            // {type: 'checkbox'}
            // ,
            {field: 'id', align: 'center',title: 'ID',hide: true}
            ,{field: 'armNo', align: 'center',title: '机械臂编号',hide: false}
            ,{field: 'staNo', align: 'center',title: '码垛位代号',hide: false}
            ,{field: 'sortingLine', align: 'center',title: '拆垛位代号',hide: false}
            ,{field: 'staNoSou', align: 'center',title: '码垛位',hide: false}
            ,{field: 'sortingLineSou', align: 'center',title: '拆垛位',hide: false}
            ,{field: 'devpId$', align: 'center',title: '楼层',hide: false}
            ,{field: 'status$', align: 'center',title: '状态',hide: false}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120}
        ]],

 src/main/webapp/views/basArm/basArm.html

@@ -17,11 +17,11 @@
        <div class="layui-card-body">
            <div class="layui-form toolbar" id="search-box">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
                        </div>
                    </div>
<!--                    <div class="layui-inline">-->
<!--                        <div class="layui-input-inline">-->
<!--                            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">-->
<!--                        </div>-->
<!--                    </div>-->
                     <div class="layui-inline" style="width: 300px">
                        <div class="layui-input-inline">
                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
@@ -79,23 +79,35 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">码垛位代号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="staNo" placeholder="请输入码垛位代号" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">拆垛位代号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="sortingLine" placeholder="请输入拆垛位代号" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">码垛位: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="staNo" placeholder="请输入码垛位" lay-vertype="tips" lay-verify="required">
                        <input class="layui-input" name="staNoSou" placeholder="请输入码垛位" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">拆垛位: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="sortingLine" placeholder="请输入拆垛位" lay-vertype="tips" lay-verify="required">
                        <input class="layui-input" name="sortingLineSou" placeholder="请输入拆垛位" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="status" placeholder="请输入" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="status" placeholder="请输入" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->

             </div>
        </div>