优化一二线pdf导出

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qyfrontlinewarehouse/service/impl/QyFrontlineWarehouseServiceImpl.java

@@ -189,11 +189,17 @@ public class QyFrontlineWarehouseServiceImpl extends ServiceImpl<QyFrontlineWare
         PdfWriter.getInstance(document, os);
         document.open();
 
+        String headName = "入库凭证";
+
+        if("1".equals(qyFrontlineWarehouse.getWarehouseType())){
+           headName = "出库凭证";
+        }
+
         //创建表格
         PdfPTable pdfPTable = CommonPdfUtil.createPdfPTable(7);
 
         //设置表头
-        PdfPCell firstHead = CommonPdfUtil.createCenterPdfPCell("入库凭证", 2, 7, CommonPdfUtil.BOLDFONT);
+        PdfPCell firstHead = CommonPdfUtil.createCenterPdfPCell(headName, 2, 7, CommonPdfUtil.BOLDFONT);
         pdfPTable.addCell(firstHead);
 
         //设置账册编号

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qyinwarehouse/entity/QyInWarehouse.java

@@ -283,31 +283,41 @@ public class QyInWarehouse {
     @ExcelProperty(index = 41,value = "仓位代码")
     private String cwdm;
 
+    @Schema(description = "货物来源单证类型")
+    @ColumnWidth(12)
+    @ExcelProperty(index = 42,value = "货物来源单证类型")
+    private String hwlyType;
+
+    @Schema(description = "货物来源单证类型")
+    @ColumnWidth(12)
+    @ExcelProperty(index = 43,value = "货物来源单证编号")
+    private String hwlyCode;
+
     /** 创建时间 */
     @Schema(description = "创建时间")
     @ColumnWidth(12)
-    @ExcelProperty(index = 42,value = "创建时间")
+    @ExcelProperty(index = 44,value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     /** 创建人 */
     @Schema(description = "创建人")
     @ColumnWidth(12)
-    @ExcelProperty(index = 43,value = "创建人")
+    @ExcelProperty(index = 45,value = "创建人")
     @TableField(fill = FieldFill.INSERT)
     private String createUser;
 
     /** 更新时间 */
     @Schema(description = "更新时间")
     @ColumnWidth(12)
-    @ExcelProperty(index = 44,value = "更新时间")
+    @ExcelProperty(index = 46,value = "更新时间")
     @TableField(fill = FieldFill.UPDATE)
     private Date updateTime;
 
     /** 更新人 */
     @Schema(description = "更新人")
     @ColumnWidth(12)
-    @ExcelProperty(index = 45,value = "更新人")
+    @ExcelProperty(index = 7,value = "更新人")
     @TableField(fill = FieldFill.UPDATE)
     private Date updateUser;
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qyoutwarehouse/entity/QyOutWarehouse.java

@@ -283,31 +283,41 @@ public class QyOutWarehouse {
     @ExcelProperty(index = 41,value = "仓位代码")
     private String cwdm;
 
+    @Schema(description = "货物来源单证类型")
+    @ColumnWidth(12)
+    @ExcelProperty(index = 42,value = "货物来源单证类型")
+    private String hwlyType;
+
+    @Schema(description = "货物来源单证类型")
+    @ColumnWidth(12)
+    @ExcelProperty(index = 43,value = "货物来源单证编号")
+    private String hwlyCode;
+
     /** 创建时间 */
     @Schema(description = "创建时间")
     @ColumnWidth(12)
-    @ExcelProperty(index = 42,value = "创建时间")
+    @ExcelProperty(index = 44,value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     /** 创建人 */
     @Schema(description = "创建人")
     @ColumnWidth(12)
-    @ExcelProperty(index = 43,value = "创建人")
+    @ExcelProperty(index = 45,value = "创建人")
     @TableField(fill = FieldFill.INSERT)
     private String createUser;
 
     /** 更新时间 */
     @Schema(description = "更新时间")
     @ColumnWidth(12)
-    @ExcelProperty(index = 44,value = "更新时间")
+    @ExcelProperty(index = 46,value = "更新时间")
     @TableField(fill = FieldFill.UPDATE)
     private Date updateTime;
 
     /** 更新人 */
     @Schema(description = "更新人")
     @ColumnWidth(12)
-    @ExcelProperty(index = 45,value = "更新人")
+    @ExcelProperty(index = 47,value = "更新人")
     @TableField(fill = FieldFill.UPDATE)
     private Date updateUser;
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinewarehouse/service/impl/QySecondlineWarehouseServiceImpl.java

@@ -186,7 +186,7 @@ public class QySecondlineWarehouseServiceImpl extends ServiceImpl<QySecondlineWa
         PdfPTable pdfPTable = CommonPdfUtil.createPdfPTable(7);
 
         //设置表头
-        PdfPCell firstHead = CommonPdfUtil.createCenterPdfPCell("入库凭证", 2, 7, CommonPdfUtil.BOLDFONT);
+        PdfPCell firstHead = CommonPdfUtil.createCenterPdfPCell("出库凭证", 2, 7, CommonPdfUtil.BOLDFONT);
         pdfPTable.addCell(firstHead);
 
         //设置账册编号