自动化立体仓库 - WMS系统
#
luxiaotao1123
2021-08-27 9468f9216cb9a72af52d5a51e658b5a0b5dc92d4
#
3个文件已修改
56 ■■■■ 已修改文件
src/main/java/com/zy/ints/controller/WaitMatinController.java 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/waitMatin/waitMatin.js 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/waitMatin/waitMatin.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/ints/controller/WaitMatinController.java
@@ -146,14 +146,33 @@
        return R.ok("添加成功");
    }
    @RequestMapping(value = "/waitMatin/update/auth")
    @RequestMapping(value = "/waitMatin/modify/auth")
    @ManagerAuth
    public R update(WaitMatin waitMatin){
        if (Cools.isEmpty(waitMatin) || null==waitMatin.getSeqNo()){
    @Transactional
    public R update(@RequestBody List<WaitMatin> waitMatins){
        if (Cools.isEmpty(waitMatins)) {
            return R.parse(BaseRes.PARAM);
        }
        Date now = new Date();
        List<WaitMatin> oldWaitMatin = waitMatinService.selectList(new EntityWrapper<WaitMatin>().eq("bill_no", waitMatins.get(0).getBillNo()));
        Date appeTime = oldWaitMatin!=null?oldWaitMatin.get(0).getAppeTime():now;
        Long appeUser = oldWaitMatin!=null?oldWaitMatin.get(0).getAppeUser():getUserId();
        if (!waitMatinService.delete(new EntityWrapper<WaitMatin>().eq("bill_no", waitMatins.get(0).getBillNo()))) {
            return R.error();
        }
        waitMatinService.updateById(waitMatin);
        return R.ok();
        int i = 1;
        for (WaitMatin waitMatin : waitMatins) {
            waitMatin.setSeqNo(i);
            waitMatin.setAppeTime(appeTime);
            waitMatin.setAppeUser(appeUser);
            waitMatin.setModiTime(now);
            waitMatin.setModiUser(getUserId());
            if (!waitMatinService.insert(waitMatin)) {
                throw new CoolException("修改单据明细失败");
            }
            i++;
        }
        return R.ok("修改成功");
    }
    @RequestMapping(value = "/waitMatin/delete/auth")
src/main/webapp/static/js/waitMatin/waitMatin.js
@@ -133,11 +133,15 @@
            content: $('#editDialog').html(),
            area: '700px',
            success: function (layero, dIndex) {
                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                var url = expTpe ? '../../json/ok.json' : '../../json/ok.json';
                var isExpAdd = !expTpe;
                // 回显数据
                form.val('editForm', expTpe);
                if (expTpe) {
                    $('#billNo').attr("disabled", "disabled");
                }
                // 表单提交事件
                form.on('submit(waitMatinEditSubmit)', function (data) {
                    // 组装数据
@@ -183,6 +187,27 @@
                                }
                            }
                        })
                    } else {
                        layer.load(2);
                        $.ajax({
                            url: baseUrl+"/waitMatin/modify/auth",
                            headers: {'token': localStorage.getItem('token')},
                            data: JSON.stringify(param),
                            contentType:'application/json;charset=UTF-8',
                            method: 'POST',
                            success: function (res) {
                                layer.closeAll('loading');
                                if (res.code === 200){
                                    layer.close(dIndex);
                                    insTb.reload({page: {curr: 1}});
                                    layer.msg(res.msg, {icon: 1});
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                }else {
                                    layer.msg(res.msg, {icon: 2});
                                }
                            }
                        })
                    }
                    return false;
                });
src/main/webapp/views/waitMatin/waitMatin.html
@@ -92,7 +92,7 @@
        <div class="layui-form-item">
            <label class="layui-form-label">单据编号:</label>
            <div class="layui-input-block">
                <input name="billNo" placeholder="输入单据编号" type="text" class="layui-input" maxlength="20" lay-verType="tips" lay-verify="required"/>
                <input id="billNo" name="billNo" placeholder="输入单据编号" type="text" class="layui-input" maxlength="20" lay-verType="tips" lay-verify="required"/>
            </div>
        </div>
        <div class="layui-form-item" style="position: relative;">