FSC Mix Credit SGSHK-COC-321321

src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java

@@ -2597,9 +2597,10 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
                         .collect(Collectors.groupingBy(PartSubPropertiesValue::getPropertiesItemNo));
                 int qty = ((BigDecimal)eorder.get("qty")).setScale(0, RoundingMode.HALF_UP).intValue();
                 BigDecimal fscW = fscWeight(partNoAndItemNoMap,partNo, qty, nodifyData.getLossratio());
-                lossratio = "\n" + (nodifyData.getEhundred()!=null && StringUtils.isNotEmpty(nodifyData.getEhundred())
-                        ?"E100-"+nodifyData.getEhundred():"")
-                        +"                        "+ (fscW.compareTo(BigDecimal.ZERO)>0?"重量："+ fscW :"");
+                lossratio = (fscW.compareTo(BigDecimal.ZERO)>0?"\n"+"FSC Mix Credit SGSHK-COC-321321":"")+
+                        "\n" + (nodifyData.getEhundred()!=null && StringUtils.isNotEmpty(nodifyData.getEhundred())
+                        ?"E100-"+nodifyData.getEhundred()+ "                        ":"")
+                        + (fscW.compareTo(BigDecimal.ZERO)>0?"重量："+ fscW :"");
             }
             String hsCodeDesc = data.getHsCodeDesc()!=null&& data.getHsCodeDesc()?
                     ("\n"+(data.getHsCodeDescTypeInvoice()!=null&& data.getHsCodeDescTypeInvoice().equals("N")
@@ -2756,8 +2757,9 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
                     Map<String, List<PartSubPropertiesValueData>> partNoAndItemNoMap = propertiesValues.stream()
                             .collect(Collectors.groupingBy(PartSubPropertiesValue::getPropertiesItemNo));
                     BigDecimal fscW = fscWeight(partNoAndItemNoMap,partNo, qty, nodifyData.getLossratio());
-                    lossratio = "\n" + (StringUtils.isNotEmpty(nodifyData.getEhundred())?"E100-"+nodifyData.getEhundred():"")
-                            +"                        "+ (fscW.compareTo(BigDecimal.ZERO)>0?"重量："+ fscW :"");
+                    lossratio = (fscW.compareTo(BigDecimal.ZERO)>0?"\n"+"FSC Mix Credit SGSHK-COC-321321":"")+
+                            "\n" + (StringUtils.isNotEmpty(nodifyData.getEhundred())?"E100-"+nodifyData.getEhundred()+"                        ":"")
+                            + (fscW.compareTo(BigDecimal.ZERO)>0?"重量："+ fscW :"");
                 }
                 String hsCodeDesc = "";
                 if (notifyHeader.getBuNo().equals("04-MHM") || notifyHeader.getBuNo().equals("02-Hardtag")) {
@@ -3067,9 +3069,10 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
                     Map<String, List<PartSubPropertiesValueData>> partNoAndItemNoMap = propertiesValues.stream()
                             .collect(Collectors.groupingBy(PartSubPropertiesValue::getPropertiesItemNo));
                     BigDecimal fscW = fscWeight(partNoAndItemNoMap,partNo, qty, nodifyData.getLossratio());
-                    lossratio = "\n" + (StringUtils.isNotEmpty(nodifyData.getEhundred()) ?
-                        "E100-" + nodifyData.getEhundred() : "")
-                            + "                        " + (fscW.compareTo(BigDecimal.ZERO)>0?"重量："+ fscW:"");
+                    lossratio = (fscW.compareTo(BigDecimal.ZERO)>0?"\n"+"FSC Mix Credit SGSHK-COC-321321":"")+
+                            "\n" + (StringUtils.isNotEmpty(nodifyData.getEhundred()) ?
+                        "E100-" + nodifyData.getEhundred()+ "                        " : "")
+                             + (fscW.compareTo(BigDecimal.ZERO)>0?"重量："+ fscW:"");
                 }
 
                 String hsCodeDesc = "";