#

luxiaotao1123

2020-07-10 3b2a65f6119ea98290387ef86eea1b01066a404e

#

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

@@ -109,6 +109,9 @@
        } else if (type == 2) {
            workService.cancelWrkMast(workNo, getUserId());
            return R.ok("工作档已取消");
        } else if (type == 3) {
            workService.pickWrkMast(workNo, getUserId());
            return R.ok("工作档已拣料入库");
        }
        return R.ok();
    }

 src/main/java/com/zy/asrs/service/WorkService.java

@@ -65,4 +65,9 @@
     * 手动取消工作档
     */
    void cancelWrkMast(String workNo, Long userId);

    /**
     * 手动拣料入库工作档
     */
    void pickWrkMast(String workNo, Long userId);
}

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

@@ -644,4 +644,9 @@
        }
    }

    @Override
    public void pickWrkMast(String workNo, Long userId) {

    }

}

 src/main/webapp/static/js/wrkMast/wrkMast.js

@@ -309,6 +309,16 @@
                    layer.closeAll();
                });
                break;
            //  拣料入库
            case 'pick':
                layer.confirm('拣料入库该笔工作档？', {title: '工作号：'+data.wrkNo, shadeClose: true}, function(){
                    http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:3}, function (res) {
                        $(".layui-laypage-btn")[0].click();
                        layer.msg(data.wrkNo + res.msg);
                    })
                    layer.closeAll();
                });
                break;
            // 详情
            case 'detail':
                layer.open({

 src/main/webapp/views/wrkMast/wrkMast.html

@@ -25,6 +25,9 @@
        .btn-cancel {
            display: none;
        }
        .btn-pick {
            display: none;
        }

        /*明细表*/
        #detlTable {
@@ -110,9 +113,10 @@
</div>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-sm btn-detlShow" lay-event="detlShow">明细</a>
    <a class="layui-btn layui-btn-danger layui-btn-sm btn-complete" lay-event="complete">完成</a>
    <a class="layui-btn layui-btn-primary layui-btn-sm btn-cancel" lay-event="cancel">取消</a>
    <a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">明细</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-complete" lay-event="complete">完成</a>
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel">取消</a>
    <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">拣</a>
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>