agv增加一个新单号防重复 ，增加一个手动呼叫agv

chen.lin

6 天以前 10778ff6207c31641187acb487d4b67c0de59b24

 src/main/webapp/views/task/task.html

@@ -22,14 +22,16 @@
                            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
                        </div>
                    </div>
                     <div class="layui-inline" style="width: 300px">
                    <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">
                            <input class="layui-input layui-laydate-range" name="create_time" type="text"
                                   placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">
                            <input class="layui-input" type="text" name="condition" placeholder="请输入"
                                   autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">&emsp;
@@ -41,23 +43,68 @@
                        </button>
                    </div>
                </div>
                <!-- 呼叫AGV区域 - 暂时注释掉 -->
                <!--
                <div class="layui-form-item" style="margin-top: 10px; padding: 10px; background-color: #f5f5f5; border-radius: 4px;">
                    <div class="layui-inline">
                        <label class="layui-form-label" style="width: 80px;">呼叫AGV：</label>
                        <div class="layui-input-inline" style="width: 120px;">
                            <select id="callAgvType" lay-filter="callAgvType">
                                <option value="manual">手动输入</option>
                                <option value="outbound">起点+出库</option>
                                <option value="inbound">起点+入库</option>
                            </select>
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline" style="width: 150px;">
                            <input class="layui-input" type="text" id="callAgvOrgSite" placeholder="源站点" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline" id="callAgvTarSiteGroup">
                        <div class="layui-input-inline" style="width: 150px;">
                            <input class="layui-input" type="text" id="callAgvTarSite" placeholder="目标站点" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline" id="callAgvTarLocGroup" style="display: none;">
                        <div class="layui-input-inline" style="width: 150px;">
                            <input class="layui-input" type="text" id="callAgvTarLoc" placeholder="目标库位" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline" style="width: 150px;">
                            <input class="layui-input" type="text" id="callAgvBarcode" placeholder="托盘码" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">&emsp;
                        <button class="layui-btn layui-btn-normal" id="callAgvBtn">
                            <i class="layui-icon">&#xe608;</i>呼叫AGV
                        </button>
                    </div>
                </div>
                -->
            </div>
            <table class="layui-hide" id="task" lay-filter="task"></table>
        </div>
    </div>
</div>

<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button>
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">导出</button>
    </div>
</script>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
    {{#if (d.preHave === 'Y' && d.wrkSts === 3) { }}
    <a class="layui-btn layui-btn-primary layui-border-red layui-btn-xs btn-error" lay-event="preHave">先入品</a>
    {{# } }}
    {{#if (d.takeNone === 'Y' && d.wrkSts === 12) { }}
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-error" lay-event="takeNone">空操作</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>
    {{#if (d.ioType === 103) { }}
    <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">拣</a>
    {{# } }}
    {{#if (d.ioType === 107) { }}
    <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>
@@ -66,27 +113,6 @@
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/task/task.js" charset="utf-8"></script>
</body>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">
    <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
        <input name="id" type="hidden">
        <div class="layui-row">
            <div class="layui-col-md12">
                <div class="layui-form-item">
                    <label class="layui-form-label">任务类型： agv  , crn: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="taskType" placeholder="请输入任务类型： agv  , crn">
                    </div>
                </div>

             </div>
        </div>
        <hr class="layui-bg-gray">
        <div class="layui-form-item text-right">
            <button class="layui-btn" lay-filter="editSubmit" lay-submit="">保存</button>
            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
        </div>
    </form>
</script>
</html>