新增发货的时候如果是墙盒，根据订单号去订单表里把墙盒名称 墙盒类别 厂商拿到并添加到发货表里

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

@@ -4,7 +4,9 @@ import com.ihidea.component.api.v2.BaseResponse;
 import com.ihidea.core.support.exception.ServiceException;
 import com.ihidea.core.support.exception.ServiceException;
 import com.starcharge.wios.auth.service.TokenService;
 import com.starcharge.wios.auth.service.TokenService;
 import com.starcharge.wios.convert.DeliveryConvert;
 import com.starcharge.wios.convert.DeliveryConvert;
+import com.starcharge.wios.dao.OrderDao;
 import com.starcharge.wios.dao.entity.Delivery;
 import com.starcharge.wios.dao.entity.Delivery;
+import com.starcharge.wios.dao.entity.Order;
 import com.starcharge.wios.dao.entity.WallboxApply;
 import com.starcharge.wios.dao.entity.WallboxApply;
 import com.starcharge.wios.dao.mappers.DeliveryMapper;
 import com.starcharge.wios.dao.mappers.DeliveryMapper;
 import com.starcharge.wios.dao.mappers.TauxiliarymaterialsMapper;
 import com.starcharge.wios.dao.mappers.TauxiliarymaterialsMapper;
@@ -61,6 +63,8 @@ public class DeliveryController {
     private TauxiliarymaterialsMapper tauxiliarymaterialsMapper;
     private TauxiliarymaterialsMapper tauxiliarymaterialsMapper;
     @Autowired
     @Autowired
     private WallboxApplyMapper wallboxApplyMapper;
     private WallboxApplyMapper wallboxApplyMapper;
+    @Autowired
+    private OrderDao orderDao;
     @PostMapping("/add")
     @PostMapping("/add")
     @ApiOperation(value = "新增发货",notes = "新增发货，返回成功条数")
     @ApiOperation(value = "新增发货",notes = "新增发货，返回成功条数")
     @ParamsValidate
     @ParamsValidate
@@ -96,6 +100,19 @@ public class DeliveryController {
                         delivery.setLogisticStatus(TauxiliarymaterialStatusEnum.已发货.name());
                         delivery.setLogisticStatus(TauxiliarymaterialStatusEnum.已发货.name());
                     }
                     }
                     if(!ProductType.辅材.name().equals(delivery.getIsproduct())){
                     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());
+                            }
+                            if (!StringUtils.isEmpty(selectOrder.getInstallItemModel())){
+                                delivery.setMaterialCategory(selectOrder.getInstallItemModel());
+                            }
+                            if (!StringUtils.isEmpty(selectOrder.getOemName())){
+                                delivery.setMaterialCategory(selectOrder.getOemName());
+                            }
+                        }
                         int result=this.wallboxApplyMapper.updateWallBoxTrackingStatusByOrderId("1",delivery.getInstallOrder());
                         int result=this.wallboxApplyMapper.updateWallBoxTrackingStatusByOrderId("1",delivery.getInstallOrder());
                         if(result!=1){
                         if(result!=1){
                             throw new ServiceException("400","更新订单发货状态失败！订单号："+delivery.getInstallOrder());
                             throw new ServiceException("400","更新订单发货状态失败！订单号："+delivery.getInstallOrder());

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

@@ -18,6 +18,11 @@ public class Order {
      */
      */
     @ApiModelProperty(value = "主机厂id", required = true)
     @ApiModelProperty(value = "主机厂id", required = true)
     private Integer oemId;
     private Integer oemId;
+    /**
+     * 主机厂名称
+     */
+    @ApiModelProperty(value = "主机厂名称", required = true)
+    private String oemName;
     
     
     /**
     /**
      * 经销商id
      * 经销商id
@@ -1305,4 +1310,12 @@ public class Order {
     public void setInstallFollowTime(Date installFollowTime) {
     public void setInstallFollowTime(Date installFollowTime) {
         this.installFollowTime = installFollowTime;
         this.installFollowTime = installFollowTime;
     }
     }
+
+    public String getOemName() {
+        return oemName;
+    }
+
+    public void setOemName(String oemName) {
+        this.oemName = oemName;
+    }
 }
 }
\ No newline at end of file

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

@@ -96,6 +96,7 @@
   <result column="is_connect" property="isConnect" jdbcType="INTEGER" />
   <result column="is_connect" property="isConnect" jdbcType="INTEGER" />
   <result column="is_need_survey" property="isNeedSurvey" jdbcType="INTEGER" />
   <result column="is_need_survey" property="isNeedSurvey" jdbcType="INTEGER" />
   <result column="shipno" property="shipno" jdbcType="VARCHAR" />
   <result column="shipno" property="shipno" jdbcType="VARCHAR" />
+  <result column="oem_name" property="oemName" jdbcType="VARCHAR" />
 </resultMap>
 </resultMap>
 
 
   
   
@@ -118,7 +119,7 @@
   create_account, create_time, modify_account, modify_time,
   create_account, create_time, modify_account, modify_time,
   item_model,survey_wallbox_model,survey_item_model,install_wallbox_model,install_item_model,
   item_model,survey_wallbox_model,survey_item_model,install_wallbox_model,install_item_model,
   survey_follow_time,install_follow_time,address_lat,address_lng,
   survey_follow_time,install_follow_time,address_lat,address_lng,
-  connect_person, want_home_time, install_emergency_level, remark, is_connect,is_need_survey,shipno
+  connect_person, want_home_time, install_emergency_level, remark, is_connect,is_need_survey,shipno,oem_name oemName
 </sql>
 </sql>