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

src/main/java/com/starcharge/wios/controller/TauxiliarymaterialsController.java

@@ -70,7 +70,7 @@ public class TauxiliarymaterialsController {
         SessionInfo sessionInfo = tokenService.getUser();
         SessionInfo sessionInfo = tokenService.getUser();
         var tauxiliarymaterials=TauxiliarymaterialsConvert.INSTANCE.convertListVo(tauxiliarymaterialsVo);
         var tauxiliarymaterials=TauxiliarymaterialsConvert.INSTANCE.convertListVo(tauxiliarymaterialsVo);
         var now=LocalDateTime.now();
         var now=LocalDateTime.now();
-        tauxiliarymaterials.setApplyStatus(TauxiliarymaterialStatusEnum.退货已申请.name());
+        tauxiliarymaterials.setApplyStatus(TauxiliarymaterialStatusEnum.已申请.name());
         tauxiliarymaterials.setLogisticStatus(TauxiliarymaterialStatusEnum.未发货.name());
         tauxiliarymaterials.setLogisticStatus(TauxiliarymaterialStatusEnum.未发货.name());
         tauxiliarymaterials.setReceivingStatus(TauxiliarymaterialStatusEnum.未收货.name());
         tauxiliarymaterials.setReceivingStatus(TauxiliarymaterialStatusEnum.未收货.name());
         tauxiliarymaterials.setApplyTime(now);
         tauxiliarymaterials.setApplyTime(now);

src/main/java/com/starcharge/wios/dao/entity/Tauxiliarymaterials.java

@@ -300,5 +300,27 @@ public class Tauxiliarymaterials  extends PageVo implements Serializable{
      */
      */
     @ApiModelProperty(value = "服务商ID")
     @ApiModelProperty(value = "服务商ID")
     private Integer supplierId;
     private Integer supplierId;
+    /**
+     * 发货表的申请单号
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "发货表的申请单号")
+    private String deliveryLogisticOrder;
+    /**
+     * 物流服务商
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "物流服务商")
+    private String logisticCompany;
+    /**
+     * 发货人
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "发货人")
+    private String sender;
+
 
 
 }
 }
\ No newline at end of file

src/main/java/com/starcharge/wios/dao/mappers/TauxiliarymaterialsMapper.xml

@@ -630,8 +630,9 @@
     t.month_amount_sap, t.year_amount, t.apply_status, t.team, t.logistic_status, t.receiving_status, t.recipents,
     t.month_amount_sap, t.year_amount, t.apply_status, t.team, t.logistic_status, t.receiving_status, t.recipents,
     t.receive_address, t.receive_phone, t.apply_time, t.check_user, t.check_user_name, t.check_time, t.check_suggestion,
     t.receive_address, t.receive_phone, t.apply_time, t.check_user, t.check_user_name, t.check_time, t.check_suggestion,
     t.CREATED_BY, t.CREATED_TIME, t.UPDATED_BY, t.UPDATED_TIME, t.install_order, t.specification, t.logistic_order,
     t.CREATED_BY, t.CREATED_TIME, t.UPDATED_BY, t.UPDATED_TIME, t.install_order, t.specification, t.logistic_order,
-    t.apply_inventory, t.apply_order,ts.id supplierId
+    t.apply_inventory, t.apply_order,ts.id supplierId,td.logistic_order deliveryLogisticOrder,td.logistic_company logisticCompany,td.sender sender
     from t_auxiliary_materials t
     from t_auxiliary_materials t
+        left join t_delivery td on td.install_order = t.apply_order
     left join t_supplier ts on ts.name = t.team
     left join t_supplier ts on ts.name = t.team
     <where>
     <where>
       <if test="materialCode != null  and materialCode != ''"> and t.material_code like concat('%', #{materialCode}, '%')</if>
       <if test="materialCode != null  and materialCode != ''"> and t.material_code like concat('%', #{materialCode}, '%')</if>

src/main/java/com/starcharge/wios/enums2/TauxiliarymaterialStatusEnum.java

@@ -14,7 +14,7 @@ import java.util.stream.Collectors;
  * @CreateDate: 2023/9/2515:49
  * @CreateDate: 2023/9/2515:49
  */
  */
 public enum TauxiliarymaterialStatusEnum {
 public enum TauxiliarymaterialStatusEnum {
-    退货已申请(0,1),退货已驳回(0,2),退货已通过(0,3),退货完成(0,4),
+    退货已申请(0,1),退货已驳回(0,2),退货已通过(0,3),退货完成(0,4),已申请(0,5),
     未发货(1,1),已发货(1,1),
     未发货(1,1),已发货(1,1),
     未收货(2,1), 已收货(2,1);
     未收货(2,1), 已收货(2,1);