入出库日志筛选 入库无需校验

zyx

2024-03-04 e0004817f2edb903fd9707b194ba8db2429e33ae

入出库日志筛选
入库无需校验

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

@@ -496,7 +496,7 @@
        if ((Cools.isEmpty(pla))){
            return R.error("该包物料未录入，无法查询到相关信息");
        }
        if(!Cools.eq(pla.getStatus(), GlobleParameter.PLA_STATUS_0) && type != 2){
        if(!(Cools.eq(pla.getStatus(), GlobleParameter.PLA_STATUS_0) || Cools.eq(pla.getStatus(), GlobleParameter.PLA_STATUS_00)) && type != 2){
            return R.error("该包物料不为待入库状态，无法进行入库操作");
        }
        return R.ok(pla);

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -1213,7 +1213,7 @@
            throw new CoolException("系统未检测到该包物料信息，请重新录入");
        }

        if(!pla.getStatus().equals(GlobleParameter.PLA_STATUS_0)){
        if(!pla.getStatus().equals(GlobleParameter.PLA_STATUS_0) && !pla.getStatus().equals(GlobleParameter.PLA_STATUS_00)){
            throw new CoolException("该物料状态不为待入库，无法入库");
        }


 src/main/webapp/static/js/pla/plaDetl.js

@@ -120,7 +120,7 @@
        },
        //height: 'full',
        limit: 16,
        limits: [ 50, 100, 200, 500,2000,5000,10000],
        limits: [16, 50, 100, 200, 500,2000,5000,10000],
        even: true,
        toolbar: '#toolbar',
        cellMinWidth: 50,

 src/main/webapp/static/js/saasLog/saasLog.js

@@ -5,9 +5,16 @@
    var table = layui.table;
    var $ = layui.jquery;
    var layer = layui.layer;
    var layDate = layui.laydate;
    var form = layui.form;
    var admin = layui.admin;
    var laydate = layui.laydate;

    // 日期时间范围
    laydate.render({
        elem: '#ID-laydate-range-datetime',
        type: 'datetime',
        range: true
    });

    // 数据渲染
    tableIns = table.render({
@@ -15,13 +22,14 @@
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/saasLog/list/auth',
        page: true,
        totalRow: true, // 开启合计行
        limit: 15,
        limits: [15, 30, 50, 100, 200, 500],
        // toolbar: '#toolbar',
        cellMinWidth: 50,
        height: 'full-120',
        cols: [[
            {type: 'checkbox'}
             //{type: 'checkbox'}
            ,{field: 'id', align: 'center',title: 'id', hide:true}
            ,{field: 'locNo', align: 'center',title: '库位'}
            ,{field: 'type$', align: 'center',title: '操作类型'}
@@ -31,11 +39,10 @@
            ,{field: 'targetLocNo', align: 'center',title: '目标库位'}
            ,{field: 'owner', align: 'center',title: '主体'}
            ,{field: 'workshop', align: 'center',title: '车间'}
            ,{field: 'anfme', align: 'center',title: '数量'}
            ,{field: 'anfme', align: 'center',title: '数量',totalRow:true}
            // ,{field: 'createByName', align: 'center',title: '操作人'}
            ,{field: 'ioTime$', align: 'center',title: '操作时间'}
            ,{field: 'createBy', align: 'center',title: '', hide:true}


        ]],
        request: {

 src/main/webapp/views/saasLog/saasLog.html

@@ -18,9 +18,36 @@
            <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">
                            <select name="type">
                                <option value="">操作类型</option>
                                <option value="0">入库</option>
                                <option value="1">出库</option>
                                <option value="2">移库</option>
                            </select>
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="loc_no" placeholder="库位" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="matnr" placeholder="牌号" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="workshop" 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">-->
                        <!--            </div>-->
                        <div class="layui-input-inline" style="width: 300px">
                            <input type="text" class="layui-input" name="io_time" id="ID-laydate-range-datetime" placeholder="起始时间 - 终止时间">
                        </div>
                    </div>
                    <div class="layui-inline">&emsp;