Merge branch 'master' of xwh/kmall-pt-general into master

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite.java

@@ -46,7 +46,11 @@ public class PDFWrite {
         // --------------产品名称-------------------------------
         PdfPTable pdfPTable2 = new PdfPTable(1);
         Font font = new Font(bfHei, 60);
+        if (pdfGoodsDto.getProductName().length()>30){
+            font = new Font(bfHei,30);
+        }
         Paragraph tParagraph = new Paragraph(pdfGoodsDto.getProductName(), font);
+
         PdfPCell nameCell = new PdfPCell(tParagraph);
         nameCell.setBorder(0);
         nameCell.setHorizontalAlignment(Element.ALIGN_CENTER); // 水平居中
@@ -60,6 +64,9 @@ public class PDFWrite {
         // --------------产品英文名称-------------------------------
         PdfPTable pdfPTable3 = new PdfPTable(1);
         font = new Font(bfHei, 30);
+        if (pdfGoodsDto.getEnglishName().length()>50){
+            font = new Font(bfHei,15);
+        }
         Paragraph englistPararaph = new Paragraph(pdfGoodsDto.getEnglishName(), font);
         PdfPCell englishNameCell = new PdfPCell(englistPararaph);
         englishNameCell.setBorder(0);

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_12.java

@@ -70,7 +70,12 @@ public class PDFWrite_12 {
         table = new PdfPTable(3);
 
         for (int i = 0; i < 3; i++) {
-            setTable(bfHei, table, 16, pdfGoodsDto.getProductName());
+            if (pdfGoodsDto.getProductName().length()>20){
+                setTable(bfHei, table, 8, pdfGoodsDto.getProductName());
+            }else{
+                setTable(bfHei, table, 16, pdfGoodsDto.getProductName());
+            }
+
         }
 
         doc.add(table);
@@ -90,7 +95,12 @@ public class PDFWrite_12 {
         table = new PdfPTable(3);
 
         for (int i = 0; i < 3; i++) {
-            setTable(bfHei, table, 12, pdfGoodsDto.getEnglishName());
+            if (pdfGoodsDto.getEnglishName().length()>50){
+                setTable(bfHei, table, 6, pdfGoodsDto.getEnglishName());
+            }else{
+                setTable(bfHei, table, 12, pdfGoodsDto.getEnglishName());
+            }
+
         }
         doc.add(table);
 

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_18.java

@@ -70,7 +70,12 @@ public class PDFWrite_18 {
         table = new PdfPTable(6);
 
         for (int i = 0; i < 6; i++) {
-            setTable(bfHei, table, 16, pdfGoodsDto.getProductName());
+            if (pdfGoodsDto.getProductName().length()>20){
+                setTable(bfHei, table, 12, pdfGoodsDto.getProductName());
+            }else{
+                setTable(bfHei, table, 16, pdfGoodsDto.getProductName());
+            }
+
         }
 
         doc.add(table);
@@ -90,7 +95,12 @@ public class PDFWrite_18 {
         table = new PdfPTable(6);
 
         for (int i = 0; i < 6; i++) {
-            setTable(bfHei, table, 10, pdfGoodsDto.getEnglishName());
+            if (pdfGoodsDto.getEnglishName().length()>50){
+                setTable(bfHei, table, 5, pdfGoodsDto.getEnglishName());
+            }else{
+                setTable(bfHei, table, 10, pdfGoodsDto.getEnglishName());
+            }
+
         }
         doc.add(table);
 

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_36.java

@@ -73,7 +73,12 @@ public class PDFWrite_36 {
         table = new PdfPTable(6);
 
         for (int i = 0; i < 6; i++) {
-            setTable(bfHei, table, 11, pdfGoodsDto.getProductName());
+            if (pdfGoodsDto.getProductName().length()>20){
+                setTable(bfHei, table, 5, pdfGoodsDto.getProductName());
+            }else{
+                setTable(bfHei, table, 11, pdfGoodsDto.getProductName());
+            }
+
         }
 
         doc.add(table);
@@ -94,7 +99,12 @@ public class PDFWrite_36 {
         table = new PdfPTable(6);
 
         for (int i = 0; i < 6; i++) {
-            setTable(bfHei, table, 7, pdfGoodsDto.getEnglishName());
+            if (pdfGoodsDto.getEnglishName().length()>50){
+                setTable(bfHei, table, 5, pdfGoodsDto.getEnglishName());
+            }else{
+                setTable(bfHei, table, 7, pdfGoodsDto.getEnglishName());
+            }
+
         }
         doc.add(table);
 

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_4.java

@@ -64,7 +64,12 @@ public class PDFWrite_4 {
         table = new PdfPTable(2);
 
         for (int i = 0; i < 2; i++) {
-            setTable(bfHei, table, 40, pdfGoodsDto.getProductName());
+            if (pdfGoodsDto.getProductName().length()>20){
+                setTable(bfHei, table, 25, pdfGoodsDto.getProductName());
+            }else{
+                setTable(bfHei, table, 40, pdfGoodsDto.getProductName());
+            }
+
         }
 
         doc.add(table);
@@ -84,7 +89,11 @@ public class PDFWrite_4 {
         table = new PdfPTable(2);
 
         for (int i = 0; i < 2; i++) {
-            setTable(bfHei, table, 20, pdfGoodsDto.getEnglishName());
+            if (pdfGoodsDto.getEnglishName().length()>50){
+                setTable(bfHei, table, 13, pdfGoodsDto.getEnglishName());
+            }else{
+                setTable(bfHei, table, 20, pdfGoodsDto.getEnglishName());
+            }
         }
         doc.add(table);
 

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_9.java

@@ -68,7 +68,12 @@ public class PDFWrite_9 {
         table = new PdfPTable(3);
 
         for (int i = 0; i < 3; i++) {
-            setTable(bfHei, table, 22, pdfGoodsDto.getProductName());
+            if (pdfGoodsDto.getProductName().length()>20){
+                setTable(bfHei, table, 14, pdfGoodsDto.getProductName());
+            }else{
+                setTable(bfHei, table, 22, pdfGoodsDto.getProductName());
+            }
+
         }
 
         doc.add(table);
@@ -88,7 +93,12 @@ public class PDFWrite_9 {
         table = new PdfPTable(3);
 
         for (int i = 0; i < 3; i++) {
-            setTable(bfHei, table, 14, pdfGoodsDto.getEnglishName());
+            if (pdfGoodsDto.getEnglishName().length()>50){
+                setTable(bfHei, table, 7, pdfGoodsDto.getEnglishName());
+            }else{
+                setTable(bfHei, table, 14, pdfGoodsDto.getEnglishName());
+            }
+
         }
         doc.add(table);
 

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_nohead_36.java

@@ -54,7 +54,12 @@ public class PDFWrite_nohead_36 {
         table = new PdfPTable(4);
 
         for (int i = 0; i < 4; i++) {
-            setTable(bfHei, table, 10, pdfGoodsDto.getProductName());
+            if (pdfGoodsDto.getProductName().length()>20){
+                setTable(bfHei, table, 5, pdfGoodsDto.getProductName());
+            }else{
+                setTable(bfHei, table, 10, pdfGoodsDto.getProductName());
+            }
+
         }
 
         doc.add(table);
@@ -65,7 +70,12 @@ public class PDFWrite_nohead_36 {
         table = new PdfPTable(4);
 
         for (int i = 0; i < 4; i++) {
-            setTable(bfHei, table, 7, pdfGoodsDto.getEnglishName());
+            if (pdfGoodsDto.getEnglishName().length()>50){
+                setTable(bfHei, table, 5, pdfGoodsDto.getEnglishName());
+            }else{
+                setTable(bfHei, table, 7, pdfGoodsDto.getEnglishName());
+            }
+
         }
         doc.add(table);
 

kmall-admin/src/main/webapp/js/shop/goodsexportpdf.js

@@ -83,6 +83,10 @@ let vm = new Vue({
                 alert("请先输入sku或者条形码")
                 return;
             }
+            if (vm.q.isHead=='1' && vm.q.headUrl==''){
+                alert("请先标签头")
+                return;
+            }
 
             window.open("../pdf/printPdf?type="+vm.q.pdfType+"&sku="+vm.q.sku+"&prodBarcode="+vm.q.barCode+"&head="+vm.q.isHead+"&headUrl="+vm.q.headUrl+"&storeId="+vm.q.storeId);