墙盒申请和辅材申请查询的时候返回发货表的申请单号，物流服务商，发货人等发货表中的数据

src/main/java/com/boco/nbd/wios/manage/entity/vo/WallboxApplyInstallListVO.java

@@ -85,4 +85,39 @@ public class WallboxApplyInstallListVO {
 
 
     @ApiModelProperty(value = "数量")
     @ApiModelProperty(value = "数量")
     private String number;
     private String number;
+    /**
+     * 发货表的申请单号
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "发货表的申请单号")
+    private String deliveryLogisticOrder;
+    /**
+     * 物流服务商
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "物流服务商")
+    private String logisticCompany;
+    /**
+     * 发货人
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "发货人")
+    private String sender;
+    /**
+     * 收货人
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "收货人")
+    private String receiver;
+    /**
+     * 物流状态0未发货，1已发货
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "物流状态0未发货，1已发货")
+    private String trackingStatus;
 }
 }

src/main/resources/mybatis/mapper/def/common/WallboxApplyMapper.xml

@@ -121,10 +121,12 @@
         t_wallbox_apply.modify_account,
         t_wallbox_apply.modify_account,
         t_wallbox_apply.modify_time,
         t_wallbox_apply.modify_time,
         t_order.shipno as tracking_number,
         t_order.shipno as tracking_number,
-        t_order.status as install_status
+        t_order.status as install_status,
+        td.logistic_order deliveryLogisticOrder,td.logistic_company logisticCompany,td.sender sender,td.receiver receiver
         FROM t_wallbox_apply
         FROM t_wallbox_apply
         LEFT JOIN t_order ON t_wallbox_apply.order_id = t_order.id
         LEFT JOIN t_order ON t_wallbox_apply.order_id = t_order.id
         left join t_region reg on reg.id=t_wallbox_apply.region_id
         left join t_region reg on reg.id=t_wallbox_apply.region_id
+        left join t_delivery td on td.install_order = t_wallbox_apply.order_id
         <where>
         <where>
             <if test="supplierTeam != null  and supplierTeam != ''">and t_wallbox_apply.supplier_team like concat('%',
             <if test="supplierTeam != null  and supplierTeam != ''">and t_wallbox_apply.supplier_team like concat('%',
                 #{supplierTeam},
                 #{supplierTeam},