发货表详情接口优化

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

@@ -122,13 +122,13 @@ public class DeliveryController {
 
                         //墙盒新增发货的时候，校验订单号是已经审核通过的
                         WallboxApply wallboxApply=wallboxApplyMapper.selectWallboxApplyByOrderId(da.getInstallOrder());
-                        if (StringUtils.isEmpty(wallboxApply)){
+                        /*if (StringUtils.isEmpty(wallboxApply)){
                             throw new ServiceException("400","当前订单号没有进行墙盒申请!");
                         }else {
                             if (!"2".equals(wallboxApply.getCheckStatus())){
                                 throw new ServiceException("400","只有审核通过的订单号才能发货!");
                             }
-                        }
+                        }*/
                         //申请团队
                         delivery.setTeam(wallboxApply.getSupplierTeam());
                         Delivery deliveryInstallOrder=deliveryMapper.selectByInstallOrder(da.getInstallOrder());

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

@@ -39,6 +39,11 @@
     <result column="warehouse_id" jdbcType="VARCHAR" property="warehouseId" />
     <result column="receive_time" jdbcType="VARCHAR" property="receiveTime" />
     <result column="reject_time" jdbcType="VARCHAR" property="rejectTime" />
+    <result column="receiver_phone" jdbcType="VARCHAR" property="receiverPhone" />
+    <result column="sender" jdbcType="VARCHAR" property="sender" />
+    <result column="sender_phone" jdbcType="VARCHAR" property="senderPhone" />
+    <result column="receive_address" jdbcType="VARCHAR" property="receiveAddress" />
+    <result column="receive_address" jdbcType="VARCHAR" property="receiveAddress" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -172,9 +177,9 @@
       t.id, t.delivery_order, t.install_order, t.product_batch, t.quantity, t.material_category, t.material_code,
       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,
-      ,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,
+      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,
+      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_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