发货管理新增的时候墙盒申请的参数从申请表中获取

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

@@ -91,7 +91,6 @@ public class DeliveryController {
                         delivery.setLogisticStatus(TauxiliarymaterialStatusEnum.已发货.name());
                     }
 
-
                     //获取发货仓库信息
                     Map<String, String> paramSend = new HashMap<String, String>();
                     paramSend.put("id",da.getWarehouseId());
@@ -107,10 +106,6 @@ public class DeliveryController {
                         //如果是墙盒 根据订单号去订单表里把墙盒名称 墙盒类别 厂商拿到并添加到发货表里
                         Order selectOrder = orderDao.selectById(da.getInstallOrder());
                         if (!StringUtils.isEmpty(selectOrder)){
-                           /* //物料名称
-                            if (!StringUtils.isEmpty(selectOrder.getInstallWallboxModel())){
-                                delivery.setMaterialName(selectOrder.getInstallWallboxModel());
-                            }*/
                             //物料类型
                             delivery.setMaterialCategory(da.getIsproduct());
                             //厂商
@@ -121,31 +116,25 @@ public class DeliveryController {
                             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");
-                        JSONObject jsonObjectDataArrival=JSONObject.parseObject(dataArrival);
-                        delivery.setReceiver(jsonObjectDataArrival.getString("receivePeople"));
-                        delivery.setReceiverPhone(jsonObjectDataArrival.getString("receivePhone"));
-                        delivery.setArrivalWarehouseId(da.getArrivalWarehouseId());
-                        delivery.setArrivalWarehouse(jsonObjectDataArrival.getString("name"));
-                        //物料名称
-                        if (!StringUtils.isEmpty(jsonObjectDataArrival.getString("materialsName"))){
-                            delivery.setMaterialName(jsonObjectDataArrival.getString("materialsName"));
-                        }
-
-                        //墙盒新增发货的时候，校验订单号是已经审核通过的
                         WallboxApply wallboxApply=wallboxApplyMapper.selectWallboxApplyByOrderId(da.getInstallOrder());
-                        /*if (StringUtils.isEmpty(wallboxApply)){
-                            throw new ServiceException("400","当前订单号没有进行墙盒申请!");
-                        }else {
-                            if (!"2".equals(wallboxApply.getCheckStatus())){
-                                throw new ServiceException("400","只有审核通过的订单号才能发货!");
+                        if (!StringUtils.isEmpty(wallboxApply)){
+                            delivery.setReceiver(wallboxApply.getReceiver());
+                            delivery.setReceiverPhone(wallboxApply.getReceiverPhone());
+                            delivery.setArrivalWarehouseId(wallboxApply.getReceiverWarehouseId());
+                            delivery.setArrivalWarehouse(wallboxApply.getReceiverWarehouseName());
+
+                            Map<String, String> paramArrival = new HashMap<String, String>();
+                            paramArrival.put("id",wallboxApply.getReceiverWarehouseId());
+                            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");
+                            JSONObject jsonObjectDataArrival=JSONObject.parseObject(dataArrival);
+                            //物料名称
+                            if (!StringUtils.isEmpty(jsonObjectDataArrival.getString("materialsName"))){
+                                delivery.setMaterialName(jsonObjectDataArrival.getString("materialsName"));
                             }
-                        }*/
+                        }
                         //申请团队
                         delivery.setTeam(wallboxApply.getSupplierTeam());
                         Delivery deliveryInstallOrder=deliveryMapper.selectByInstallOrder(da.getInstallOrder());

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

@@ -87,5 +87,13 @@ public class WallboxApply {
 
     /** 更新时间 */
     private Date modifyTime;
+    /** 收货人 */
+    private String receiver;
+    /** 收货人电话 */
+    private String receiverPhone;
+    /** 收货仓库id */
+    private String receiverWarehouseId;
+    /** 收货仓库名称 */
+    private String receiverWarehouseName;
 
 }

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

@@ -30,6 +30,10 @@
         <result property="createdTime" column="created_time"/>
         <result property="modifyAccount" column="modify_account"/>
         <result property="modifyTime" column="modify_time"/>
+        <result property="receiver" column="receiver"/>
+        <result property="receiverPhone" column="receiver_phone"/>
+        <result property="receiverWarehouseId" column="receiver_warehouse_id"/>
+        <result property="receiverWarehouseName" column="receiver_warehouse_name"/>
     </resultMap>
 
     <sql id="selectWallboxApplyVo">
@@ -57,7 +61,11 @@
                create_account,
                created_time,
                modify_account,
-               modify_time
+               modify_time,
+               receiver,
+               receiver_phone,
+               receiver_warehouse_id,
+               receiver_warehouse_name
         from t_wallbox_apply
     </sql>