From 1caa0df5c14167a2f29d0f225bbb3f09cb312893 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 25 Nov 2025 18:55:48 +0800 Subject: [PATCH 1/2] =?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 --- .../impl/EmisTmsSiteBatchMissServiceImpl.java | 2 +- .../impl/EmisTmsSiteBatchServiceImpl.java | 24 ++++----- .../service/impl/EmisWaybillServiceImpl.java | 52 +++++++++---------- 3 files changed, 39 insertions(+), 39 deletions(-) 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 ca80fd4b0..62296013b 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 59f276a8b..6d7495c03 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 @@ -1,10 +1,10 @@ -/** +/** * @Project: emis * @Title: EmisTmsSiteBatchServiceImpl.java * @author linfso * @date 2024-03-01 08:54:56 * @Copyright: ShangHai Duta 2022 All rights reserved. -* @version v1.0 +* @version v1.0 * @Description:

一级网点TMS组批次 实体类

*/ @@ -40,7 +40,7 @@ import org.springframework.util.CollectionUtils; /** * 一级网点TMS组批次Service业务层处理 - * + * * @author linfso * @date 2024-03-01 08:54:56 */ @@ -73,7 +73,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi /** * 获取稽核数据 - * + * * @param id * @return */ @@ -85,7 +85,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi /** * 查询一级网点TMS组批次 - * + * * @param id 一级网点TMS组批次主键 * @return 一级网点TMS组批次 */ @@ -112,7 +112,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi /** * 查询一级网点TMS组批次列表 - * + * * @param emisTmsSiteBatch 一级网点TMS组批次 * @return 一级网点TMS组批次 */ @@ -123,7 +123,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi /** * 批次明细 - * + * * @param emisTmsSiteBatch * @return */ @@ -134,7 +134,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi /** * 新增一级网点TMS组批次 - * + * * @param emisTmsSiteBatch 一级网点TMS组批次 * @return 结果 */ @@ -452,7 +452,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi /** * 修改一级网点TMS组批次 - * + * * @param emisTmsSiteBatch 一级网点TMS组批次 * @return 结果 */ @@ -468,7 +468,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi /** * 批量删除一级网点TMS组批次 - * + * * @param ids 需要删除的一级网点TMS组批次主键 * @return 结果 */ @@ -489,7 +489,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi /** * 删除一级网点TMS组批次信息 - * + * * @param id 一级网点TMS组批次主键 * @return 结果 */ @@ -509,7 +509,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi if (CollectionUtil.isEmpty(waybills)) { return; } - scanSiteBatchByWaybills(waybills); +// scanSiteBatchByWaybills(waybills); } @Override diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 08144427c..8827a3f1d 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -157,32 +157,32 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb * @param emisWaybillSave */ private void saveOrUpdateWaybillOther(EmisWaybill emisWaybillSave) { -// if (emisWaybillSave == null || emisWaybillSave.getId() == null) { -// return; -// } -// -// String salesSupport = emisWaybillSave.getSalesSupport(); -// String billCode = emisWaybillSave.getBillCode(); -// Long waybillId = emisWaybillSave.getId(); -// -// // 查询是否已存在 -// EmisWaybillOther existing = emisWaybillOtherMapper.selectEmisWaybillOtherByWaybillId(waybillId); -// -// if (existing != null) { -// // 更新 -// existing.setSalesSupport(salesSupport); -// existing.setBillCode(billCode); -// existing.preUpdate(); -// emisWaybillOtherMapper.updateEmisWaybillOther(existing); -// } else { -// // 新增 -// EmisWaybillOther waybillOtherEntity = new EmisWaybillOther(); -// waybillOtherEntity.setWaybillId(waybillId); -// waybillOtherEntity.setBillCode(billCode); -// waybillOtherEntity.setSalesSupport(salesSupport); -// waybillOtherEntity.preInsert(); -// emisWaybillOtherMapper.insertEmisWaybillOther(waybillOtherEntity); -// } + if (emisWaybillSave == null || emisWaybillSave.getId() == null) { + return; + } + + String salesSupport = emisWaybillSave.getSalesSupport(); + String billCode = emisWaybillSave.getBillCode(); + Long waybillId = emisWaybillSave.getId(); + + // 查询是否已存在 + EmisWaybillOther existing = emisWaybillOtherMapper.selectEmisWaybillOtherByWaybillId(waybillId); + + if (existing != null) { + // 更新 + existing.setSalesSupport(salesSupport); + existing.setBillCode(billCode); + existing.preUpdate(); + emisWaybillOtherMapper.updateEmisWaybillOther(existing); + } else { + // 新增 + EmisWaybillOther waybillOtherEntity = new EmisWaybillOther(); + waybillOtherEntity.setWaybillId(waybillId); + waybillOtherEntity.setBillCode(billCode); + waybillOtherEntity.setSalesSupport(salesSupport); + waybillOtherEntity.preInsert(); + emisWaybillOtherMapper.insertEmisWaybillOther(waybillOtherEntity); + } } /** From 8d9b0aef0b891f4225c1ab4724ed65440f696159 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 25 Nov 2025 18:56:55 +0800 Subject: [PATCH 2/2] =?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 --- .../main/java/com/xdadan/erp/web/emis/EmisCommonController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 114df9f00..074810d81 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("异步任务已启动，请稍后查看执行结果");