自动化立体仓库 - WMS系统
pang.jiabao
21 小时以前 90f1bff060e0ddca05e9a8e4f2f841d1c6c0a574
手动添加单据时区分单据类型
4个文件已修改
62 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/DocTypeController.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/order/order.html 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/orderPakin/order.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/orderPakout/order.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/DocTypeController.java
@@ -119,6 +119,44 @@
        return R.ok(result);
    }
    // 只查入库单据
    @RequestMapping(value = "/docTypeQueryIn/auth")
    @ManagerAuth
    public R queryIn(String condition) {
        EntityWrapper<DocType> wrapper = new EntityWrapper<>();
        wrapper.like("doc_name", condition);
        wrapper.eq("status", 1);
        wrapper.eq("pakin", 1);
        Page<DocType> page = docTypeService.selectPage(new Page<>(0, 30), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (DocType docType : page.getRecords()) {
            Map<String, Object> map = new HashMap<>();
            map.put("id", docType.getDocId());
            map.put("value", docType.getDocName());
            result.add(map);
        }
        return R.ok(result);
    }
    // 只查出库单据
    @RequestMapping(value = "/docTypeQueryOut/auth")
    @ManagerAuth
    public R queryOut(String condition) {
        EntityWrapper<DocType> wrapper = new EntityWrapper<>();
        wrapper.like("doc_name", condition);
        wrapper.eq("status", 1);
        wrapper.eq("pakout", 1);
        Page<DocType> page = docTypeService.selectPage(new Page<>(0, 30), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (DocType docType : page.getRecords()) {
            Map<String, Object> map = new HashMap<>();
            map.put("id", docType.getDocId());
            map.put("value", docType.getDocName());
            result.add(map);
        }
        return R.ok(result);
    }
    @RequestMapping(value = "/docType/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
src/main/webapp/views/order/order.html
@@ -79,20 +79,20 @@
                        <button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
                            <i class="layui-icon">&#xe615;</i>搜索
                        </button>
                        <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon">&#xe654;</i>添加
                        </button>
<!--                        <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon">&#xe654;</i>添加-->
<!--                        </button>-->
                    </div>
                </div>
            </div>
            <table id="order" lay-filter="order"></table>
        </div>
    </div>
    <div class="layui-card">
        <div class="layui-card-body">
            入库通知单:由ERP提供单据编号、类型、单据时间及物料明细,生成入库作业单,为维护系统高可用,用户可自行添加入库通知单数据,完成独立的入库作业。
            <span class="text-danger">手动添加时,请检查单据编号是否在ERP系统中已存在,避免发生数据错误问题。</span>
        </div>
    </div>
<!--    <div class="layui-card">-->
<!--        <div class="layui-card-body">-->
<!--            入库通知单:由ERP提供单据编号、类型、单据时间及物料明细,生成入库作业单,为维护系统高可用,用户可自行添加入库通知单数据,完成独立的入库作业。-->
<!--            <span class="text-danger">手动添加时,请检查单据编号是否在ERP系统中已存在,避免发生数据错误问题。</span>-->
<!--        </div>-->
<!--    </div>-->
</div>
<!-- 表格操作列 -->
<script type="text/html" id="operate">
src/main/webapp/views/orderPakin/order.html
@@ -150,8 +150,8 @@
                <input class="layui-input" name="docType" placeholder="请输入单据类型" style="display: none">
                <input id="docType$" name="docType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入单据类型" onfocus=this.blur() lay-verType="tips" lay-verify="required">
                <div class="cool-auto-complete-window">
                    <input class="cool-auto-complete-window-input" data-key="docTypeQueryBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">
                    <select class="cool-auto-complete-window-select" data-key="docTypeQueryBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                    <input class="cool-auto-complete-window-input" data-key="docTypeQueryInBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">
                    <select class="cool-auto-complete-window-select" data-key="docTypeQueryInBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                    </select>
                </div>
            </div>
src/main/webapp/views/orderPakout/order.html
@@ -150,8 +150,8 @@
                <input class="layui-input" name="docType" placeholder="请输入单据类型" style="display: none">
                <input id="docType$" name="docType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入单据类型" onfocus=this.blur() lay-verType="tips" lay-verify="required">
                <div class="cool-auto-complete-window">
                    <input class="cool-auto-complete-window-input" data-key="docTypeQueryBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">
                    <select class="cool-auto-complete-window-select" data-key="docTypeQueryBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                    <input class="cool-auto-complete-window-input" data-key="docTypeQueryOutBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">
                    <select class="cool-auto-complete-window-select" data-key="docTypeQueryOutBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                    </select>
                </div>
            </div>