Commit 170d136f4bf52f5213139d86f0e8b7d6b56d7b3f
Merge branch 'master_after0506_report02' into master_after0506_report02_1
Showing
1 changed file
with
7 additions
and
5 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/shipments/ShipmentsOrderInfoServiceImpl.java
| @@ -836,14 +836,16 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr | @@ -836,14 +836,16 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr | ||
| 836 | paymentTypeSet.add(paymentType); | 836 | paymentTypeSet.add(paymentType); |
| 837 | paymentTypeBuilder.append(paymentType).append(" | "); | 837 | paymentTypeBuilder.append(paymentType).append(" | "); |
| 838 | } | 838 | } |
| 839 | - // 目的地 外贸标准合同、外贸库存合同、外贸未锁规格合同、加工标准合同用 | 839 | + // 目的地 外贸标准合同、外贸库存合同、外贸未锁规格合同用 |
| 840 | if (StringUtils.isNotEmpty(orderInfo.getContractType()) && ("INTL_STD_CONTRACT".equals(orderInfo.getContractType()) | 840 | if (StringUtils.isNotEmpty(orderInfo.getContractType()) && ("INTL_STD_CONTRACT".equals(orderInfo.getContractType()) |
| 841 | || "INTL_INVENTORY_AGMT".equals(orderInfo.getContractType()) | 841 | || "INTL_INVENTORY_AGMT".equals(orderInfo.getContractType()) |
| 842 | - || "INTL_OPEN_SPEC_AGMT".equals(orderInfo.getContractType()) | ||
| 843 | - || "PROCESS_STD_AGMT".equals(orderInfo.getContractType()))) { | 842 | + || "INTL_OPEN_SPEC_AGMT".equals(orderInfo.getContractType()))) { |
| 844 | String foreignDestination = orderInfo.getForeignDestination(); | 843 | String foreignDestination = orderInfo.getForeignDestination(); |
| 845 | - destinationBuilder.append(foreignDestination); | ||
| 846 | - destinationBuilder.append(" | "); | 844 | + if (StringUtils.isNotBlank(foreignDestination) && !destinationSet.contains(foreignDestination)) { |
| 845 | + destinationSet.add(foreignDestination); | ||
| 846 | + destinationBuilder.append(foreignDestination); | ||
| 847 | + destinationBuilder.append(" | "); | ||
| 848 | + } | ||
| 847 | } else { | 849 | } else { |
| 848 | String destination = orderInfo.getDestination(); | 850 | String destination = orderInfo.getDestination(); |
| 849 | if (StringUtils.isNotBlank(destination) && !destinationSet.contains(destination)) { | 851 | if (StringUtils.isNotBlank(destination) && !destinationSet.contains(destination)) { |