#

luxiaotao1123

2021-03-04 4e710a595e0687ba0a976d1a8c6d76a39cc1a6bd

#

 src/main/java/zy/cloud/wms/manager/controller/WorkController.java

@@ -69,7 +69,7 @@
    @RequestMapping("/pakout/get")
    @ManagerAuth(memo = "获取出库单")
    public R getPakout(@RequestParam String docNumber) {
        List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", docNumber).eq("wrk_sts", 1));
        List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", docNumber).in("wrk_sts", 1,2));
        if (Cools.isEmpty(pakouts)) {
            return R.parse(BaseRes.EMPTY);
        }

 src/main/java/zy/cloud/wms/manager/service/impl/PakoutServiceImpl.java

@@ -11,6 +11,6 @@

    @Override
    public Boolean stockOutComplete(String wrkNo, String docNum, Long userId) {
        return this.baseMapper.updateWrkSts(wrkNo, docNum, 2, userId)>0;
        return this.baseMapper.updateWrkSts(wrkNo, docNum, 3, userId)>0;
    }
}

 src/main/webapp/views/pda/stockOut.html

@@ -90,7 +90,7 @@
    <div class="layui-btn-container">
        <button id="reset" type="button" class="layui-btn layui-btn-primary" onclick="reset()">重置</button>
        <button id="confirm" type="button" class="layui-btn layui-btn-normal" onclick="pakoutConfirm()" style="margin-left: 20px">拣货确认</button>
        <span id="tips"></span>
        <button id="tips1" style="outline: none;color: white;border-color: white; position: absolute;right: 0;bottom: 0;"></button>
    </div>
</footer>
</body>
@@ -115,6 +115,7 @@
            success: function (res) {
                if (res.code === 200) {
                    if (res.data != null) {
                        $('#pakout-box').html("");
                        pakoutData = [];
                        pakoutData = res.data.pakouts;
                        if (pakoutData != null) {
@@ -128,7 +129,7 @@
                            var html = template(res.data);
                            $('#pakout-box').append(html);
                        }
                        $('#confirm').focus();
                        $('#tips1').focus();
                    }
                } else if (res.code === 201) {
                } else if (res.code === 403) {
@@ -150,6 +151,10 @@

    // 拣货确认
    function pakoutConfirm() {
        if (pakoutData == null || pakoutData.length === 0) {
            tips("请确认单据编号！", true);
            return;
        }
        var docNum = pakoutData[0].docNum;
        if (isEmpty(docNum)) {
            tips("请确认单据编号！", true);
@@ -197,18 +202,18 @@
        layer.msg(msg, {icon: warn?2:1})
    }

    document.onkeyup = function (e) {
        if (window.event)//如果window.event对象存在，就以此事件对象为准
            e = window.event;
        var key = e.charCode || e.keyCode;
        if (key === 115) {
            $("#confirm").focus();
            pakoutConfirm();
        } else if (key === 113) {
            $("#docNum").val("");
            $("#docNum").focus();
        }
    }
    // document.onkeyup = function (e) {
    //     if (window.event)//如果window.event对象存在，就以此事件对象为准
    //         e = window.event;
    //     var key = e.charCode || e.keyCode;
    //     if (key === 115) {
    //         $("#confirm").focus();
    //         pakoutConfirm();
    //     } else if (key === 113) {
    //         $("#docNum").val("");
    //         $("#docNum").focus();
    //     }
    // }
</script>
<script type="text/template" id="pakoutDetlTpl">
    {{#each pakouts}}