在确认收货和确认发货的时候，在详情中展示收货时间和发货时间；

在收货详情中展示申请人，车企单号，墙盒品牌，是否特殊申请，预约安装时间等

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

@@ -32,6 +32,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -133,6 +134,7 @@ public class ReceivedNoteController {
             throw new ServiceException("发货仓库库存减少失败");
         }
         deliveryUpdateDTO.setLogisticStatus(LogisticStatus.已收货.name());
+        deliveryUpdateDTO.setReceiveTime(LocalDateTime.now());
         this.commonUpdateService.UpdateColumns(deliveryUpdateDTO,false);
         return new BaseResponse(this.deliveryMapper.updateByPrimaryKeySelective(deliveryUpdateDTO));
     }

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

@@ -155,6 +155,7 @@ public class RejectController {
             throw new ServiceException("到货仓库库存扣减失败");
         }
         deliveryUpdateDTO.setLogisticStatus("退货完成");
+        deliveryUpdateDTO.setRejectTime(LocalDateTime.now());
         this.commonUpdateService.UpdateColumns(deliveryUpdateDTO,false);
         return new BaseResponse(this.deliveryMapper.updateByPrimaryKeySelective(deliveryUpdateDTO));
     }

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

@@ -335,6 +335,49 @@ public class Delivery extends PageVo implements Serializable {
      */
     @ApiModelProperty(value = "收货地址")
     private String receiveAddress;
+    /**
+     * 收件时间
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "收件时间")
+    private LocalDateTime receiveTime;
+    /**
+     * 退货时间
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "退货时间")
+    private LocalDateTime rejectTime;
+    /**
+     * 墙盒申请人
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "墙盒申请人")
+    private String createAccount;
+    /**
+     * 预约安装日期
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "预约安装日期")
+    private String installReserveTime;
+    /**
+     * 是否特殊申请
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "是否特殊申请0：否，1：是")
+    private String ifEmergency;
+    /**
+     * 墙盒品牌
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "墙盒品牌")
+    private String wallboxModelName;
+
 
     private static final long serialVersionUID = 1L;
 

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

@@ -37,6 +37,8 @@
     <result column="file_url" jdbcType="VARCHAR" property="fileUrl" />
     <result column="material_sn" jdbcType="VARCHAR" property="materialSn" />
     <result column="warehouse_id" jdbcType="VARCHAR" property="warehouseId" />
+    <result column="receive_time" jdbcType="VARCHAR" property="receiveTime" />
+    <result column="reject_time" jdbcType="VARCHAR" property="rejectTime" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -171,10 +173,13 @@
       t.material_name, t.material_company, t.logistic_order, t.logistic_company, t.logistic_status,
       t.team, t.isproduct, t.CREATED_BY, t.CREATED_TIME, t.UPDATED_BY, t.UPDATED_TIME, t.arrival_warehouse,
       t.arrival_warehouse_id, t.receiver,t.remarks,t.reject_material,t.reason,t.check_time,t.check_user,t.check_user_name,t.check_suggestion,
-      e.out_order_id,t.reject_logistic_order,t.arrival_quantity,t.auxiliary_id,t.file_url,t.material_sn,t.warehouse_id,t.receiver_phone,
-      t.sender,t.sender_phone,t.receive_address
+      ,t.reject_logistic_order,t.arrival_quantity,t.auxiliary_id,t.file_url,t.material_sn,t.warehouse_id,t.receiver_phone,
+      t.sender,t.sender_phone,t.receive_address,t.receive_time,t.reject_time,e.out_order_id outOrderId,
+      tw.create_account createAccount,tw.install_reserve_time installReserveTime,tw.if_emergency ifEmergency,tc.name wallboxModelName
     from t_delivery t
     left join t_order e  on e.id = t.install_order
+    left join t_wallbox_apply tw on tw.order_id = t.install_order
+    left join t_oem_cascade tc on tc.id = tw.wallbox_model
     where t.id = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">

src/main/java/com/starcharge/wios/dto/DeliveryUpdateDTO.java

@@ -278,6 +278,20 @@ public class DeliveryUpdateDTO{
      */
     @ApiModelProperty(value = "安装状态,0-未安装，1-已安装")
     private Integer installStatus;
+    /**
+     * 收件时间
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "收件时间")
+    private LocalDateTime receiveTime;
+    /**
+     * 退货时间
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "退货时间")
+    private LocalDateTime rejectTime;
 
 
     private static final long serialVersionUID = 1L;