1.墙盒新增发货的时候，根据从订单表表中获取的物料编码到外联上获取物料名称

2.收货管理详情中收件时间，退货详情退货时间和申请时间，在查询列表中展示退货时间和收货时间

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

@@ -104,9 +104,26 @@ public class DeliveryController {
                     delivery.setWarehouseId(da.getWarehouseId());
                     delivery.setWarehouseName(jsonObjectData.getString("name"));
                     if(!ProductType.辅材.name().equals(delivery.getIsproduct())){
+                        //如果是墙盒 根据订单号去订单表里把墙盒名称 墙盒类别 厂商拿到并添加到发货表里
+                        Order selectOrder = orderDao.selectById(da.getInstallOrder());
+                        if (!StringUtils.isEmpty(selectOrder)){
+                            //物料名称
+                            if (!StringUtils.isEmpty(selectOrder.getInstallWallboxModel())){
+                                delivery.setMaterialName(selectOrder.getInstallWallboxModel());
+                            }
+                            //物料类型
+                            delivery.setMaterialCategory(da.getIsproduct());
+                            //厂商
+                            if (!StringUtils.isEmpty(selectOrder.getOemName())){
+                                delivery.setMaterialCompany(selectOrder.getOemName());
+                            }
+                            //物料编码
+                            delivery.setMaterialCode(selectOrder.getItemModel());
+                        }
                         //收货仓库的信息
                         Map<String, String> paramArrival = new HashMap<String, String>();
                         paramArrival.put("id",da.getArrivalWarehouseId());
+                        paramArrival.put("materialCode",selectOrder.getItemModel());
                         String jsonArrival = HttpClientUtils.post(detailUrl,paramArrival,"UTF-8", "UTF-8");
                         JSONObject jsonObjectArrival=JSONObject.parseObject(jsonArrival);
                         String dataArrival=jsonObjectArrival.getString("data");
@@ -138,22 +155,6 @@ public class DeliveryController {
                         if (da.getArrivalWarehouseId().equals(da.getWarehouseId())){
                             throw new ServiceException("400","发货仓库和到货仓库请选择不同的仓库!");
                         }
-                        //如果是墙盒 根据订单号去订单表里把墙盒名称 墙盒类别 厂商拿到并添加到发货表里
-                        Order selectOrder = orderDao.selectById(da.getInstallOrder());
-                        if (!StringUtils.isEmpty(selectOrder)){
-                            //物料名称
-                            if (!StringUtils.isEmpty(selectOrder.getInstallWallboxModel())){
-                                delivery.setMaterialName(selectOrder.getInstallWallboxModel());
-                            }
-                            //物料类型
-                            delivery.setMaterialCategory(da.getIsproduct());
-                            //厂商
-                            if (!StringUtils.isEmpty(selectOrder.getOemName())){
-                                delivery.setMaterialCompany(selectOrder.getOemName());
-                            }
-                            //物料编码
-                            delivery.setMaterialCode(selectOrder.getItemModel());
-                        }
                         int result=this.wallboxApplyMapper.updateWallBoxTrackingStatusByOrderId("1",delivery.getInstallOrder());
                         if(result!=1){
                             throw new ServiceException("400","更新订单发货状态失败！订单号："+delivery.getInstallOrder());
@@ -193,7 +194,7 @@ public class DeliveryController {
                             throw new ServiceException("400","更新辅材订单发货状态失败！订单号："+delivery.getInstallOrder());
                         }
                     }
-
+                    delivery.setCreateAccount(tokenService.getUser().getUserName());
                     this.commonUpdateService.UpdateColumns(delivery,true);
                     return this.deliveryMapper.insertSelective(delivery);
                 }).reduce(0,Integer::sum));

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

@@ -127,6 +127,7 @@ public class RejectController {
     public BaseResponse<DeliveryUpdateDTO> update(@RequestBody @Validated(UpdateEntityGroup.class) DeliveryUpdateDTO deliveryUpdateDTO, BindingResult bindingResult){
         //var data=RejectConvert.INSTANCE.convertAddVo(rejectAddVo);
         this.commonUpdateService.UpdateColumns(deliveryUpdateDTO,false);
+        deliveryUpdateDTO.setUpdatedTime(LocalDateTime.now());
         return new BaseResponse(this.deliveryMapper.updateByPrimaryKeySelective(deliveryUpdateDTO));
     }
     @PostMapping("/confirmReject")

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

@@ -108,7 +108,7 @@
     material_name, material_company, logistic_order, logistic_company, logistic_status, 
     team, isproduct, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, arrival_warehouse, 
     arrival_warehouse_id, receiver,remarks,reject_material,reason,check_time,check_user,check_user_name,check_suggestion,reject_logistic_order,
-        arrival_quantity,auxiliary_id,file_url,material_sn,receiver_phone,sender,sender_phone,receive_address
+        arrival_quantity,auxiliary_id,file_url,material_sn,receiver_phone,sender,sender_phone,receive_address,receive_time,reject_time
   </sql>
 
   <select id="selectDeliveryList" parameterType="com.starcharge.wios.dao.entity.Delivery" resultMap="BaseResultMap">
@@ -597,6 +597,12 @@
       <if test="installStatus != null">
         install_status = #{installStatus,jdbcType=INTEGER},
       </if>
+      <if test="receiveTime != null">
+        receive_time = #{receiveTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="rejectTime != null">
+        reject_time = #{rejectTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>