luxiaotao1123
2021-04-23 43a40046a19a5e5c1b443017ce31ece34e1d7460
#批量审核盘点记录
6个文件已修改
49 ■■■■■ 已修改文件
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/controller/WorkController.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/entity/Check.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/check/check.js 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/check/check.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
@@ -770,12 +770,13 @@
                    }
                    for (String number : existNumbers) {
                        Order order = orderService.selectByOrderNo(number);
                        if (order != null) {
                        if (order.getSettle() != 3L && order.getSettle() != 5L) {
                            if (!orderService.updateSettle(number, 5L)) {
//                            throw new CoolException("修改订单状态失败");
                            }
                        }
                        }
                    }
                }
src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -159,6 +159,18 @@
        return workService.stockCheckAuditing(checkId, getUserId());
    }
    @RequestMapping("/stock/checks/auditing")
    @ManagerAuth(memo = "盘点记录批量审核")
    public R checksAuditing(@RequestParam(value = "checkIds[]") Long[] checkIds) {
        int success = 0;
        for (Long checkId : checkIds) {
            R r = workService.stockCheckAuditing(checkId, getUserId());
            if (String.valueOf(r.get("code")).equals("200")) {
                success ++;
            }
        }
        return R.ok("审核成功数量:" + success);
    }
    /******************************************************************************************************/
src/main/java/zy/cloud/wms/manager/entity/Check.java
@@ -116,7 +116,7 @@
    /**
     * 状态 1: 正常  0: 禁用  
     */
    @ApiModelProperty(value= "状态 1: 正常  0: 禁用  ")
    @ApiModelProperty(value= "状态 1: 待审核  2: 已通过  0: 取消  ")
    private Integer status;
    /**
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -708,7 +708,7 @@
    @Transactional
    public R stockCheckAuditing(Long checkId, Long userId) {
        Check check = checkService.selectById(checkId);
        if (null == check) {
        if (null == check || check.getStatus() != 1) {
            return R.error("盘点记录已失效");
        }
        Date now = new Date();
src/main/webapp/static/js/check/check.js
@@ -102,6 +102,34 @@
    table.on('toolbar(check)', function (obj) {
        var checkStatus = table.checkStatus(obj.config.id);
        switch(obj.event) {
            // 批量审核
            case 'batchAuditing':
                var checkIds = checkStatus.data.map(function (d) {
                    return d.id;
                });
                if (checkIds.length === 0) {
                    layer.msg('请选择数据', {icon: 3});
                } else {
                    var index = layer.load(1, {shade: [0.1,'#000']});
                    $.ajax({
                        url: baseUrl+"/work/stock/checks/auditing",
                        headers: {'token': localStorage.getItem('token')},
                        data: {checkIds: checkIds},
                        method: 'POST',
                        success: function (res) {
                            if (res.code === 200) {
                                layer.msg(res.msg, {icon: 1})
                                $(".layui-laypage-btn")[0].click();
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg, {icon: 2})
                            }
                            layer.close(index);
                        }
                    });
                }
                break;
            case 'addData':
                layer.open({
                    type: 2,
src/main/webapp/views/check/check.html
@@ -72,7 +72,7 @@
</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-normal" id="btn-add" lay-event="batchAuditing">批量审核</button>
        <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">删除</button>
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">导出</button>
    </div>