From df6135204570325f42fa5e2b62ddef7ab1c2a45a Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Wed, 22 Oct 2025 11:26:52 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E8=BF=90=E8=BE=93=E7=AE=A1=E7=90=86=20-=E8=B4=A7=E7=89=A9?= =?UTF-8?q?=E7=BB=84=E6=89=B9=E6=AC=A1-=E5=88=A0=E9=99=A4=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E6=97=B6=E6=A0=A1=E9=AA=8C=E5=A6=82=E6=9E=9C=E8=AF=A5?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=B7=B2=E5=BD=95=E5=85=A5=E6=88=90=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=85=81=E8=AE=B8=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../web/emis/EmisTmsSiteBatchController.java | 9 ++--- .../erp/emis/mapper/EmisTmsCostFeeMapper.java | 40 +++++++++++-------- .../service/IEmisTmsSiteBatchService.java | 20 +++++----- .../impl/EmisTmsSiteBatchServiceImpl.java | 16 +++++++- .../resources/mapper/EmisTmsCostFeeMapper.xml | 10 +++++ 5 files changed, 63 insertions(+), 32 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java index 3d7a56e91..25c00c9fd 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java @@ -1,11 +1,11 @@ -/** +/** * @Project: emis * @Title: EmisTmsSiteBatchController.java * @author linfso * @date 2024-03-01 06:38:49 * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 + * @version v1.0 * @Description:

一级网点TMS组批次 控制器

*/ @@ -47,7 +47,7 @@ import java.text.SimpleDateFormat; /** * 一级网点TMS组批次Controller - * + * * @author linfso * @date 2024-03-01 06:38:49 */ @@ -217,8 +217,7 @@ public class EmisTmsSiteBatchController extends EmisBaseController @PreAuthorize("@ss.hasPermi('emis:emisTmsSiteBatch:remove')") @Log(title = "一级网点TMS组批次", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { + public AjaxResult remove(@PathVariable Long[] ids) throws EmisBizError { return toAjax(emisTmsSiteBatchService.deleteEmisTmsSiteBatchByIds(ids)); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsCostFeeMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsCostFeeMapper.java index 9d35cbca8..0f77db32f 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsCostFeeMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsCostFeeMapper.java @@ -1,10 +1,10 @@ -/** +/** * @Project: emis * @Title: EmisTmsCostFeeMapper.java * @author linfso * @date 2024-10-10 01:53:20 * @Copyright: ShangHai Doitinfo 2022 All rights reserved. - * @version v1.0 + * @version v1.0 * @Description:

TMS运输成本账单 Mapper 接口

* Warning : This file is generate by ai tools,don't edit!!! */ @@ -28,7 +28,7 @@ public interface EmisTmsCostFeeMapper extends BaseMapper /** * 主键查询 * @param id - * @return + * @return */ public EmisTmsCostFee selectEmisTmsCostFeeById(Long id); @@ -38,8 +38,8 @@ public interface EmisTmsCostFeeMapper extends BaseMapper /** * 查询列表 - * - * @param emisTmsCostFee + * + * @param emisTmsCostFee * @return 集合 */ public List selectEmisTmsCostFeeList(EmisTmsCostFee emisTmsCostFee); @@ -69,33 +69,33 @@ public interface EmisTmsCostFeeMapper extends BaseMapper /** * 检查是否重复 - * - * @param emisTmsCostFee + * + * @param emisTmsCostFee * @return 数量 */ public int checkUnique(EmisTmsCostFee emisTmsCostFee); - + /** - * 新增 - * + * 新增 + * * @param emisTmsCostFee - * @return + * @return */ public int insertEmisTmsCostFee(EmisTmsCostFee emisTmsCostFee); /** * 修改 - * - * @param emisTmsCostFee - * @return + * + * @param emisTmsCostFee + * @return */ public int updateEmisTmsCostFee(EmisTmsCostFee emisTmsCostFee); /** * 删除 - * + * * @param id 主键 * @return 结果 */ @@ -103,9 +103,17 @@ public interface EmisTmsCostFeeMapper extends BaseMapper /** * 批量删除 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ public int deleteEmisTmsCostFeeByIds(Long[] ids); + + /** + * 根据批次ID列表查询成本费用记录 + * + * @param batchIds 批次ID数组 + * @return 成本费用记录列表 + */ + public List selectEmisTmsCostFeeByBatchIds(Long[] batchIds); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchService.java index 945307255..7c3fe649d 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchService.java @@ -1,10 +1,10 @@ - /** + /** * @Project: emis * @Title: EmisTmsSiteBatchService.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组批次 服务类接口

*/ package com.xdadan.erp.emis.service; @@ -28,7 +28,7 @@ public interface IEmisTmsSiteBatchService extends IDataAuditService /** * 主键查询 * @param id - * @return + * @return */ public EmisTmsSiteBatch selectEmisTmsSiteBatchById(Long id); @@ -55,7 +55,7 @@ public interface IEmisTmsSiteBatchService extends IDataAuditService /** * 查询一级网点TMS组批次列表 - * + * * @param emisTmsSiteBatch 一级网点TMS组批次 * @return 一级网点TMS组批次集合 */ @@ -70,7 +70,7 @@ public interface IEmisTmsSiteBatchService extends IDataAuditService /** * 新增一级网点TMS组批次 - * + * * @param emisTmsSiteBatch 一级网点TMS组批次 * @return 结果 */ @@ -85,7 +85,7 @@ public interface IEmisTmsSiteBatchService extends IDataAuditService /** * 修改一级网点TMS组批次 - * + * * @param emisTmsSiteBatch 一级网点TMS组批次 * @return 结果 */ @@ -93,15 +93,15 @@ public interface IEmisTmsSiteBatchService extends IDataAuditService /** * 批量删除一级网点TMS组批次 - * + * * @param ids 需要删除的一级网点TMS组批次主键集合 * @return 结果 */ - public int deleteEmisTmsSiteBatchByIds(Long[] ids); + public int deleteEmisTmsSiteBatchByIds(Long[] ids) throws EmisBizError; /** * 删除一级网点TMS组批次信息 - * + * * @param id 一级网点TMS组批次主键 * @return 结果 */ @@ -130,7 +130,7 @@ public interface IEmisTmsSiteBatchService extends IDataAuditService /** * 批量编辑一级网点TMS组批次 - * + * * @param emisTmsSiteBatch 一级网点TMS组批次 * @return 结果 */ 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 935007d9c..59f276a8b 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 @@ -25,6 +25,7 @@ import com.xdadan.erp.emis.mapper.EmisTmsSiteBatchLoadingMapper; import com.xdadan.erp.emis.mapper.EmisTransPlanRuleMapper; import com.xdadan.erp.emis.mapper.EmisTmsSiteBatchLogMapper; import com.xdadan.erp.emis.mapper.EmisWaybillMapper; +import com.xdadan.erp.emis.mapper.EmisTmsCostFeeMapper; import com.xdadan.erp.emis.service.EmisBaseService; import jodd.util.StringUtil; import lombok.extern.slf4j.Slf4j; @@ -67,6 +68,9 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi @Autowired private EmisWaybillMapper emisWaybillMapper; + @Autowired + private EmisTmsCostFeeMapper emisTmsCostFeeMapper; + /** * 获取稽核数据 * @@ -469,7 +473,17 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi * @return 结果 */ @Override - public int deleteEmisTmsSiteBatchByIds(Long[] ids) { + public int deleteEmisTmsSiteBatchByIds(Long[] ids) throws EmisBizError { + // 检查批次是否已录入成本费用 + if (ids != null && ids.length > 0) { + // 一次性查询所有ids对应的成本费用记录 + List costFeeList = emisTmsCostFeeMapper.selectEmisTmsCostFeeByBatchIds(ids); + if (CollectionUtil.isNotEmpty(costFeeList)) { + // 取第一条记录的批次号作为提示 + String firstBatchNo = costFeeList.get(0).getBatchNo(); + throw new EmisBizError(EmisBizErrorType.FAIL, "批次号[" + firstBatchNo + "]已录入成本，无法删除"); + } + } return emisTmsSiteBatchMapper.deleteEmisTmsSiteBatchByIds(ids); } diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml index aaf245326..a6c57eb95 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml @@ -292,6 +292,16 @@ where a.batch_no = #{batchNo} limit 1 + + insert into emis_tms_cost_fee