天线0托不显示

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

@@ -2403,7 +2403,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
             }
             if (notifyHeader.getBuNo().equals("04-MHM")) {
                 designationContent = designationContent + "\n"+(data.getHsCodeDescType()!=null&& data.getHsCodeDescType().equals("N")
-                        ?(eorder.get("hsCodeDescEn")!=null?eorder.get("hsCodeDescEn"):"") :eorder.get("hsCodeDesc"));
+                        ?(eorder.get("hsCodeDescEn")!=null?eorder.get("hsCodeDescEn"):"") :(eorder.get("hsCodeDesc")!=null?eorder.get("hsCodeDesc"):""));
             }
             eorder.put("designation", designationContent);
 
@@ -2564,7 +2564,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
                     displayedPalletSeqSet.add(palletSeqNo);
                 }
                 Integer palletQty = palletQtyMap.get(palletSeqNo);
-                eorder.put("total_pallets", showPalletQty ? (palletQty != null ? palletQty : 1) : "");
+                eorder.put("total_pallets", showPalletQty ? (palletQty != null ? palletQty : "") : "");
                 eorder.put("volume", isFirstRow ? volume : "");
                 //eorder.put("gross_weight", isFirstRow ? ((BigDecimal) list.get(m).get("gross_weight")).setScale(2, RoundingMode.HALF_UP) : "");
                 eorder.put("net_weight",isFirstRow ? ((BigDecimal) list.get(m).get("net_weight")).setScale(2, RoundingMode.HALF_UP) : "");
@@ -2650,13 +2650,14 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
             template.addVar("pallet_weight_name", palletWeight.compareTo(BigDecimal.ZERO)==0?"":"pallet weight：");
             template.addVar("pallet_weight", palletWeight.compareTo(BigDecimal.ZERO)==0?"":palletWeight.setScale(0, RoundingMode.HALF_UP));
         }
-        String plt = "CTN";
-        if (!palletHeaderDataList.isEmpty()) {
-            plt = "PLT";
-        } else {
-            totalPlt = totalCartons.setScale(0, RoundingMode.HALF_UP).intValue();
+        if (palletHeaderDataList.isEmpty()) {
+            totalPlt = 0;
+        }
+        if (totalPlt>0) {
+            template.addVar("total_plt", totalPlt+"PLT");
+            template.addVar("plt(", "(=");
+            template.addVar("plt)", ")");
         }
-        template.addVar("total_plt", totalPlt+plt);
         // 孟加拉需要的
         if (data.getMaterial()!=null && data.getMaterial()) {
             template.addVar("RFIDBase", "RFID Base Material");
@@ -2817,7 +2818,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
                 Integer palletQty = palletQtyMap.get(palletSeqNo);
                 // 第一列展示托号（pallet_no），按托盘首行显示，后续行留空再做按托合并
                 eorder.put("seq_no", showPalletQty ? palletNo : "");
-                eorder.put("total_pallets", showPalletQty ? (palletQty != null ? palletQty : 1) : "");
+                eorder.put("total_pallets", showPalletQty ? (palletQty != null ? palletQty : "") : "");
                 eorder.put("volume", isFirstRow ? volume : "");
                 eorder.put("gross_weight", isFirstRow ? ((BigDecimal) list.get(m).get("gross_weight")).setScale(2, RoundingMode.HALF_UP) : "");
                 eorder.put("net_weight", isFirstRow ? ((BigDecimal) list.get(m).get("net_weight")).setScale(2, RoundingMode.HALF_UP) : "");
@@ -3063,7 +3064,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
                 Integer palletQty = palletQtyMap.get(palletSeqNo);
                 // 第一列展示托号（pallet_no），按托盘首行显示，后续行留空再做按托合并
                 eorder.put("seq_no", showPalletQty ? palletNo : "");
-                eorder.put("total_pallets", showPalletQty ? (palletQty != null ? palletQty : 1) : "");
+                eorder.put("total_pallets", showPalletQty ? (palletQty != null ? palletQty : "") : "");
                 eorder.put("volume", isFirstRow ? volume : "");
                 eorder.put("gross_weight", isFirstRow ? ((BigDecimal) list.get(m).get("gross_weight")).setScale(2, RoundingMode.HALF_UP) : "");
                 eorder.put("net_weight", isFirstRow ? ((BigDecimal) list.get(m).get("net_weight")).setScale(2, RoundingMode.HALF_UP) : "");