提交代码

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

@@ -35,17 +35,19 @@ public class PDFWrite_nohead_36 {
         writer.setPdfVersion(PdfWriter.PDF_VERSION_1_2);//版本(默认1.4)
         doc.open();// 打开文档
         doc.setMargins(0,0,-20,0);
-
+        String dtoBarCode = pdfGoodsDto.getBarCode();
+        byte[] bytes = BarcodeUtil.generateBarCode128(dtoBarCode, 9.0d, 1.28d, false, true);
+        String uploadUrl = FileManager.upload(dtoBarCode + UUID.randomUUID().toString(), bytes, String.valueOf(bytes.length));
         // -----------------------标签头----------------------
         for (int i = 0; i < 9; i++) {
-            getPdfPTable(FontChinese11, bfHei, doc,pdfGoodsDto);
+            getPdfPTable(FontChinese11, bfHei, doc,pdfGoodsDto,uploadUrl);
         }
 
         doc.close();  //记得关闭document
 
     }
 
-    private static void getPdfPTable(Font fontChinese11, BaseFont bfHei, Document doc, PDFGoodsDto pdfGoodsDto) throws IOException, DocumentException {
+    private static void getPdfPTable(Font fontChinese11, BaseFont bfHei, Document doc, PDFGoodsDto pdfGoodsDto,String uploadUrl) throws IOException, DocumentException {
         PdfPTable table = new PdfPTable(4);
 
         // --------------产品名称-------------------------------
@@ -119,8 +121,7 @@ public class PDFWrite_nohead_36 {
         doc.add(table);
         String dtoBarCode = pdfGoodsDto.getBarCode();
         table = new PdfPTable(4);
-        byte[] bytes = BarcodeUtil.generateBarCode128(dtoBarCode, 9.0d, 1.28d, false, true);
-        String uploadUrl = FileManager.upload(dtoBarCode + UUID.randomUUID().toString(), bytes, String.valueOf(bytes.length));
+
         for (int i = 0; i < 4; i++) {
             // --------------底部黑色和条形码区域-------------------------------
             PdfPTable pdfPTable7 = new PdfPTable(2);

kmall-admin/src/main/resources/mybatis/mapper/GoodsDao.xml

@@ -692,7 +692,7 @@
             g.name as productName,
             g.english_name as englishName,
             rela.retail_price as price,
-            (rela.market_price - rela.retail_price ) as savings,
+            IFNULL((rela.market_price - rela.retail_price ),0) as savings,
             g.goods_rate as startFax,
             g.goods_rate as endFax,
             g.plu as plu,

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

@@ -79,8 +79,8 @@ let vm = new Vue({
                 alert("请先选择门店")
                 return;
             }
-            if (vm.q.sku==''){
-                alert("请先输入sku")
+            if (vm.q.sku=='' && vm.q.barCode==''){
+                alert("请先输入sku或者条形码")
                 return;
             }
 
@@ -92,15 +92,6 @@ let vm = new Vue({
             });
 		},
         barCodeEnter:function () {
-            if (vm.q.storeId==''){
-                alert("请先选择门店")
-                return;
-            }
-            if (vm.q.sku==''){
-                alert("请先输入sku")
-                return;
-            }
-
             this.exportPdf();
         }