Merge remote-tracking branch 'origin/dev' into dev

huangjiayang

2025-05-12 f003459b33063abdcca11bb6aea1ed550ca5cc7d

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java

@@ -1,5 +1,6 @@
package com.aps.core.service.impl;

import cn.hutool.core.util.IdUtil;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.common.security.utils.DictUtils;
@@ -68,7 +69,7 @@
    @Override
    public int insertApsPlatePlan(ApsPlatePlan apsPlatePlan)
    {
        apsPlatePlan.setId(IdUtils.fastUUID());
        apsPlatePlan.setId(IdUtil.getSnowflakeNextId());
        apsPlatePlan.setCreateTime(DateUtils.getNowDate());
        return apsPlatePlanMapper.insertApsPlatePlan(apsPlatePlan);
    }
@@ -122,7 +123,7 @@
            ids[i]=apsPartPlanTemps.get(i).getId();
            ApsPlatePlan platePlan=new ApsPlatePlan();
            BeanUtils.copyProperties(apsPartPlanTemps.get(i), platePlan);
            platePlan.setId(IdUtils.fastUUID());
            platePlan.setId(IdUtil.getSnowflakeNextId());
            platePlan.setCreateTime(DateUtils.getNowDate());
            //插入正式表，并记录
            apsPlatePlanMapper.insertApsPlatePlan(platePlan);