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

zhanghl

2025-04-27 95b57803f23c999e612547302e18e905a94241be

 aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java

@@ -4,7 +4,6 @@
import com.alibaba.fastjson.JSONObject;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.StringUtils;
import com.aps.common.core.utils.uuid.Sequence;
import com.aps.job.domain.ApsWorkOrderJob;
import com.aps.job.domain.ApsWorkOrderJobLog;
import com.aps.job.domain.ApsWorkOrderProcess;
@@ -13,6 +12,7 @@
import com.aps.job.mapper.ApsWorkOrderProcessMapper;
import com.aps.job.service.IApsWorkOrderJobLogService;
import com.aps.job.service.IApsWorkOrderProcessService;
import com.aps.job.util.Sequence;
import com.github.pagehelper.PageHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -194,10 +194,12 @@
                            apsWorkOrderProcess.setWorkCenter(process.getString("WorkCenter"));
                            if (existsId != null) {
                                apsWorkOrderProcess.setId(existsId);
                                apsWorkOrderProcess.setUpdateBy("task");
                                apsWorkOrderProcess.setUpdateTime(DateUtils.getNowDate());
                                updateList.add(apsWorkOrderProcess);
                            } else {
                                apsWorkOrderProcess.setId(sequence.nextId());
                                apsWorkOrderProcess.setCreateBy("task");
                                apsWorkOrderProcess.setCreateTime(DateUtils.getNowDate());
                                addList.add(apsWorkOrderProcess);
                            }