feat(hrm): 新增员工用工性质、班组归属字段及考勤异常处理优化

云

3 天以前 b852254d90e7d1955db31db154193ec8ee84d8b3

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskServiceImpl.java

@@ -9,26 +9,40 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task.MesWmStockTakingTaskDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task.MesWmStockTakingTaskLineDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task.MesWmStockTakingTaskResultDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.plan.MesWmStockTakingPlanDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.stocktaking.task.MesWmStockTakingTaskMapper;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.md.autocode.MesMdAutoCodeRuleCodeEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmStockTakingTaskStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService;
import cn.iocoder.yudao.module.mes.service.wm.stocktaking.plan.MesWmStockTakingPlanService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.repository.ProcessDefinition;
import org.springframework.context.annotation.Lazy;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;

import java.math.BigDecimal;
import java.util.List;
import java.time.LocalDateTime;
import java.util.*;

import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;

/**
@@ -38,10 +52,16 @@
 */
@Service
@Validated
@Slf4j
public class MesWmStockTakingTaskServiceImpl implements MesWmStockTakingTaskService {

    @Resource
    private MesWmStockTakingTaskMapper stockTakingTaskMapper;

    @Resource
    private BpmProcessInstanceApi processInstanceApi;
    @Resource
    private BpmProcessDefinitionService bpmProcessDefinitionService;

    @Resource
    private MesWmMaterialStockService materialStockService;
@@ -56,6 +76,9 @@

    @Resource
    private MesWmTransactionService wmTransactionService;

    @Resource
    private MesMdAutoCodeRecordService mesMdAutoCodeRecordService;

    @Resource
    private AdminUserApi adminUserApi;
@@ -82,6 +105,38 @@
            stockTakingTaskLineService.generateStockTakingLines(task, true);
        }
        return task.getId();
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Long createStockTakingTaskFromPlan(Long planId) {
        // 1. 校验方案存在、已启用且开启定期自动生成
        MesWmStockTakingPlanDO plan = stockTakingPlanService.validateStockTakingPlanEnabled(planId);
        if (!Boolean.TRUE.equals(plan.getAutoGenerate())) {
            throw exception(WM_STOCK_TAKING_PLAN_NOT_AUTO_GENERATE);
        }

        // 2. 自动生成任务编码（规则：盘点任务编码）
        String code = mesMdAutoCodeRecordService.generateAutoCode(
                MesMdAutoCodeRuleCodeEnum.WM_STOCK_TAKING_CODE.getCode());

        // 3. 复用创建逻辑生成草稿任务（内部校验编码唯一、方案可用，并按方案生成盘点明细行）
        Long taskId = createStockTakingTask(new MesWmStockTakingTaskSaveReqVO()
                .setCode(code)
                .setName(plan.getName())
                .setTakingDate(LocalDateTime.now())
                .setType(plan.getType())
                .setUserId(getCurrentUserId())
                .setPlanId(planId)
                .setStartTime(plan.getStartTime())
                .setEndTime(plan.getEndTime())
                .setBlindFlag(plan.getBlindFlag())
                .setFrozen(plan.getFrozen())
                .setRemark("方案定期自动生成"));

        // 4. 回写本次生成时间，避免同一周期重复生成（与创建同事务）
        stockTakingPlanService.updateStockTakingPlanLastGenerateTime(planId, LocalDateTime.now());
        return taskId;
    }

    @Override
@@ -143,19 +198,114 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void finishStockTakingTask(Long id) {
        // 1. 校验任务存在且为审批中状态
    public void submitStockTakingResultApproval(Long id, String processDefinitionKey) {
        // 1.1 校验任务存在且处于盘点中状态
        MesWmStockTakingTaskDO task = validateStockTakingTaskExistsAndApproving(id);

        // 2. 更新任务状态为已完成
        stockTakingTaskMapper.updateById(new MesWmStockTakingTaskDO().setId(id)
                .setStatus(MesWmStockTakingTaskStatusEnum.FINISHED.getStatus()));

        // 3. 解冻库存
        if (Boolean.TRUE.equals(task.getFrozen())) {
            List<MesWmStockTakingTaskLineDO> lines = stockTakingTaskLineService.getStockTakingTaskLineListByTaskId(id);
            updateMaterialStockFrozen(lines, false);
        // 1.2 校验结果审批未提交过（避免重复提交）
        if (task.getProcessInstanceId() != null) {
            throw exception(WM_STOCK_TAKING_TASK_ALREADY_SUBMIT_APPROVAL);
        }
        // 1.3 校验至少有一条盘点结果
        List<MesWmStockTakingTaskResultDO> results = stockTakingTaskResultService.getStockTakingTaskResultListByTaskId(id);
        if (CollUtil.isEmpty(results)) {
            throw exception(WM_STOCK_TAKING_TASK_NO_RESULT);
        }

        // 2. 创建 BPM 流程实例
        String processInstanceId = processInstanceApi.createProcessInstance(getCurrentUserId(),
                new BpmProcessInstanceCreateReqDTO()
                        .setProcessDefinitionKey(processDefinitionKey)
                        .setBusinessKey(String.valueOf(id)));

        // 3. 回写流程实例编号（任务保持盘点中，等待审批）
        stockTakingTaskMapper.updateById(new MesWmStockTakingTaskDO()
                .setId(id).setProcessInstanceId(processInstanceId));
    }

    @Override
    public List<Map<String, Object>> getStockTakingTaskResultApprovalProcessDefinitionList() {
        return getProcessDefinitionListByCategory(APPROVE_CATEGORY_CODE);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateStockTakingTaskResultAuditStatus(Long id, Integer bpmResult) {
        // 1. 校验任务存在
        MesWmStockTakingTaskDO task = validateStockTakingTaskExists(id);
        if (!MesWmStockTakingTaskStatusEnum.APPROVING.getStatus().equals(task.getStatus())) {
            log.warn("[updateStockTakingTaskResultAuditStatus] 盘点任务({}) 不处于盘点中状态，忽略审批事件", id);
            return;
        }
        // 2. 审批通过：先置为已完成，再解冻并同事务自动核销差异
        if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
            // 2.1 先置为已完成：任务状态变更后，后续重复的审批事件读取到 FINISHED 即被忽略，避免重复核销
            stockTakingTaskMapper.updateById(new MesWmStockTakingTaskDO().setId(id)
                    .setStatus(MesWmStockTakingTaskStatusEnum.FINISHED.getStatus()));
            // 2.2 解冻库存：须在差异核销前解冻，否则核销事务会被库存冻结校验拦截
            if (Boolean.TRUE.equals(task.getFrozen())) {
                updateMaterialStockFrozen(stockTakingTaskLineService.getStockTakingTaskLineListByTaskId(id), false);
            }
            // 2.3 自动核销盘点差异：盘盈入库 / 盘亏出库，同事务内更新库存台账；任一步失败整体回滚，任务回退为盘点中
            doProcessStockTakingDifference(task);
            return;
        }
        // 3. 审批驳回：清空流程实例编号，任务保持盘点中，可修改实盘后重新提交结果审批
        if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmResult)) {
            stockTakingTaskMapper.clearProcessInstanceId(id);
            return;
        }
        // 4. 审批取消：解冻库存并置为已取消
        if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmResult)) {
            if (Boolean.TRUE.equals(task.getFrozen())) {
                updateMaterialStockFrozen(stockTakingTaskLineService.getStockTakingTaskLineListByTaskId(id), false);
            }
            stockTakingTaskMapper.clearProcessInstanceId(id);
            stockTakingTaskMapper.updateById(new MesWmStockTakingTaskDO().setId(id)
                    .setStatus(MesWmStockTakingTaskStatusEnum.CANCELED.getStatus()));
        }
    }

    /**
     * 获取分类下的可用 BPM 流程定义（过滤挂起流程，同 Key 保留最新版本）
     *
     * @param categoryCode 流程分类编码
     * @return 流程定义列表（id/key/name）
     */
    private List<Map<String, Object>> getProcessDefinitionListByCategory(String categoryCode) {
        List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
                .getProcessDefinitionInfoListByCategory(categoryCode);
        if (CollUtil.isEmpty(definitionInfoList)) {
            return Collections.emptyList();
        }
        // 过滤激活状态，保留最新版本
        Map<String, ProcessDefinition> latestVersionMap = new HashMap<>();
        for (BpmProcessDefinitionInfoDO info : definitionInfoList) {
            ProcessDefinition pd = bpmProcessDefinitionService.getProcessDefinition(info.getProcessDefinitionId());
            if (pd == null || pd.isSuspended()) {
                continue;
            }
            ProcessDefinition existing = latestVersionMap.get(pd.getKey());
            if (existing == null || pd.getVersion() > existing.getVersion()) {
                latestVersionMap.put(pd.getKey(), pd);
            }
        }
        List<Map<String, Object>> result = new ArrayList<>();
        for (ProcessDefinition pd : latestVersionMap.values()) {
            Map<String, Object> item = new HashMap<>();
            item.put("id", pd.getId());
            item.put("key", pd.getKey());
            item.put("name", pd.getName());
            result.add(item);
        }
        return result;
    }

    private Long getCurrentUserId() {
        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
        if (authentication != null && authentication.getPrincipal() instanceof Long) {
            return (Long) authentication.getPrincipal();
        }
        return 1L; // 默认用户
    }

    @Override
@@ -168,6 +318,8 @@
        }
        task.setStatus(MesWmStockTakingTaskStatusEnum.CANCELED.getStatus());
        stockTakingTaskMapper.updateById(task);
        // 取消后清空流程实例编号，避免残留审批标记影响后续重新开始盘点
        stockTakingTaskMapper.clearProcessInstanceId(id);
        if (Boolean.TRUE.equals(task.getFrozen())) {
            updateMaterialStockFrozen(stockTakingTaskLineService.getStockTakingTaskLineListByTaskId(id), false);
        }
@@ -229,20 +381,26 @@
        }
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void processStockTakingDifference(Long id) {
        // 1. 校验任务存在且已完成
        MesWmStockTakingTaskDO task = validateStockTakingTaskExists(id);
        if (!MesWmStockTakingTaskStatusEnum.FINISHED.getStatus().equals(task.getStatus())) {
            throw exception(WM_STOCK_TAKING_TASK_NOT_FINISHED);
        }

        // 2. 获取盘点结果列表
        List<MesWmStockTakingTaskResultDO> results = stockTakingTaskResultService.getStockTakingTaskResultListByTaskId(id);
    /**
     * 自动核销盘点差异：按盘点结果逐行生成 IN/OUT 库存事务更新库存台账
     *
     * <p>仅由 {@link #updateStockTakingTaskResultAuditStatus} 的审批通过分支在同事务内调用；
     * 失败整体回滚，任务回退为盘点中状态，避免重复调整。
     *
     * @param task 已置为已完成、已解冻的盘点任务
     */
    private void doProcessStockTakingDifference(MesWmStockTakingTaskDO task) {
        // 1. 获取盘点结果列表
        List<MesWmStockTakingTaskResultDO> results = stockTakingTaskResultService.getStockTakingTaskResultListByTaskId(task.getId());
        if (CollUtil.isEmpty(results)) {
            return; // 无盘点结果，无需处理
        }

        // 2. 建立 行号 -> 盘点行 映射：以盘点行（库存快照）为准回填库存编号与维度，
        //    避免出库核销按 (物料+位置+批次) 组合键匹配到其它供应商/库位的账面行而扣错库存
        Map<Long, MesWmStockTakingTaskLineDO> lineMap = convertMap(
                stockTakingTaskLineService.getStockTakingTaskLineListByTaskId(task.getId()),
                MesWmStockTakingTaskLineDO::getId);

        // 3. 遍历结果，处理差异
        for (MesWmStockTakingTaskResultDO result : results) {
@@ -253,37 +411,30 @@
                continue;
            }

            // 计算差异：盘点数量 - 账面数量
            // 计算差异：盘点数量 - 账面数量（盘盈为正、盘亏为负）
            BigDecimal difference = takingQuantity.subtract(bookQuantity);

            if (difference.compareTo(BigDecimal.ZERO) == 0) {
                continue; // 无差异，跳过
            }

            // 4. 创建库存调整事务
            MesWmStockTakingTaskLineDO line = result.getLineId() != null ? lineMap.get(result.getLineId()) : null;

            // 4. 创建库存调整事务：盘盈传正数入库；盘亏直接传负数出库（createTransaction 校验出库数量必须为负）
            MesWmTransactionSaveReqDTO transaction = new MesWmTransactionSaveReqDTO()
                    .setItemId(result.getItemId())
                    .setBatchId(result.getBatchId())
                    .setBatchCode(result.getBatchCode())
                    .setWarehouseId(result.getWarehouseId())
                    .setLocationId(result.getLocationId())
                    .setAreaId(result.getAreaId())
                    .setType(difference.compareTo(BigDecimal.ZERO) > 0
                            ? MesWmTransactionTypeEnum.IN.getType() : MesWmTransactionTypeEnum.OUT.getType())
                    .setQuantity(difference)
                    .setItemId(line != null ? line.getItemId() : result.getItemId())
                    .setBatchId(line != null ? line.getBatchId() : result.getBatchId())
                    .setBatchCode(line != null ? line.getBatchCode() : result.getBatchCode())
                    .setWarehouseId(line != null ? line.getWarehouseId() : result.getWarehouseId())
                    .setLocationId(line != null ? line.getLocationId() : result.getLocationId())
                    .setAreaId(line != null ? line.getAreaId() : result.getAreaId())
                    .setMaterialStockId(line != null ? line.getMaterialStockId() : result.getMaterialStockId())
                    .setBizId(task.getId())
                    .setBizCode(task.getCode())
                    .setBizLineId(result.getLineId());

            if (difference.compareTo(BigDecimal.ZERO) > 0) {
                // 盘盈：库存增加
                transaction.setType(MesWmTransactionTypeEnum.IN.getType())
                        .setQuantity(difference)
                        .setBizType(MesBizTypeConstants.WM_STOCK_TAKING);
            } else {
                // 盘亏：库存减少
                transaction.setType(MesWmTransactionTypeEnum.OUT.getType())
                        .setQuantity(difference.negate()) // 出库数量传正数，但内部会转为负数
                        .setBizType(MesBizTypeConstants.WM_STOCK_TAKING);
            }

                    .setBizLineId(result.getLineId())
                    .setBizType(MesBizTypeConstants.WM_STOCK_TAKING);
            wmTransactionService.createTransaction(transaction);
        }
    }