From c4f8ca842a8ec24c8c9974cee5bab0eac29745b6 Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Thu, 5 Jun 2025 15:02:21 +0800
Subject: [PATCH] =?UTF-8?q?feat(delivery):=20=E6=B7=BB=E5=8A=A0=E7=89=A9?=
 =?UTF-8?q?=E6=B5=81=E5=8D=95=E5=8F=B7=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在发货列表页面添加物流单号查询条件
- 优化导入失败提示框样式
- 在项目信息中添加汇智支撑人员名称字段
- 更新相关 mapper 文件以支持新功能
---
 ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css | 3 +++
 .../resources/templates/manage/delivery/delivery.html     | 4 ++++
 .../main/resources/templates/manage/delivery/import.html  | 8 +++++++-
 .../src/main/java/com/ruoyi/sip/domain/ProjectInfo.java   | 1 +
 .../ruoyi/sip/service/impl/DeliveryListServiceImpl.java   | 4 ++--
 .../main/resources/mapper/manage/OrderDeliveryMapper.xml  | 1 +
 .../src/main/resources/mapper/sip/ProjectInfoMapper.xml   | 4 +++-
 7 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
index 004c8cd7..83f0189d 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
@@ -1216,3 +1216,6 @@ table.rc-table-resizing thead > th > a {
 :-ms-input-placeholder {
 	color: #b3b3b3!important;
 }
+.content-br{
+	white-space: pre-line ;
+}
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
index 7a14fd66..828c4b70 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
@@ -31,6 +31,10 @@
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
+                            <li>
+                                <label>物流单号：</label>
+                                <input type="text" name="logisticsCode"/>
+                            </li>
                             <li>
                                 <label>发货状态：</label>
                                 <select name="deliveryStatus" th:with="type=${@dict.getType('delivery_status')}">
diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/import.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/import.html
index b38b06fe..15759c21 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/import.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/import.html
@@ -119,7 +119,13 @@ url: prefix + "/list",
             if (data.code === 0) {
                 $.modal.msgSuccess('上传成功');
             } else {
-                $.modal.msgError(data.msg||'导入失败');
+                top.layer.alert(data.msg||'导入失败', {
+                    icon: 2,
+                    title: "系统提示",
+                    btn: ['确认'],
+                    skin:'content-br',
+                    btnclass: ['btn btn-primary'],
+                });
 
             }
             $('#uploadInput').val('')
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectInfo.java
index 2adbf00a..dc09d4e8 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectInfo.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectInfo.java
@@ -65,6 +65,7 @@ public class ProjectInfo extends BaseEntity
     /** 汇智支撑人员id */
     @Excel(name = "汇智支撑人员id")
     private String hzSupportUser;
+    private String hzSupportUserName;
 
     /** 运作机构 */
     @Excel(name = "运作机构")
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 1607325f..32919771 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
@@ -135,9 +135,9 @@ public class DeliveryListServiceImpl implements IDeliveryListService {
         if (CollUtil.isNotEmpty(deliveryLists)) {
             StringBuilder errMsg = new StringBuilder();
             for (DeliveryList list : deliveryLists) {
-                errMsg.append(StringUtils.format("产品序列号为[{}]的产品在发货单号为[{}]发货记录已存在,请确认后重试;\n", list.getSerialNumber(), list.getDeliveryCode()));
+                errMsg.append(StringUtils.format("产品序列号为[{}]的产品在发货单号为[{}]发货记录已存在,请确认后重试;\n", list.getSerialNumber()
+                        , list.getDeliveryCode()));
             }
-
             return AjaxResult.error(errMsg.toString());
         }
         deliveryListMapper.insertBatch(deliveryList);
diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml
index fce74d59..f642c222 100644
--- a/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml
@@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deliveryDate != null "> and t1.delivery_date = #{deliveryDate}</if>
             <if test="deliveryType != null  and deliveryType != ''"> and t1.delivery_type = #{deliveryType}</if>
             <if test="logisticsCompany != null  and logisticsCompany != ''"> and t1.logistics_company = #{logisticsCompany}</if>
+            <if test="logisticsCode != null  and logisticsCode != ''"> and t1.logistics_code = #{logisticsCode}</if>
             <if test="deliveryStatus != null  and deliveryStatus != ''"> and t1.delivery_status = #{deliveryStatus}</if>
             <if test="orderName != null  and orderName != ''"> and t2.order_name like concat('%', #{orderName},'%')</if>
         </where>
diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml
index e4166995..8fe8577b 100644
--- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml
@@ -68,9 +68,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                t1.create_time,
                t1.update_by,
                t1.update_time,
-               t2.agent_name
+               t2.agent_name,
+               t3.user_name as hz_support_user_name
         from project_info t1
                  left join agent_info t2 on t1.agent_code = t2.agent_code
+        left join sys_user t3 on t1.hz_support_user=t3.user_id
     </sql>
 
     <select id="selectProjectInfoList" parameterType="ProjectInfo" resultMap="ProjectInfoResult">