From b9ab49daf6716e477da2de70e39a176317a4e6b5 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 25 Nov 2025 19:34:28 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=E5=AE=A2=E6=88=B7=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2-cpu=E9=A3=99=E5=8D=87=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=AE=9A=E4=BD=8D=E8=A7=A3=E5=86=B3=20committer:=20he?= =?UTF-8?q?yu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xdadan/erp/web/emis/EmisCommonController.java | 2 +- .../xdadan/erp/emis/service/EmisBaseService.java | 14 ++++++++++---- .../impl/EmisTmsSiteBatchMissServiceImpl.java | 2 +- .../service/impl/EmisTmsSiteBatchServiceImpl.java | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java index 074810d81..114df9f00 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java @@ -924,7 +924,7 @@ public class EmisCommonController extends EmisBaseController redissonService.setStr(statusKey, "RUNNING", 1800); // 异步执行任务 -// emisTmsSiteBatchMissService.autoScanSiteBatch(lineCode); + emisTmsSiteBatchMissService.autoScanSiteBatch(lineCode); log.info("autoScanSiteBatch async task started"); return AjaxResult.success("异步任务已启动，请稍后查看执行结果"); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 3cbb4ea92..f53c39360 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -16,7 +16,10 @@ package com.xdadan.erp.emis.service; import com.beust.jcommander.internal.Lists; import com.xdadan.erp.common.core.domain.entity.SysUser; import com.xdadan.erp.common.core.redis.RedissonService; - import com.xdadan.erp.common.utils.*; + import com.xdadan.erp.common.utils.DateUtils; + import com.xdadan.erp.common.utils.DictUtils; + import com.xdadan.erp.common.utils.NoticeUtils; + import com.xdadan.erp.common.utils.SecurityUtils; import com.xdadan.erp.emis.domain.*; import com.xdadan.erp.emis.domain.enumtype.*; import com.xdadan.erp.emis.domain.exception.EmisBizError; @@ -41,6 +44,7 @@ package com.xdadan.erp.emis.service; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; + import org.springframework.cglib.beans.BeanCopier; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -54,7 +58,6 @@ package com.xdadan.erp.emis.service; import java.time.format.DateTimeParseException; import java.time.temporal.ChronoUnit; import java.util.*; -import java.util.Set; import java.util.stream.Collectors; /** @@ -197,6 +200,9 @@ public class EmisBaseService { @Autowired private EmisTmsSiteBatchDtlMapper emisTmsSiteBatchDtlMapper; + private static final BeanCopier TRANS_PLAN_RULE_COPIER = + BeanCopier.create(EmisTransPlanRule.class, EmisTransPlanRule.class, false); + private static SysUser emptySysUser = new SysUser(); static { @@ -4512,8 +4518,8 @@ public class EmisBaseService { visitedIds.add(source.getId()); visitPath.add(source.getId()); - EmisTransPlanRule copy = new EmisTransPlanRule(); - BeanUtils.copyProperties(source, copy); + EmisTransPlanRule copy = new EmisTransPlanRule(); + TRANS_PLAN_RULE_COPIER.copy(source, copy, null); // 为每个新节点生成唯一treeId copy.setTreeId(com.xdadan.erp.common.utils.idgen.UUID.fastUUID().toString()); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java index 62296013b..ca80fd4b0 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java @@ -248,7 +248,7 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements // 3) 调用scanSiteBatchByWaybills重新扫描 if (!waybills.isEmpty()) { -// this.scanSiteBatchByWaybills(waybills); + this.scanSiteBatchByWaybills(waybills); } } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java index 6d7495c03..f5d2480fe 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java @@ -509,7 +509,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi if (CollectionUtil.isEmpty(waybills)) { return; } -// scanSiteBatchByWaybills(waybills); + scanSiteBatchByWaybills(waybills); } @Override