Merge branch 'tzskasrs-2' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-2

tzsk

2024-04-11 0d30daf9ee89603b97c6181c2949abbb89bd64c4

Merge branch 'tzskasrs-2' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-2

 src/main/java/com/zy/asrs/controller/AgvWorkController.java

@@ -51,6 +51,9 @@
        } else if (type == 2) {
            workService.cancelWrkMast(workNo, getUserId());
            return R.ok("工作档已取消");
        } else if (type == 3) {
            workService.changeToOutWrkMast(workNo,getUserId());
            return R.ok("工作档已转成出库任务，并且容器离场成功");
        }
        return R.ok();
    }

 src/main/java/com/zy/asrs/service/AgvWorkService.java

@@ -59,4 +59,9 @@
     */
    void cancelWrkMast(String workNo, Long userId);

    /*
    手动转出库任务，并且容器离场
     */
    void changeToOutWrkMast(String workNo, Long userId);

}

 src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java

@@ -597,6 +597,22 @@

    }

    @Override
    public void changeToOutWrkMast(String workNo, Long userId) {
        AgvWrkMast agvWrkMast = agvWrkMastService.selectById(workNo);
        if (Cools.isEmpty(agvWrkMast)){
            throw new CoolException(workNo+"工作档不存在");
        }

        agvWrkMast.setIoType(101);
        agvWrkMast.setWrkSts(206L);
        agvWrkMast.setModiTime(new Date());
        agvWrkMast.setModiUser(userId);

        agvWrkMastService.updateById(agvWrkMast);

    }

    /*
    更新目标库位信息
     */

 src/main/webapp/static/js/agvWrkMast/wrkMast.js

@@ -348,6 +348,17 @@
                    });
                }
                break;
            // 转出库任务，并且任务完成
            case 'changeToOut':
                layer.confirm('确认将该笔任务转成出库任务，并且容器离场？', {title: '工作号：'+data.wrkNo, shadeClose: true}, function(){
                    http.post(baseUrl+"/agv/hand/control/wrkMast", {workNo: data.wrkNo, type:3}, function (res) {
                        $(".layui-laypage-btn")[0].click();
                        layer.msg(data.wrkNo + res.msg);
                    })
                    layer.closeAll();

                });
                break;
            //  拣料入库
            case 'pick':
                layer.confirm('拣料入库该笔工作档？', {title: '工作号：'+data.wrkNo, shadeClose: true}, function(){

 src/main/webapp/views/agvWrkMast/wrkMast.html

@@ -122,6 +122,7 @@
    <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>
    <a class="layui-btn layui-btn-warm layui-btn-xs btn-out" lay-event="changeToOut">转出库</a>
    <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="priWrkMast">维护状态</a>
    {{#if (d.steNo) { }}
    <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="removeSte">弃车</a>