#

LSH

2023-12-15 b9eee33b8d3f3adf57fd40a9ff225c6717d20158

#

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

@@ -44,6 +44,8 @@
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        wrapper.orderBy("status",true);
        wrapper.orderBy("create_time",false);
        return R.ok(locInPrintMatService.selectPage(new Page<>(curr, limit), wrapper));
    }


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

@@ -290,6 +290,10 @@
            print.setAnfme(locInPrintMat.getAnfme().toString());
            print.setMemo(locInPrintMat.getMemo());
            res.add(print);
            locInPrintMat.setUpdateTime(new Date());
            locInPrintMat.setUpdateBy(getUserId());
            locInPrintMat.setStatus(2);
            locInPrintMatService.updateById(locInPrintMat);
        }
        return R.ok().add(res);
    }

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

@@ -133,8 +133,8 @@
        this.uuid = now.toString();
        this.createTime = now;
        this.createBy = userId;
        this.updateTime = now;
        this.updateBy = userId;
//        this.updateTime = now;
//        this.updateBy = userId;
        this.matnr = matnr;
        this.batch = batch;
        this.anfme = anfme;

 src/main/webapp/static/js/locInPrintMat/locInPrintMat.js

@@ -30,10 +30,10 @@
            ,{field: 'anfme', align: 'center',title: '重量(kg)', width:100,hide: false}
            ,{field: 'locNo', align: 'center',title: '库位号', width:120,hide: false}
            ,{field: 'maktx', align: 'center',title: '商品名称',hide: false}
            ,{field: 'createTime$', align: 'center',title: '添加时间',hide: true}
            ,{field: 'createBy$', align: 'center',title: '添加人员', width:100,hide: true}
            ,{field: 'updateTime$', align: 'center',title: '修改时间', width:120,hide: false}
            ,{field: 'updateBy$', align: 'center',title: '修改人员',hide: false}
            ,{field: 'createTime$', align: 'center',title: '入库时间', width:120,hide: false}
            ,{field: 'createBy$', align: 'center',title: '入库人员', width:100,hide: false}
            ,{field: 'updateTime$', align: 'center',title: '打印时间', width:120,hide: false}
            ,{field: 'updateBy$', align: 'center',title: '打印人员',hide: false}
            ,{field: 'memo', align: 'center',title: '备注',hide: false}

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

 src/main/webapp/views/locInPrintMat/locInPrintMat.html

@@ -62,10 +62,20 @@
        <div class="layui-card-body">
            <div class="layui-form toolbar" id="search-box">
                <div class="layui-form-item">
<!--                    <div class="layui-inline">-->
<!--                        <label class="layui-form-label">编号:</label>-->
<!--                        <div class="layui-input-inline">-->
<!--                            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">-->
<!--                        </div>-->
<!--                    </div>-->
                    <div class="layui-inline">
                        <label class="layui-form-label">编号:</label>
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
                        <label class="layui-form-label">打印情况: </label>
                        <div class="layui-input-block">
                            <select name="status">
                                <option value="">请选择打印情况</option>
                                <option value="1">未打印</option>
                                <option value="2">已打印</option>
                            </select>
                        </div>
                    </div>
                    <div class="layui-inline">&emsp;