From 735dc7c5d1510cc5b18bc567bffad337c51c58f7 Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Thu, 5 Jun 2025 10:51:56 +0800 Subject: [PATCH] =?UTF-8?q?feat(sip):=20=E4=BC=98=E5=8C=96=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E6=B8=85=E5=8D=95=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B9=B6=E5=AE=8C=E5=96=84=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 DeliveryList 模型中添加 deliveryCode 字段，用于显示发货单号 - 修改 DeliveryListMapper.xml 中的查询语句，关联 order_delivery 表获取发货单号 - 优化 DeliveryListServiceImpl 中的导入校验逻辑，提供更详细的错误提示信息- 在 OrderInfo 模型中为 projectCode、orderType 和 status 字段添加 Excel 注解，优化订单信息导出 - 修改 ProjectProductInfoMapper.xml 中的插入语句，使用 values() 函数更新重复记录 --- .../src/main/java/com/ruoyi/sip/domain/DeliveryList.java | 1 + .../src/main/java/com/ruoyi/sip/domain/OrderInfo.java | 5 +++-- .../ruoyi/sip/service/impl/DeliveryListServiceImpl.java | 9 +++++++-- .../main/resources/mapper/manage/DeliveryListMapper.xml | 9 ++++++--- .../resources/mapper/sip/ProjectProductInfoMapper.xml | 8 ++++---- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/DeliveryList.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/DeliveryList.java index a0f891f1..61d0e7a3 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/DeliveryList.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/DeliveryList.java @@ -58,6 +58,7 @@ public class DeliveryList extends BaseEntity private Date deletedAt; private String productName; + private String deliveryCode; private String description; diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java index a3e03b28..a88285fd 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java @@ -27,6 +27,7 @@ public class OrderInfo extends BaseEntity private Long id; /** 关联项目编号 */ + @Excel(name = "项目编号") private String projectCode; /** 合同编号，唯一 */ @@ -66,7 +67,7 @@ public class OrderInfo extends BaseEntity private String customerEmail; /** 合同类型：1-直签合同，2-代理商合同 */ - @Excel(name = "合同类型：1-直签合同，2-代理商合同") + @Excel(name = "合同类型",dictType="order_type") private String orderType; /** 代表处编码 */ @@ -83,7 +84,7 @@ public class OrderInfo extends BaseEntity private Date orderDate; /** 合同状态：0-有效，1-无效 */ - @Excel(name = "合同状态：0-有效，1-无效") + @Excel(name = "合同状态",readConverterExp="0=有效,1=无效") private Long status; /** 创建时间 */ diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java index 0a97d0ae..1607325f 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java @@ -132,8 +132,13 @@ public class DeliveryListServiceImpl implements IDeliveryListService { list.setCreateBy(ShiroUtils.getUserId().toString()); } List deliveryLists = deliveryListMapper.listBySerialNumberList(deliveryList,deliveryId); - if (!deliveryLists.isEmpty()){ - return AjaxResult.error("产品序列号为[" + deliveryLists.stream().map(DeliveryList::getSerialNumber).collect(Collectors.joining(",")) + "]的产品已存在,请确认后重试;"); + if (CollUtil.isNotEmpty(deliveryLists)) { + StringBuilder errMsg = new StringBuilder(); + for (DeliveryList list : deliveryLists) { + errMsg.append(StringUtils.format("产品序列号为[{}]的产品在发货单号为[{}]发货记录已存在,请确认后重试;\n", list.getSerialNumber(), list.getDeliveryCode())); + } + + return AjaxResult.error(errMsg.toString()); } deliveryListMapper.insertBatch(deliveryList); return AjaxResult.success("导入成功"); diff --git a/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml index 1fb23136..e03a2bc5 100644 --- a/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml @@ -44,14 +44,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id}