任务描述：

1、外销合同、样品单添加时，在产品右侧增加“上传附件”功能；
2、交接单中增加“查看附件”功能；
3、采购合同明细中，增加“查看附件”功能；

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/contract/service/impl/ContractFlowServiceImplV2.java

@@ -169,9 +169,9 @@ public class ContractFlowServiceImplV2 implements IContractFlowServiceV2 {
             String productId = entity.getProducts().get(0).getProductId();
             String countryId = entity.getCustomerCountryId();
             String code = CodeRuleUtil.getCode(CodeRuleTypeEnum.CODE_RULE_TYPE_3.getKey(), customerId, productId, countryId);
-            if (StringUtils.isBlank(code)) {
-                throw new ServiceException("获取外销合同编码异常。");
-            }
+//            if (StringUtils.isBlank(code)) {
+//                throw new ServiceException("获取外销合同编码异常。");
+//            }
             entity.setCode(code);
             // }
 

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/contract/service/impl/ContractProductServiceImpl.java

@@ -100,6 +100,7 @@ public class ContractProductServiceImpl extends BasicsServiceImpl<ContractProduc
         //产品id
         List<String> productIds = list.stream().map(ContractProduct::getProductId).distinct().collect(Collectors.toList());
         Map<String, List<Attachment>> attachmentMap = attachmentApi.getByBusiIdsToMap(productIds);
+        Map<String, List<Attachment>> attachmentCPMap = attachmentApi.getByBusiIdsToMap(ids);
         for (ContractProduct contractProduct : list) {
             //获取配件产品
             if (MapUtils.isNotEmpty(childMap)) {
@@ -123,8 +124,14 @@ public class ContractProductServiceImpl extends BasicsServiceImpl<ContractProduc
                     if (CollectionUtils.isNotEmpty(mianImags)) {
                         contractProduct.setProductMainImg(mianImags.get(0).getPath());
                     }
+                }
+
+            }
+            if(MapUtils.isNotEmpty(attachmentCPMap)){
+                List<Attachment> attachmentCps = attachmentCPMap.get(contractProduct.getId());
+                if (CollectionUtils.isNotEmpty(attachmentCps)) {
                     //获取其他产品附件
-                    List<Attachment> attr = attachments.stream().filter(obj -> obj.getBusiType() == AttachmentConstant.BusiType.PRODUCT).collect(Collectors.toList());
+                    List<Attachment> attr = attachmentCps.stream().filter(obj -> obj.getBusiType() == AttachmentConstant.BusiType.PRODUCT).collect(Collectors.toList());
                     if (CollectionUtils.isNotEmpty(attr)) {
                         contractProduct.setAttachments(attr);
                     }
@@ -248,6 +255,7 @@ public class ContractProductServiceImpl extends BasicsServiceImpl<ContractProduc
         // 查询产品附件
         List<String> productIds = list.stream().map(ContractProduct::getProductId).distinct().collect(Collectors.toList());
         Map<String, List<Attachment>> attsMap = attachmentApi.getByBusiIdsToMap(productIds);
+        Map<String, List<Attachment>> attsCPMap = attachmentApi.getByBusiIdsToMap(contractProductIds);
         for (ContractProduct product : list) {
             //获取待采购数量
             product.setProductUnCount(product.getQuantity());
@@ -272,6 +280,11 @@ public class ContractProductServiceImpl extends BasicsServiceImpl<ContractProduc
                     if (CollectionUtils.isNotEmpty(mianImags)) {
                         product.setProductMainImg(mianImags.get(0).getPath());
                     }
+                }
+            }
+            if(MapUtils.isNotEmpty(attsCPMap)){
+                List<Attachment> attachments = attsCPMap.get(product.getId());
+                if (CollectionUtils.isNotEmpty(attachments)) {
                     //获取产品附件
                     List<Attachment> attr = attachments.stream().filter(obj -> obj.getBusiType() == AttachmentConstant.BusiType.PRODUCT).collect(Collectors.toList());
                     if (CollectionUtils.isNotEmpty(attr)) {

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/purchase/service/impl/PurchaseContractProductServiceImpl.java

@@ -65,23 +65,28 @@ public class PurchaseContractProductServiceImpl extends BasicsServiceImpl<Purcha
         if (CollectionUtils.isEmpty(list)) {
             return new ArrayList<>();
         }
+        List<String> purchaseContractProductIds = list.stream().map(PurchaseContractProduct::getId).distinct().collect(Collectors.toList());
         //产品id
         List<String> productIds = list.stream().map(PurchaseContractProduct::getProductId).distinct().collect(Collectors.toList());
         Map<String, List<Attachment>> attachmentMap = attachmentApi.getByBusiIdsToMap(productIds);
-        if (MapUtils.isNotEmpty(attachmentMap)) {
-            for (PurchaseContractProduct purchaseProduct : list) {
+        Map<String, List<Attachment>> PcpAttachmentMap = attachmentApi.getByBusiIdsToMap(purchaseContractProductIds);
+        for (PurchaseContractProduct purchaseProduct : list) {
+            if (MapUtils.isNotEmpty(attachmentMap)) {
                 //获取出附件
                 List<Attachment> attachments = attachmentApi.getByBusiId(purchaseProduct.getProductId());
                 if (CollectionUtils.isNotEmpty(attachments)) {
-                    purchaseProduct.setAttachments(attachments);
-
                     //获取出主图
                     List<Attachment> mianImags = attachments.stream().filter(obj -> obj.getBusiType() == AttachmentConstant.BusiType.MIAN_IMAG).collect(Collectors.toList());
                     if (CollectionUtils.isNotEmpty(mianImags)) {
                         purchaseProduct.setProductMainImg(mianImags.get(0).getPath());
                     }
-                    //获取产品附件
-                    List<Attachment> attr = attachments.stream().filter(obj -> obj.getBusiType() == AttachmentConstant.BusiType.PRODUCT).collect(Collectors.toList());
+                }
+            }
+            if(MapUtils.isNotEmpty(PcpAttachmentMap)){
+                List<Attachment> attachmentCps = PcpAttachmentMap.get(purchaseProduct.getId());
+                if (CollectionUtils.isNotEmpty(attachmentCps)) {
+                    //获取其他产品附件
+                    List<Attachment> attr = attachmentCps.stream().filter(obj -> obj.getBusiType() == AttachmentConstant.BusiType.PRODUCT).collect(Collectors.toList());
                     if (CollectionUtils.isNotEmpty(attr)) {
                         purchaseProduct.setAttachments(attr);
                     }

bladex-tool/blade-core-launch/src/main/java/org/springblade/core/launch/constant/NacosConstant.java

@@ -9,8 +9,8 @@ public interface NacosConstant {
 	/**
 	 * nacos 地址
 	 */
-	String NACOS_ADDR = "127.0.0.1:8848";
-//	String NACOS_ADDR = "139.9.184.42:8848";
+//	String NACOS_ADDR = "127.0.0.1:8848";
+	String NACOS_ADDR = "139.9.184.42:8848";
 //	String NACOS_ADDR = "139.159.200.162:8848";
 
 	/**