合同：外贸、加工合同新增目的地（文本）

@@ -1456,4 +1456,7 @@ VALUES('所属分厂', 2, '6', 1, 'order', 'workshop_id', 'WORKSHOP', 'SELECT __
 
 
 INSERT INTO sys_data_permission_model_detail
 INSERT INTO sys_data_permission_model_detail
 (name, model_id, condition_type, input_type, table_name, column_name, enum_name, sql_value)
 (name, model_id, condition_type, input_type, table_name, column_name, enum_name, sql_value)
-VALUES('全部', 2, '6', 99, 'order', 'id', NULL, NULL);
+VALUES('全部', 2, '6', 99, 'order', 'id', NULL, NULL);
+
+ALTER TABLE tbl_contract_distributor_standard
+    ADD COLUMN foreign_destination varchar(200) COMMENT '目的地(外贸+加工合同)';

@@ -216,6 +216,12 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
     private String districtName;
     private String districtName;
 
 
     /**
     /**
+     * 目的地(外贸+加工合同)
+     */
+    @ApiModelProperty(value = "目的地")
+    private String foreignDestination;
+
+    /**
      * 单价中是否已包含包装费
      * 单价中是否已包含包装费
      */
      */
     @ApiModelProperty("单价中是否已包含包装费")
     @ApiModelProperty("单价中是否已包含包装费")

@@ -140,6 +140,12 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut
     private String districtName;
     private String districtName;
 
 
     /**
     /**
+     * 目的地(外贸+加工合同)
+     */
+    @ApiModelProperty(value = "目的地")
+    private String foreignDestination;
+
+    /**
      * 合计总金额
      * 合计总金额
      */
      */
     @ApiModelProperty("合计总金额")
     @ApiModelProperty("合计总金额")

@@ -118,6 +118,11 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
     private String destination;
     private String destination;
 
 
     /**
     /**
+     * 目的地(外贸+加工合同)
+     */
+    private String foreignDestination;
+
+    /**
      * 单价中是否已包含包装费
      * 单价中是否已包含包装费
      */
      */
     private Boolean includesPackagingFee;
     private Boolean includesPackagingFee;

@@ -91,6 +91,12 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     private String destination;
     private String destination;
 
 
     /**
     /**
+     * 目的地(外贸+加工合同)
+     */
+    @TableField(exist = false)
+    private String foreignDestination;
+
+    /**
      * 价格表编号
      * 价格表编号
      */
      */
     private String priceListNo;
     private String priceListNo;

@@ -349,6 +349,7 @@ public class ContractDistributorStandardServiceImpl extends
         data.setExecutionStandardRemarks(vo.getExecutionStandardRemarks());
         data.setExecutionStandardRemarks(vo.getExecutionStandardRemarks());
         data.setTransportMode(vo.getTransportMode());
         data.setTransportMode(vo.getTransportMode());
         data.setDestination(vo.getDestination());
         data.setDestination(vo.getDestination());
+        data.setForeignDestination(vo.getForeignDestination());
         data.setIncludesPackagingFee(vo.getIncludesPackagingFee());
         data.setIncludesPackagingFee(vo.getIncludesPackagingFee());
         data.setIncludesTransportFee(vo.getIncludesTransportFee());
         data.setIncludesTransportFee(vo.getIncludesTransportFee());
         data.setPieceWeightHead(vo.getPieceWeightHead());
         data.setPieceWeightHead(vo.getPieceWeightHead());
@@ -426,6 +427,7 @@ public class ContractDistributorStandardServiceImpl extends
                 .set(ContractDistributorStandard::getExecutionStandardRemarks, vo.getExecutionStandardRemarks())
                 .set(ContractDistributorStandard::getExecutionStandardRemarks, vo.getExecutionStandardRemarks())
                 .set(ContractDistributorStandard::getTransportMode, vo.getTransportMode())
                 .set(ContractDistributorStandard::getTransportMode, vo.getTransportMode())
                 .set(ContractDistributorStandard::getDestination, vo.getDestination())
                 .set(ContractDistributorStandard::getDestination, vo.getDestination())
+                .set(ContractDistributorStandard::getForeignDestination, vo.getForeignDestination())
                 .set(ContractDistributorStandard::getIncludesPackagingFee, vo.getIncludesPackagingFee())
                 .set(ContractDistributorStandard::getIncludesPackagingFee, vo.getIncludesPackagingFee())
                 .set(ContractDistributorStandard::getIncludesTransportFee, vo.getIncludesTransportFee())
                 .set(ContractDistributorStandard::getIncludesTransportFee, vo.getIncludesTransportFee())
                 .set(ContractDistributorStandard::getPieceWeightHead, vo.getPieceWeightHead())
                 .set(ContractDistributorStandard::getPieceWeightHead, vo.getPieceWeightHead())
@@ -652,6 +654,7 @@ public class ContractDistributorStandardServiceImpl extends
                 .set(ContractDistributorStandard::getExecutionStandardRemarks, vo.getExecutionStandardRemarks())
                 .set(ContractDistributorStandard::getExecutionStandardRemarks, vo.getExecutionStandardRemarks())
                 .set(ContractDistributorStandard::getTransportMode, vo.getTransportMode())
                 .set(ContractDistributorStandard::getTransportMode, vo.getTransportMode())
                 .set(ContractDistributorStandard::getDestination, vo.getDestination())
                 .set(ContractDistributorStandard::getDestination, vo.getDestination())
+                .set(ContractDistributorStandard::getForeignDestination, vo.getForeignDestination())
                 .set(ContractDistributorStandard::getIncludesPackagingFee, vo.getIncludesPackagingFee())
                 .set(ContractDistributorStandard::getIncludesPackagingFee, vo.getIncludesPackagingFee())
                 .set(ContractDistributorStandard::getIncludesTransportFee, vo.getIncludesTransportFee())
                 .set(ContractDistributorStandard::getIncludesTransportFee, vo.getIncludesTransportFee())
                 .set(ContractDistributorStandard::getPieceWeightHead, vo.getPieceWeightHead())
                 .set(ContractDistributorStandard::getPieceWeightHead, vo.getPieceWeightHead())
@@ -875,6 +878,7 @@ public class ContractDistributorStandardServiceImpl extends
                 .set(ContractDistributorStandard::getExecutionStandardRemarks, vo.getExecutionStandardRemarks())
                 .set(ContractDistributorStandard::getExecutionStandardRemarks, vo.getExecutionStandardRemarks())
                 .set(ContractDistributorStandard::getTransportMode, vo.getTransportMode())
                 .set(ContractDistributorStandard::getTransportMode, vo.getTransportMode())
                 .set(ContractDistributorStandard::getDestination, vo.getDestination())
                 .set(ContractDistributorStandard::getDestination, vo.getDestination())
+                .set(ContractDistributorStandard::getForeignDestination, vo.getForeignDestination())
                 .set(ContractDistributorStandard::getIncludesPackagingFee, vo.getIncludesPackagingFee())
                 .set(ContractDistributorStandard::getIncludesPackagingFee, vo.getIncludesPackagingFee())
                 .set(ContractDistributorStandard::getIncludesTransportFee, vo.getIncludesTransportFee())
                 .set(ContractDistributorStandard::getIncludesTransportFee, vo.getIncludesTransportFee())
                 .set(ContractDistributorStandard::getPieceWeightHead, vo.getPieceWeightHead())
                 .set(ContractDistributorStandard::getPieceWeightHead, vo.getPieceWeightHead())

@@ -741,6 +741,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
                 continue;
                 continue;
             }
             }
             orderInfo.setDestination(contract.getDestination());
             orderInfo.setDestination(contract.getDestination());
+            orderInfo.setForeignDestination(contract.getForeignDestination());
         }
         }
         return orderInfoList;
         return orderInfoList;
     }
     }

@@ -836,17 +836,26 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                     paymentTypeSet.add(paymentType);
                     paymentTypeSet.add(paymentType);
                     paymentTypeBuilder.append(paymentType).append(" | ");
                     paymentTypeBuilder.append(paymentType).append(" | ");
                 }
                 }
-                // 目的地
-                String destination = orderInfo.getDestination();
-                if (StringUtils.isNotBlank(destination) && !destinationSet.contains(destination)) {
-                    destinationSet.add(destination);
-                    List<DicCityDto> fullPath = dicCityService.getFullPath(destination, allCity);
-                    for (DicCityDto cityDto : fullPath) {
-                        destinationBuilder.append(cityDto.getName()).append(",");
-                    }
-                    if (destinationBuilder.length() > 0) {
-                        destinationBuilder.setLength(destinationBuilder.length() - 1);
-                        destinationBuilder.append(" | ");
+                // 目的地 外贸标准合同、外贸库存合同、外贸未锁规格合同、加工标准合同用
+                if (StringUtils.isNotEmpty(orderInfo.getContractType()) && ("INTL_STD_CONTRACT".equals(orderInfo.getContractType())
+                        || "INTL_INVENTORY_AGMT".equals(orderInfo.getContractType())
+                        || "INTL_OPEN_SPEC_AGMT".equals(orderInfo.getContractType())
+                        || "PROCESS_STD_AGMT".equals(orderInfo.getContractType()))) {
+                    String foreignDestination = orderInfo.getForeignDestination();
+                    destinationBuilder.append(foreignDestination);
+                    destinationBuilder.append(" | ");
+                } else {
+                    String destination = orderInfo.getDestination();
+                    if (StringUtils.isNotBlank(destination) && !destinationSet.contains(destination)) {
+                        destinationSet.add(destination);
+                        List<DicCityDto> fullPath = dicCityService.getFullPath(destination, allCity);
+                        for (DicCityDto cityDto : fullPath) {
+                            destinationBuilder.append(cityDto.getName()).append(",");
+                        }
+                        if (destinationBuilder.length() > 0) {
+                            destinationBuilder.setLength(destinationBuilder.length() - 1);
+                            destinationBuilder.append(" | ");
+                        }
                     }
                     }
                 }
                 }
                 // 计划吨位
                 // 计划吨位

@@ -144,6 +144,13 @@ public class CreateContractDistributorStandardVo implements BaseVo, Serializable
     @Length(message = "目的地最多允许200个字符！")
     @Length(message = "目的地最多允许200个字符！")
     private String destination;
     private String destination;
 
 
+
+    /**
+     * 目的地(外贸+加工合同)
+     */
+    @ApiModelProperty(value = "目的地")
+    private String foreignDestination;
+
     /**
     /**
      * 单价中是否已包含包装费
      * 单价中是否已包含包装费
      */
      */

@@ -144,6 +144,12 @@ public class UpdateContractDistributorStandardVo implements BaseVo, Serializable
     private String destination;
     private String destination;
 
 
     /**
     /**
+     * 目的地(外贸+加工合同)
+     */
+    @ApiModelProperty(value = "目的地")
+    private String foreignDestination;
+
+    /**
      * 单价中是否已包含包装费
      * 单价中是否已包含包装费
      */
      */
     @ApiModelProperty(value = "单价中是否已包含包装费")
     @ApiModelProperty(value = "单价中是否已包含包装费")

@@ -21,6 +21,7 @@
         <result column="execution_standard_remarks" property="executionStandardRemarks"/>
         <result column="execution_standard_remarks" property="executionStandardRemarks"/>
         <result column="transport_mode" property="transportMode"/>
         <result column="transport_mode" property="transportMode"/>
         <result column="destination" property="destination"/>
         <result column="destination" property="destination"/>
+        <result column="foreign_destination" property="foreignDestination"/>
         <result column="includes_packaging_fee" property="includesPackagingFee"/>
         <result column="includes_packaging_fee" property="includesPackagingFee"/>
         <result column="includes_transport_fee" property="includesTransportFee"/>
         <result column="includes_transport_fee" property="includesTransportFee"/>
         <result column="piece_weight_head" property="pieceWeightHead"/>
         <result column="piece_weight_head" property="pieceWeightHead"/>
@@ -84,6 +85,7 @@
                tb.execution_standard_remarks,
                tb.execution_standard_remarks,
                tb.transport_mode,
                tb.transport_mode,
                tb.destination,
                tb.destination,
+               tb.foreign_destination,
                tb.includes_packaging_fee,
                tb.includes_packaging_fee,
                tb.includes_transport_fee,
                tb.includes_transport_fee,
                tb.piece_weight_head,
                tb.piece_weight_head,