From 7a1cccd6703e1dc7470f0079812ba361e864a9ed Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Fri, 15 Aug 2025 11:46:58 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=E8=BF=90=E5=8D=95=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E3=80=81=E8=BF=90=E5=8D=95=E4=BF=AE=E6=94=B9=E3=80=81=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E6=89=B9=E9=87=8F=E5=BD=95=E5=85=A5=E3=80=81=E7=BD=91?= =?UTF-8?q?=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E7=BA=BF=E8=B7=AF=E4=B8=8E=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=98=AF=E5=90=A6=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../emis/mapper/EmisTransProductMapper.java | 28 ++++++++++--------- .../erp/emis/service/EmisBaseService.java | 21 +++++++++++--- .../service/impl/EmisWaybillServiceImpl.java | 14 +++++++--- .../mapper/EmisTransProductMapper.xml | 8 +++++- 4 files changed, 49 insertions(+), 22 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransProductMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransProductMapper.java index 1e4e591b3..90d61cf45 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransProductMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransProductMapper.java @@ -1,10 +1,10 @@ -/** +/** * @Project: emis * @Title: EmisTransProductMapper.java * @author linfso * @date 2024-01-09 11:50:34 * @Copyright: ShangHai Doitinfo 2022 All rights reserved. - * @version v1.0 + * @version v1.0 * @Description:

运输产品类型 Mapper 接口

* Warning : This file is generate by ai tools,don't edit!!! */ @@ -26,7 +26,7 @@ public interface EmisTransProductMapper extends BaseMapper /** * 主键查询 * @param id - * @return + * @return */ public EmisTransProduct selectEmisTransProductById(Long id); @@ -41,31 +41,31 @@ public interface EmisTransProductMapper extends BaseMapper /** * 查询列表 - * - * @param emisTransProduct + * + * @param emisTransProduct * @return 集合 */ public List selectEmisTransProductList(EmisTransProduct emisTransProduct); /** - * 新增 - * + * 新增 + * * @param emisTransProduct - * @return + * @return */ public int insertEmisTransProduct(EmisTransProduct emisTransProduct); /** * 修改 - * - * @param emisTransProduct - * @return + * + * @param emisTransProduct + * @return */ public int updateEmisTransProduct(EmisTransProduct emisTransProduct); /** * 删除 - * + * * @param id 主键 * @return 结果 */ @@ -73,11 +73,13 @@ public interface EmisTransProductMapper extends BaseMapper /** * 批量删除 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ public int deleteEmisTransProductByIds(Long[] ids); public EmisTransProduct getEmisTransProductByProdCode(String prodCode); + + EmisTransProduct selectTransProductByCode(@Param("lineCode") String lineCode,@Param("prodCode") String prodCode); } 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 e6a36f838..89cc5f85d 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 @@ -1,10 +1,10 @@ - /** + /** * @Project: emis * @Title: EmisWaybillServiceImpl.java * @author linfso * @date 2024-02-29 08:15:14 * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 + * @version v1.0 * @Description:

运单列表 实体类

*/ @@ -58,7 +58,7 @@ package com.xdadan.erp.emis.service; /** * 运单列表Service业务层处理 - * + * * @author linfso * @date 2024-02-29 08:15:14 */ @@ -5480,6 +5480,19 @@ public class EmisBaseService { } + public void checkLineWithProd(EmisWaybill emisWaybillSave) throws EmisBizError { + if (StringUtil.isBlank(emisWaybillSave.getProductType()) || StringUtil.isBlank(emisWaybillSave.getTransLineType() + )) { + throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "线路/产品类型不能为空"); + } + EmisTransProduct transProduct = emisTransProductMapper.selectTransProductByCode( + emisWaybillSave.getTransLineType(), + emisWaybillSave.getProductType()); + if (transProduct == null) { + throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "产品类型与线路不匹配"); + } + } + public static void main(String[] args) throws ParseException { // Date startDate = new Date("202"); Date startDate= new SimpleDateFormat("yyyy-MM-dd").parse("2025-05-11"); @@ -5549,4 +5562,4 @@ public class EmisBaseService { - } \ No newline at end of file + } 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 4638fd54e..7f9ddcd8e 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 @@ -1,10 +1,10 @@ - /** + /** * @Project: emis * @Title: EmisWaybillServiceImpl.java * @author linfso * @date 2024-02-29 08:15:14 * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 + * @version v1.0 * @Description:

运单列表 实体类

*/ @@ -72,7 +72,7 @@ package com.xdadan.erp.emis.service.impl; /** * 运单列表Service业务层处理 - * + * * @author linfso * @date 2024-02-29 08:15:14 */ @@ -192,7 +192,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb /** * 查询运单列表列表 - * + * * @param emisWaybill 运单列表 * @return 运单列表 */ @@ -3130,6 +3130,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 校验寄件国家是否匹配线路 checkCountry(emisWaybillSave); + // 校验产品类型与线路是否匹配 + checkLineWithProd(emisWaybillSave); + // 子单号做扣减 if ("1".equals(emisWaybillSave.getBlGenSubbill())) { Integer subBillCount = emisElectronicSitePagService.getTotalAvailablePagCount(emisWaybillSave.getSendSiteCode(), "T7080", "1002"); @@ -3649,6 +3652,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 公共计算部分 emisWaybillSave.setId(oldEmisWaybill.getId()); + // 校验产品类型与线路是否匹配 + checkLineWithProd(emisWaybillSave); + calcWayBillCommonInfo(emisWaybillSave,oldEmisWaybill,false); emisWaybillSave.preUpdate(); diff --git a/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml index e7f91c795..8378c464e 100644 --- a/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml @@ -73,6 +73,12 @@ where a.trans_line_code=#{lineCode} and a.prod_name=#{prodName} limit 1 + +