订货单：申请发货-自动带出目的地，联络人，联系方式

@@ -311,6 +311,18 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
     private String contractCreateByName;
     private String contractCreateByName;
 
 
     /**
     /**
+     * 目的地(合同里的目的地)
+     */
+    @ApiModelProperty("目的地")
+    private String destination;
+
+    /**
+     * 下单人手机号(非持久化字段)
+     */
+    @ApiModelProperty("下单人手机号")
+    private String contractCreateByTelephone;
+
+    /**
      * 是否展示审核按钮(非持久化字段)
      * 是否展示审核按钮(非持久化字段)
      */
      */
     @ApiModelProperty("是否展示审核按钮")
     @ApiModelProperty("是否展示审核按钮")

@@ -175,6 +175,8 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
         }
         }
 
 
         GetPurchaseOrderInfoBo result = new GetPurchaseOrderInfoBo(data);
         GetPurchaseOrderInfoBo result = new GetPurchaseOrderInfoBo(data);
+        //目的地
+        result.setDestination(ExcelUtil.buildPrintDestination(data.getContractType(), data.getDestination(), data.getForeignDestination()));
         // 判断 contractCreateById 是否等于当前用户 ID
         // 判断 contractCreateById 是否等于当前用户 ID
         String currentUserId = SecurityUtil.getCurrentUser().getId();
         String currentUserId = SecurityUtil.getCurrentUser().getId();
         boolean isCreateBy = false;
         boolean isCreateBy = false;

@@ -312,6 +312,12 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     @TableField(exist = false)
     @TableField(exist = false)
     private String contractCreateByName;
     private String contractCreateByName;
 
 
+    /**
+     * 下单人手机号(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String contractCreateByTelephone;
+
 
 
     /**
     /**
      * 是否展示审核按钮(非持久化字段)
      * 是否展示审核按钮(非持久化字段)

@@ -49,6 +49,7 @@
         <result column="packaging_fee" property="packagingFee"/>
         <result column="packaging_fee" property="packagingFee"/>
         <result column="contract_create_by_id" property="contractCreateById"/>
         <result column="contract_create_by_id" property="contractCreateById"/>
         <result column="contract_create_by_name" property="contractCreateByName"/>
         <result column="contract_create_by_name" property="contractCreateByName"/>
+        <result column="contract_create_by_telephone" property="contractCreateByTelephone"/>
         <result column="sample_order" property="sampleOrder"/>
         <result column="sample_order" property="sampleOrder"/>
         <result column="warranty_certificate_file_id" property="warrantyCertificateFileId"/>
         <result column="warranty_certificate_file_id" property="warrantyCertificateFileId"/>
         <result column="warranty_certificate_file_name" property="warrantyCertificateFileName"/>
         <result column="warranty_certificate_file_name" property="warrantyCertificateFileName"/>
@@ -108,6 +109,7 @@
             tb.packaging_fee,
             tb.packaging_fee,
             tb.contract_create_by_id,
             tb.contract_create_by_id,
             su.name as contract_create_by_name,
             su.name as contract_create_by_name,
+            su.telephone as contract_create_by_telephone,
             tb.freeze,
             tb.freeze,
             tb.sample_order,
             tb.sample_order,
             tb.warranty_certificate_file_id,
             tb.warranty_certificate_file_id,