调整出入库通知单功能

jiazx0107

2026-01-17 7411561962ca6e45e32844d7a626a6e89b8292e5

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

@@ -12,6 +12,7 @@
import com.fzzy.work.domain.WorkOrderConf;
import com.fzzy.work.domain.WorkOrderProcess;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -84,7 +85,7 @@
        process.setAssigneeName(work.getCreateBy());
        process.setAssigneeId(work.getCreateById());
        process.setNode(WorkNode.NODE_START.getCode());
        orderProcessService.addData(process);
        orderProcessService.addData(process,false);

        return BaseResp.success();
    }
@@ -129,7 +130,7 @@
        process.setAssigneeName(work.getCreateBy());
        process.setAssigneeId(work.getCreateById());
        process.setNode(WorkNode.NODE_START.getCode());
        orderProcessService.addData(process);
        orderProcessService.addData(process,false);

        return BaseResp.success();
    }
@@ -168,10 +169,20 @@
     */
    public BaseResp todoByProcess(WorkOrderProcess process) {

        String action = process.getAction();
        if (StringUtils.isEmpty(action)) {
            return BaseResp.error("没有识别到处理动作，请重新尝试");
        }

        log.info("-----工单处理-----{}", process);
        //获取工单
        WorkOrder work = orderService.selectById(process.getOrderId());
        if (null == work) return BaseResp.error("当前工单已不存在");

        if (work.getStatus().equals(WorkStatus.STATUS_50.getCode())
                || work.getStatus().equals(WorkStatus.STATUS_60.getCode())) {
            return BaseResp.error("当前工单已处理，请刷新页面重试！！");
        }

        String curNode = process.getNode();
        //获取处理人
@@ -183,8 +194,6 @@
        WorkOrderConf conf = confService.selectById(work.getConfId());
        if (null == conf) return BaseResp.error("当前工单未配置流程");


        String action = process.getAction();
        //添加记录
        process.setId(ContextUtil.UUID());
        process.setCreateTime(new Date());
@@ -192,18 +201,21 @@
        process.setAssigneeName(ContextUtil.getLoginUserName());
        process.setAssigneeId(ContextUtil.getLoginName());

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

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

        //通过操作
        if ("pass".equals(action)) {
            process.setAction("通过");
            process.setNode(node.getCode());
            process.setNode(work.getNode());

            //结束判断，如果是结束节点，则结束工单
            if(WorkNode.NODE_END.getCode().equals(process.getNode())){
            if (WorkNode.NODE_END.getCode().equals(nextNode.getCode())) {
                work.setStatus(WorkStatus.STATUS_50.getCode());
                work.setAssigneeName(process.getAssigneeName());
                work.setAssigneeId(process.getAssigneeId());
                work.setNode(nextNode.getCode());
                orderService.complete(work);
            }
        }
@@ -218,7 +230,7 @@
        }

        //增加审批记录
        orderProcessService.addData(process);
        orderProcessService.addData(process,nextNode.equals(WorkNode.NODE_END));

        return BaseResp.success();
    }