Prechádzať zdrojové kódy

Merge remote-tracking branch 'origin/master'

24282 2 rokov pred
rodič
commit
484d9c0101

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

@@ -152,7 +152,7 @@ public class ContractServiceImpl extends BasicsServiceImpl<ContractMapper, Contr
                             if (StringUtils.equals(contract.getCurrencyType(), CurrencyTypeEnum.CURRENCY_TYPE_USD.getKey())) {
                                 claimAmount = claimAmount.add(claim.getExchangeRateToRmb());
                             } else {
-                                claimAmount = claimAmount.add(claim.getExchangeRateToRmb().divide(claim.getExchangeRate()).setScale(2, RoundingMode.HALF_UP));
+                                claimAmount = claimAmount.add(claim.getExchangeRateToRmb().divide(claim.getExchangeRate(),BigDecimal.ROUND_HALF_UP).setScale(2, RoundingMode.HALF_UP));
                             }
                         }
                     }

+ 1 - 0
bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/prove/pdf/service/impl/AfterSaleConfirmPdfServiceImpl.java

@@ -183,6 +183,7 @@ public class AfterSaleConfirmPdfServiceImpl implements IAfterSaleConfirmPdfServi
 
                 products.add(product);
             }
+            products = products.stream().sorted(Comparator.comparing(ShipmentPackingProduct::getCustomsCode).reversed()).collect(Collectors.toList());
             //产品总金额
             productSubtotal = products.stream().map(ShipmentPackingProduct::getSumPrice).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
             //产品总数量

+ 1 - 0
bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/prove/pdf/service/impl/CIPdfServiceImpl.java

@@ -163,6 +163,7 @@ public class CIPdfServiceImpl implements ICIPdfService {
 
                 products.add(product);
             }
+            products = products.stream().sorted(Comparator.comparing(ShipmentPackingProduct::getCustomsCode).reversed()).collect(Collectors.toList());
             //产品总金额
             productSubtotal = products.stream().map(ShipmentPackingProduct::getSumPrice).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
             //产品总数量

+ 3 - 0
bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/prove/pdf/service/impl/CommercialInvoicePdfServiceImpl.java

@@ -7,6 +7,7 @@ import com.fjhx.contract.entity.Contract;
 import com.fjhx.contract.entity.ContractProject;
 import com.fjhx.contract.service.IContractProjectService;
 import com.fjhx.contract.service.IContractService;
+import com.fjhx.product.entity.Product;
 import com.fjhx.prove.entity.BillProve;
 import com.fjhx.prove.pdf.service.ICommercialInvoicePdfService;
 import com.fjhx.prove.service.IBillProvePdfService;
@@ -163,6 +164,8 @@ public class CommercialInvoicePdfServiceImpl implements ICommercialInvoicePdfSer
 
                 products.add(product);
             }
+
+            products = products.stream().sorted(Comparator.comparing(ShipmentPackingProduct::getCustomsCode).reversed()).collect(Collectors.toList());
             //产品总金额
             productSubtotal = products.stream().map(ShipmentPackingProduct::getSumPrice).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
             //产品总数量

+ 1 - 1
bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/prove/pdf/service/impl/CustomsDeclareServiceImpl.java

@@ -183,7 +183,7 @@ public class CustomsDeclareServiceImpl implements ICustomsDeclareService {
             }
             sumCount = products.stream().mapToLong(ShipmentPackingProduct::getQuantity).sum();
         }
-
+        products = products.stream().sorted(Comparator.comparing(ShipmentPackingProduct::getCustomsCode).reversed()).collect(Collectors.toList());
         //装箱方式
         String outerPackagMethodName = "";
         if (CollectionUtils.isNotEmpty(products)) {

+ 1 - 0
bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/prove/pdf/service/impl/PIPdfServiceImpl.java

@@ -162,6 +162,7 @@ public class PIPdfServiceImpl implements IPIPdfService {
 
                 products.add(product);
             }
+            products = products.stream().sorted(Comparator.comparing(ShipmentPackingProduct::getCustomsCode).reversed()).collect(Collectors.toList());
             //产品总金额
             productSubtotal = products.stream().map(ShipmentPackingProduct::getSumPrice).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
             //产品总数量

+ 1 - 5
bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/prove/pdf/service/impl/PackingBillPdfServiceImpl.java

@@ -156,7 +156,6 @@ public class PackingBillPdfServiceImpl implements IPackingBillPdfService {
         if (CollectionUtils.isEmpty(packingProducts)) {
             return new HashMap<>();
         }
-
         Map<String, List<ShipmentPackingProduct>> map = new HashMap<>();
         // 按照箱子id分组
         Map<String, List<ShipmentPackingProduct>> collect = packingProducts.stream().collect(Collectors.groupingBy(ShipmentPackingProduct::getShipmentPackingId));
@@ -211,14 +210,11 @@ public class PackingBillPdfServiceImpl implements IPackingBillPdfService {
 
             JSONObject jsonObject = new JSONObject();
             List<JSONObject> values = new ArrayList<>();
-
             // 根据产品id-数量去重
-            ArrayList<ShipmentPackingProduct> products = list.stream()
-                    .collect(Collectors.collectingAndThen(
+            ArrayList<ShipmentPackingProduct> products = list.stream().collect(Collectors.collectingAndThen(
                             Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(obj -> obj.getProductId() + "-" + obj.getQuantity()))),
                             ArrayList::new)
                     );
-
             // 总箱数,根据箱子id去重
             // long boxTotal = list.stream().map(ShipmentPackingProduct::getShipmentPackingId).distinct().count();
             ArrayList<ShipmentPackingProduct> box = list.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(obj -> obj.getShipmentPackingId()))), ArrayList::new));

+ 1 - 1
bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/prove/pdf/service/impl/ProxyCustomsPowerAttorneyServiceImpl.java

@@ -138,7 +138,7 @@ public class ProxyCustomsPowerAttorneyServiceImpl implements IProxyCustomsPowerA
             customsCode = products.get(0).getCustomsCode();
             weight = products.stream().mapToInt(ShipmentPackingProduct::getQuantity).sum();
         }
-
+        products = products.stream().sorted(Comparator.comparing(ShipmentPackingProduct::getCustomsCode).reversed()).collect(Collectors.toList());
         //页面参数
         Map variablesMap = new HashMap<>();
         variablesMap.put("huaWeiUrl", iCommonService.getHuaWeiUrl());

+ 1 - 1
bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/shipment/mapper/ShipmentPackingProductMapper.xml

@@ -264,7 +264,7 @@
             AND t1.batch_code = #{batchCode}
         </where>
         ORDER BY
-            t1.create_time ASC
+            t2.product_name,t2.product_name_en
     </select>
 
     <select id="getIsAllPackByBatchCode" resultType="com.alibaba.fastjson.JSONObject">

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

@@ -10,8 +10,8 @@ public interface NacosConstant {
 	 * nacos 地址
 	 */
 //	String NACOS_ADDR = "127.0.0.1:8848";
-	String NACOS_ADDR = "139.9.184.42:8848";
-//	String NACOS_ADDR = "139.159.200.162:8848";
+//	String NACOS_ADDR = "139.9.184.42:8848";
+	String NACOS_ADDR = "139.9.100.1:8848";
 
 	/**
 	 * nacos 配置前缀