自动化立体仓库 - WMS系统
#
zjj
2024-12-09 9e50037f45269812b3f343de22c56db2fb9d89a1
#
4个文件已修改
36 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/inventoryCheckOrder/inventoryCheakOrderTable.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/inventoryCheckOrder/inventoryCheckOrder.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
@@ -121,8 +121,20 @@
    @ManagerAuth
    public R add(@RequestBody InventoryCheckOrder inventoryCheckOrder) {
        String orderNo = inventoryCheckOrder.getOrderNo();
        long time = new Date().getTime();
        if (Cools.isEmpty(orderNo)) {
            return R.parse("单据编号不能为空:" + orderNo);
            switch (inventoryCheckOrder.getArea()){
                case "堆垛机":
                    orderNo = "DDJ"+time;
                    break;
                case "四向库":
                    orderNo = "SXK"+time;
                    break;
                case "CTU":
                    orderNo = "CTU"+time;
                    break;
            }
            inventoryCheckOrder.setOrderNo(orderNo);
        }
        int count = inventoryCheckOrderService.selectCount(new EntityWrapper<InventoryCheckOrder>().eq("order_no", orderNo));
src/main/webapp/static/js/inventoryCheckOrder/inventoryCheakOrderTable.js
@@ -42,7 +42,7 @@
            // {type: 'numbers', title: '#'},
            {field: 'createTime$', title: '日期'},
            {field: 'orderNo', title: '单据编号', align: 'center'},
            {field: 'status', title: '状态', align: 'center'}
            {field: 'status$', title: '状态', align: 'center'}
        ]],
        done: function (res, curr, count) {
            $('#dictTable+.layui-table-view .layui-table-body tbody>tr:first').trigger('click');
src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js
@@ -91,13 +91,7 @@
    $('#showFormBtn').on('click', function () {
        // 弹框内容
        var content = `
                <form class="layui-form" id="billForm" style="padding: 20px;">
                    <div class="layui-form-item" style="margin-bottom: 20px;">
                        <label class="layui-form-label" style="width: 80px; font-size: 14px; text-align: left">单据编号:</label>
                        <div class="layui-input-block" style="margin-left: 110px;">
                            <input type="text" id="billNumber" class="layui-input" placeholder="请输入单据编号" style="height: 38px; font-size: 14px; padding: 0 15px; width: 100%;" required>
                        </div>
                    </div>
                <form class="layui-form" id="billForm" style="padding: 20px;">
                    <div class="layui-form-item" style="margin-bottom: 20px;">
                        <label class="layui-form-label" style="width: 80px; font-size: 14px;">库区:</label>
                        <div class="layui-input-block" style="margin-left: 110px;">
@@ -129,11 +123,6 @@
                    var billNumber = $('#billNumber').val();
                    var warehouseArea = $('#warehouseArea').val();
                    // 表单验证
                    if (!billNumber) {
                        layer.msg('请输入单据编号');
                        return;
                    }
                    // 发送 Ajax 请求到后端
                    $.ajax({
@@ -213,6 +202,7 @@
            });
        }
    });
    /* 表格2工具条点击事件 */
src/main/webapp/views/inventoryCheckOrder/inventoryCheckOrder.html
@@ -81,7 +81,8 @@
                                <button class="layui-btn icon-btn" lay-filter="originTbReset" lay-submit>
                                    <i class="layui-icon">&#xe666;</i>重置
                                </button>
                                <button id="showFormBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon">&#xe654;</i>添加</button>
                            </div>
                        </div>
                    </form>
@@ -150,6 +151,9 @@
    <!--    </div>-->
<!--    <button class="layui-btn layui-btn-sm layui-btn-danger btn-pakoutPreview" id="btn-pakoutPreview" lay-event="submitERP"><i class="layui-icon">&#xe681;</i>提交ERP</button>-->
    <button id="submitERP" class="layui-btn icon-btn btn-add" lay-event="submitERP"><i class="layui-icon">&#xe681;</i>提交ERP</button>
    <button id="showFormBtn" class="layui-btn icon-btn"  lay-submit>
        <i class="layui-icon">&#xe654;</i>添加单据
    </button>
</script>
<!-- 行工具栏 -->