页面优化

zhangc

2025-01-21 7fba108547c985f3a9e1736b32dc028bad3b63a1

页面优化

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

@@ -1032,13 +1032,13 @@
            } else {
                odNo += "_O";
            }

            Date date = new Date();
            Order order = orderService.selectByNo(odNo);
            if (null == order) {
                order = new Order(
                        String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                        odNo,    // 订单编号
                        null,    // 单据日期
                        DateUtils.convert(date),    // 单据日期
                        docType.getDocId(),    // 单据类型
                        null,    // 项目编号
                        null,    //
@@ -1121,7 +1121,7 @@
                    order2 = new Order(
                            String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                            dbUuid,    // 订单编号
                            null,    // 单据日期
                            DateUtils.convert(date),    // 单据日期
                            33L,    // 单据类型
                            null,    // 项目编号
                            null,    //
@@ -1199,7 +1199,7 @@
                        order3 = new Order(
                                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                                dbUuid,    // 订单编号
                                null,    // 单据日期
                                DateUtils.convert(date),    // 单据日期
                                35L,    // 单据类型
                                null,    // 项目编号
                                null,    //

 src/main/java/com/zy/common/web/BaseController.java

@@ -140,13 +140,16 @@
                continue;
            }
            String column = null;
            if (field.isAnnotationPresent(TableField.class) && field.getAnnotation(TableField.class).exist()) {
                column = field.getAnnotation(TableField.class).value();
            if (field.isAnnotationPresent(TableField.class)) {
                if (field.getAnnotation(TableField.class).exist()) {
                    column = field.getAnnotation(TableField.class).value();
                }
            } else {
                if (Cools.isEmpty(column)) {
                    column = field.getName();
                }
            }
            if (Cools.isEmpty(column)) {
                column = field.getName();
            }
            if (!set.contains(column)) {
            if (!Cools.isEmpty(column) && !set.contains(column)) {
                columns.add(column);
            }
        }

 src/main/webapp/static/js/agvBasDevp/basDevp.js

@@ -21,7 +21,7 @@
            {type: 'checkbox', fixed: 'left'}
//            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
            ,{field: 'devNo', align: 'center',sort:true,title: '接驳位号',width:150}
            // ,{field: 'decDesc', align: 'center',title: '设备描述'}
             ,{field: 'decDesc', align: 'center',title: '名称'}
            // ,{field: 'devMk', align: 'center',title: '备注'}
            ,{field: 'inEnable', align: 'center',title: '可入', templet:function(row){
                    var html = "<input value='inEnable' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";

 src/main/webapp/views/agvBasDevp/basDevp.html

@@ -21,6 +21,16 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="dec_desc" placeholder="名称" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="barcode" placeholder="货架码" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="floor" placeholder="楼层" autocomplete="off">
        </div>
    </div>

 src/main/webapp/views/agvBasDevp/basDevp_detail.html

@@ -22,6 +22,12 @@
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">名称：</label>
            <div class="layui-input-inline">
                <input id="decDesc" class="layui-input" type="text"  >
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label"><span class="not-null">*</span>楼：</label>
            <div class="layui-input-inline">
                <input id="floor" class="layui-input" type="text" lay-verify="required|number">

 src/main/webapp/views/agvLocMast/locMast.html

@@ -30,6 +30,11 @@
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="barcode" placeholder="货架码" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline cool-auto-complete">
            <input id="locSts" class="layui-input" type="text" style="display: none" name="loc_sts">
            <input id="locSts$" placeholder="库位状态" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" onfocus=this.blur()>

 src/main/webapp/views/home/navigation.html

@@ -121,10 +121,10 @@
    <a class="list fn_1 moveUpDownFla1" ew-href="order/order.html?resourceId=40517">
        <p>单据管理</p>
    </a>
    <a class="list fn_2 moveUpDownFla2" ew-href="wrkMast/wrkMast.html?resourceId=214">
    <a class="list fn_2 moveUpDownFla2" ew-href="agvWrkMast/wrkMast.html?resourceId=70628">
        <p>运行任务</p>
    </a>
    <a class="list fn_3 moveUpDownFla1" ew-href="stoMan/stoQue.html?resourceId=10276">
    <a class="list fn_3 moveUpDownFla1" ew-href="agvLocDetl/locDetl.html?resourceId=80637">
        <p>库存明细</p>
    </a>
</div>

 src/main/webapp/views/orderView/orderView.html

@@ -122,7 +122,8 @@
    </div>
    <div class="layui-card">
        <div class="layui-card-body">
            <div class="text-danger">手动删除或完结时，是删除或完结明细对应的订单，而不是单条订单明细。</div>
            单据：由ERP提供单据编号、类型、单据时间及物料明细，生成入库作业单，为维护系统高可用，用户可自行添加入库通知单数据，完成独立的入库作业。
            <span class="text-danger">手动删除或完结时，是删除或完结明细对应的订单，而不是单条订单明细。</span>
        </div>
    </div>
</div>