feat(delivery): 添加物流单号查询功能并优化相关页面

- 在发货列表页面添加物流单号查询条件
- 优化导入失败提示框样式
- 在项目信息中添加汇智支撑人员名称字段
- 更新相关 mapper 文件以支持新功能

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 ;
+}

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')}">

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('')

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 = "运作机构")

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);

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>

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">