自动化立体仓库 - WMS系统
野心家
2025-05-28 704f65c54fec25aed30e6bf98bc763056dde6dc2
合格
4个文件已修改
258 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/LocDetlController.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/locDetl/locDetl.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/locDetl/locDetl.html 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/locDetl/locDetl_detail.html 236 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -153,12 +153,18 @@
    @RequestMapping(value = "/locDetl/update/auth")
    @ManagerAuth(memo = "库位明细修改")
    public R update(LocDetl locDetl){
        if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){
        if (Cools.isEmpty(locDetl) || null==locDetl.getBatch()){
            return R.error();
        }
        locDetl.setModiUser(getUserId());
        locDetl.setModiTime(new Date());
        locDetlService.updateById(locDetl);
        LocDetl locDetl1 = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locDetl.getLocNo()).eq("batch", locDetl.getBatch()));
        if (Cools.isEmpty(locDetl1) ){
            return R.error();
        }
        locDetl1.setModiUser(getUserId());
        locDetl1.setModiTime(new Date());
        locDetl1.setDanger(locDetl.getDanger());
        locDetlService.update(locDetl1,new EntityWrapper<LocDetl>().eq("loc_no", locDetl.getLocNo()).eq("batch", locDetl.getBatch()));
//        locDetlService.updateById(locDetl1);
        return R.ok();
    }
src/main/webapp/static/js/locDetl/locDetl.js
@@ -41,6 +41,8 @@
    // cols.push.apply(cols, detlCols);
    cols.push({field: 'modiUser$', align: 'center',title: '修改人员',hide: true}
        ,{field: 'modiTime$', align: 'center',title: '修改时间'}
        ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:100}
    )
    return cols;
}
@@ -391,6 +393,8 @@
        var data = {
//            id: $('#id').val(),
            locNo: $('#locNo').val(),
            batch: $('#batch').val(),
            danger: $('#danger').val(),
            matnr: $('#matnr').val(),
            lgnum: $('#lgnum').val(),
            tbnum: $('#tbnum').val(),
src/main/webapp/views/locDetl/locDetl.html
@@ -76,7 +76,9 @@
</script>
<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">详情</a>
<!--    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">详情</a>-->
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">编辑</a>
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
src/main/webapp/views/locDetl/locDetl_detail.html
@@ -15,6 +15,8 @@
<!-- 详情 -->
<div id="data-detail" class="layer_self_wrap">
    <form id="detail" class="layui-form">
    <!--
        <div class="layui-inline"  style="display: none">
            <label class="layui-form-label"><span class="not-null">*</span>编  号:</label>
@@ -23,126 +25,142 @@
            </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 cool-auto-complete">-->
<!--                <input id="locNo" class="layui-input" type="text" onkeyup="check(this.id, 'locDetl')" lay-verify="required"  style="display: none">-->
<!--                <input id="locNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入..." onfocus=this.blur()>-->
<!--                <div class="cool-auto-complete-window">-->
<!--                    <input class="cool-auto-complete-window-input" data-key="locMastQueryBylocNo" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
<!--                    <select class="cool-auto-complete-window-select" data-key="locMastQueryBylocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
<!--                    </select>-->
<!--                </div>-->
<!--            </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="matnr" class="layui-input" type="text" onkeyup="check(this.id, 'locDetl')" lay-verify="required" >-->
<!--            </div>-->
<!--        </div>-->
<!--        <div class="layui-inline"  style="width:31%;display: none">-->
<!--            <label class="layui-form-label">仓 库 号:</label>-->
<!--            <div class="layui-input-inline">-->
<!--                <input id="lgnum" class="layui-input" type="text" >-->
<!--            </div>-->
<!--        </div>-->
<!--        <div class="layui-inline"  style="width:31%;display: none">-->
<!--            <label class="layui-form-label" style="font-size: x-small">转储请求编号:</label>-->
<!--            <div class="layui-input-inline">-->
<!--                <input id="tbnum" class="layui-input" type="text" lay-verify="number" >-->
<!--            </div>-->
<!--        </div>-->
<!--        <div class="layui-inline"  style="width:31%;display: none">-->
<!--            <label class="layui-form-label">行 项 目:</label>-->
<!--            <div class="layui-input-inline">-->
<!--                <input id="tbpos" class="layui-input" type="text" lay-verify="number" >-->
<!--            </div>-->
<!--        </div>-->
<!--        <div class="layui-inline"  style="width:31%;display: none">-->
<!--            <label class="layui-form-label" style="font-size: x-small">物料标签ID:</label>-->
<!--            <div class="layui-input-inline">-->
<!--                <input id="zmatid" 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 cool-auto-complete">
                <input id="locNo" class="layui-input" type="text" onkeyup="check(this.id, 'locDetl')" lay-verify="required"  style="display: none">
                <input id="locNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入..." onfocus=this.blur()>
                <div class="cool-auto-complete-window">
                    <input class="cool-auto-complete-window-input" data-key="locMastQueryBylocNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
                    <select class="cool-auto-complete-window-select" data-key="locMastQueryBylocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                    </select>
                </div>
            <label class="layui-form-label">库位号:</label>
            <div class="layui-input-inline">
                <input id="locNo" class="layui-input" type="text" readonly>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label"><span class="not-null">*</span>物  料:</label>
            <label class="layui-form-label">箱号:</label>
            <div class="layui-input-inline">
                <input id="matnr" class="layui-input" type="text" onkeyup="check(this.id, 'locDetl')" lay-verify="required" >
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">仓 库 号:</label>
            <div class="layui-input-inline">
                <input id="lgnum" class="layui-input" type="text" >
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label" style="font-size: x-small">转储请求编号:</label>
            <div class="layui-input-inline">
                <input id="tbnum" class="layui-input" type="text" lay-verify="number" >
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">行 项 目:</label>
            <div class="layui-input-inline">
                <input id="tbpos" class="layui-input" type="text" lay-verify="number" >
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label" style="font-size: x-small">物料标签ID:</label>
            <div class="layui-input-inline">
                <input id="zmatid" class="layui-input" type="text" >
                <input id="batch" class="layui-input" type="text" readonly>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">物料描述:</label>
            <label class="layui-form-label"><span class="not-null">*</span>待  判:</label>
            <div class="layui-input-inline">
                <input id="maktx" class="layui-input" type="text">
                <select id="danger" lay-verify="number">
                    <option value="0" style="display: none">待判</option>
                    <option value="1">合格</option>
                    <option value="2">不合格</option>
                </select>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">工  厂:</label>
            <div class="layui-input-inline">
                <input id="werks" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">数  量:</label>
            <div class="layui-input-inline">
                <input id="anfme" class="layui-input" type="text" lay-verify="number" >
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">单  位:</label>
            <div class="layui-input-inline">
                <input id="altme" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">托盘条码:</label>
            <div class="layui-input-inline">
                <input id="zpallet" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">用户ID:</label>
            <div class="layui-input-inline">
                <input id="bname" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">备  注:</label>
            <div class="layui-input-inline">
                <input id="memo" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">修改人员:</label>
            <div class="layui-input-inline cool-auto-complete">
                <input id="modiUser" class="layui-input" type="text" lay-verify="number"  style="display: none">
                <input id="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入..." onfocus=this.blur()>
                <div class="cool-auto-complete-window">
                    <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
                    <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                    </select>
                </div>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">修改时间:</label>
            <div class="layui-input-inline">
                <input id="modiTime$" class="layui-input" type="text" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">创 建 者:</label>
            <div class="layui-input-inline cool-auto-complete">
                <input id="appeUser" class="layui-input" type="text" lay-verify="number"  style="display: none">
                <input id="appeUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入..." onfocus=this.blur()>
                <div class="cool-auto-complete-window">
                    <input class="cool-auto-complete-window-input" data-key="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
                    <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                    </select>
                </div>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">添加时间:</label>
            <div class="layui-input-inline">
                <input id="appeTime$" class="layui-input" type="text" autocomplete="off">
            </div>
        </div>
<!--        <div class="layui-inline"  style="width:31%;display: none">-->
<!--            <label class="layui-form-label">工  厂:</label>-->
<!--            <div class="layui-input-inline">-->
<!--                <input id="werks" class="layui-input" type="text">-->
<!--            </div>-->
<!--        </div>-->
<!--        <div class="layui-inline"  style="width:31%;">-->
<!--            <label class="layui-form-label">数  量:</label>-->
<!--            <div class="layui-input-inline">-->
<!--                <input id="anfme" class="layui-input" type="text" lay-verify="number" >-->
<!--            </div>-->
<!--        </div>-->
<!--        <div class="layui-inline"  style="width:31%;">-->
<!--            <label class="layui-form-label">单  位:</label>-->
<!--            <div class="layui-input-inline">-->
<!--                <input id="altme" class="layui-input" type="text">-->
<!--            </div>-->
<!--        </div>-->
<!--        <div class="layui-inline"  style="width:31%;">-->
<!--            <label class="layui-form-label">托盘条码:</label>-->
<!--            <div class="layui-input-inline">-->
<!--                <input id="zpallet" class="layui-input" type="text">-->
<!--            </div>-->
<!--        </div>-->
<!--        <div class="layui-inline"  style="width:31%;display: none">-->
<!--            <label class="layui-form-label">用户ID:</label>-->
<!--            <div class="layui-input-inline">-->
<!--                <input id="bname" class="layui-input" type="text">-->
<!--            </div>-->
<!--        </div>-->
<!--        <div class="layui-inline"  style="width:31%;">-->
<!--            <label class="layui-form-label">备  注:</label>-->
<!--            <div class="layui-input-inline">-->
<!--                <input id="memo" class="layui-input" type="text">-->
<!--            </div>-->
<!--        </div>-->
<!--        <div class="layui-inline"  style="width:31%;display: none">-->
<!--            <label class="layui-form-label">修改人员:</label>-->
<!--            <div class="layui-input-inline cool-auto-complete">-->
<!--                <input id="modiUser" class="layui-input" type="text" lay-verify="number"  style="display: none">-->
<!--                <input id="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入..." onfocus=this.blur()>-->
<!--                <div class="cool-auto-complete-window">-->
<!--                    <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
<!--                    <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
<!--                    </select>-->
<!--                </div>-->
<!--            </div>-->
<!--        </div>-->
<!--        <div class="layui-inline"  style="width:31%;display: none">-->
<!--            <label class="layui-form-label">修改时间:</label>-->
<!--            <div class="layui-input-inline">-->
<!--                <input id="modiTime$" class="layui-input" type="text" autocomplete="off">-->
<!--            </div>-->
<!--        </div>-->
<!--        <div class="layui-inline"  style="width:31%;display: none">-->
<!--            <label class="layui-form-label">创 建 者:</label>-->
<!--            <div class="layui-input-inline cool-auto-complete">-->
<!--                <input id="appeUser" class="layui-input" type="text" lay-verify="number"  style="display: none">-->
<!--                <input id="appeUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入..." onfocus=this.blur()>-->
<!--                <div class="cool-auto-complete-window">-->
<!--                    <input class="cool-auto-complete-window-input" data-key="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
<!--                    <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
<!--                    </select>-->
<!--                </div>-->
<!--            </div>-->
<!--        </div>-->
<!--        <div class="layui-inline"  style="width:31%;display: none">-->
<!--            <label class="layui-form-label">添加时间:</label>-->
<!--            <div class="layui-input-inline">-->
<!--                <input id="appeTime$" class="layui-input" type="text" autocomplete="off">-->
<!--            </div>-->
<!--        </div>-->
        <hr class="layui-bg-gray">