调整工单审核功能，调整出入库工单排序

jiazx0107

2026-02-08 c7e9e47f7b75dd0a88c929d7fb0713e5f638fdf1

 fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java

@@ -69,7 +69,7 @@
        work.setDeptId(data.getDeptId());
        work.setCompanyId(data.getCompanyId());
        work.setUpdateTime(new Date());
        work.setTitle("入库通知单审批");
        work.setTitle(data.getName()+"-审批");
        work.setConfId(conf.getId());
        work.setStatus(WorkStatus.STATUS_30.getCode());
        work.setReceiveTime(new Date());
@@ -114,7 +114,7 @@
        work.setDeptId(data.getDeptId());
        work.setCompanyId(data.getCompanyId());
        work.setUpdateTime(new Date());
        work.setTitle("出库通知单审批");
        work.setTitle(data.getName()+"-审批");
        work.setConfId(conf.getId());
        work.setStatus(WorkStatus.STATUS_30.getCode());
        work.setReceiveTime(new Date());
@@ -193,7 +193,7 @@
        work.setStatus(WorkStatus.STATUS_30.getCode());
        work.setReceiveTime(new Date());

        work.setDescription("当前合同<"+ data.getName() + ">下质押仓库<"+data.getDepotNames()+">库存量金额低于待还款金额，需要进行还款！");
        work.setDescription("当前合同<" + data.getName() + ">下质押仓库<" + data.getDepotNames() + ">库存量金额低于待还款金额，需要进行还款！");

        work.setCreateBy("系统生成");
        work.setCreateById("sys");
@@ -267,7 +267,7 @@

        WorkNode nextNode = this.getNextNode(work.getNode(), conf);

        log.info("工单审批：{}，当前节点：{}，下一节点：{}", work.getTitle(), work.getNode(), nextNode);
        log.info("工单审批：{}，执行动作：{}，当前节点：{}，下一节点：{}", work.getTitle(), action, work.getNode(), nextNode);

        //通过操作
        if ("pass".equals(action)) {
@@ -280,6 +280,10 @@
                work.setAssigneeId(process.getAssigneeId());
                work.setNode(nextNode.getCode());
                orderService.complete(work);
            }else{
                work.setNode(nextNode.getCode());
                work.setStatus(WorkStatus.STATUS_30.getCode());
                orderService.updateData(work);
            }

            //增加审批记录
@@ -290,11 +294,30 @@
        //拒绝操作
        if ("refuse".equals(action)) {
            process.setAction("拒绝");
            process.setNode(WorkNode.NODE_END.getCode());
            process.setNode(work.getNode());

            work.setStatus(WorkStatus.STATUS_60.getCode());

            orderService.complete(work);
            
            //增加审批记录
            orderProcessService.addData(process, true);

            return BaseResp.success();
        }

        //异常处理
        if ("error".equals(action)) {
            process.setAction("异常处理");
            process.setNode(work.getNode());
            work.setStatus(WorkStatus.STATUS_50.getCode());

//            work.setAssigneeName(process.getAssigneeName());
//            work.setAssigneeId(process.getAssigneeId());


            orderService.complete(work);

            //增加审批记录
            orderProcessService.addData(process, true);