生产指示书额外添加一栏 Modelo(REFERNCR)

chenhang4442024
1 parent f0b0fac0
Showing 2 changed files with 28 additions and 22 deletions
src/main/java/com/order/erp/common/utils/EasyPdfUtils.java
src/main/java/com/order/erp/domain/pdf/OrderProducePdfVO.java
@@ -349,19 +349,20 @@ public class EasyPdfUtils {
         }
         rowList.add(XEasyPdfHandler.Table.Row.build(header));
         // 第一行设置表头，默认标题
-        cellList.add(createCell("编号", 90F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        cellList.add(createCell("编号", 50F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
         cellList.add(createCell("项目号", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
-        cellList.add(createCell("生产科", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        cellList.add(createCell("生产科", 90F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
         cellList.add(createCell("内部编号", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
         cellList.add(createCell("客户订单号", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
         cellList.add(createCell("客户款号", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
-        cellList.add(createCell("订单颜色", 140F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
-        cellList.add(createCell("颜色中文", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        cellList.add(createCell("REFERENCE", 100F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        cellList.add(createCell("订单颜色", 120F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        cellList.add(createCell("颜色中文", 100F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
         cellList.add(createCell("订单图片", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
         cellList.add(createCell("产品意见", 150F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
         cellList.add(createCell("订单数量", 90F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
         cellList.add(createCell("生产科交期", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
-        cellList.add(createCell("包装类型", 90F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        cellList.add(createCell("包装类型", 80F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
         cellList.add(createCell("生产科单价", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
         cellList.add(createCell("生产科总价", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
         rowList.add(XEasyPdfHandler.Table.Row.build(cellList));
@@ -372,14 +373,15 @@ public class EasyPdfUtils {
                     DateUtils.format(DateUtils.parseDate(producePdfVO.getProductionDepartmentConsignTime(), DateUtils.DATE_TIME), DateUtils.DATE) : "";
             List<XEasyPdfCell> dataCellList = new ArrayList<>(15);
-            dataCellList.add(createCell("" + (startIndex + i), 90F)); // 使用连续编号
+            dataCellList.add(createCell("" + (startIndex + i), 50F)); // 使用连续编号
             dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getProjectNo()) ? producePdfVO.getProjectNo() : "", 110F));
-            dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getProductionDepartment()) ? producePdfVO.getProductionDepartment() : "", 110F));
+            dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getProductionDepartment()) ? producePdfVO.getProductionDepartment() : "", 90F));
             dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getInnerNo()) ? producePdfVO.getInnerNo() : "", 110F));
             dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getCustomerPo()) ? producePdfVO.getCustomerPo() : "", 110F));
             dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getCustomerStyle()) ? producePdfVO.getCustomerStyle() : "", 110F));
-            dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getPoColor()) ? producePdfVO.getPoColor() : "", 140F));
-            dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getCnColor()) ? producePdfVO.getCnColor() : "", 110F));
+            dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getModeleLo()) ? producePdfVO.getModeleLo() : "", 100F));
+            dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getPoColor()) ? producePdfVO.getPoColor() : "", 120F));
+            dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getCnColor()) ? producePdfVO.getCnColor() : "", 100F));
             if (StringUtils.isNotBlank(producePdfVO.getPicUrl())) {
                 URL url = new URL(producePdfVO.getPicUrl());
                 InputStream inputStream = url.openStream();
@@ -396,29 +398,30 @@ public class EasyPdfUtils {
                 dataCellList.add(createCell("" + producePdfVO.getOrderCount(), 90F));
             }
             dataCellList.add(createCell(productionDepartmentConsignTime, 110F));
-            dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getPacketType()) ? producePdfVO.getPacketType() : "", 90F));
-            dataCellList.add(createCell(Objects.nonNull(producePdfVO.getProductionDepartmentPrice()) ? "" + producePdfVO.getProductionDepartmentPrice()+"￥" : "", 110F));
-            dataCellList.add(createCell(Objects.nonNull(producePdfVO.getProductionDepartmentTotalPrice()) ? "" + producePdfVO.getProductionDepartmentTotalPrice()+"￥" : "", 110F));
+            dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getPacketType()) ? producePdfVO.getPacketType() : "", 80F));
+            dataCellList.add(createCell(Objects.nonNull(producePdfVO.getProductionDepartmentPrice()) ? "" + "￥"+producePdfVO.getProductionDepartmentPrice() : "", 110F));
+            dataCellList.add(createCell(Objects.nonNull(producePdfVO.getProductionDepartmentTotalPrice()) ? "" + "￥"+producePdfVO.getProductionDepartmentTotalPrice() : "", 110F));
             rowList.add(XEasyPdfHandler.Table.Row.build(dataCellList));
         }
         if (isLastPage) {
             List<XEasyPdfCell> endCellList = new ArrayList<>(15);
-            endCellList.add(createCell("合计", 90F, 16F));
-            endCellList.add(createCell("", 110F));
-            endCellList.add(createCell("", 110F));
+            endCellList.add(createCell("合计", 50F, 16F));
             endCellList.add(createCell("", 110F));
+            endCellList.add(createCell("", 90F));
             endCellList.add(createCell("", 110F));
             endCellList.add(createCell("", 110F));
-            endCellList.add(createCell("", 140F));
             endCellList.add(createCell("", 110F));
+            endCellList.add(createCell("", 100F));
+            endCellList.add(createCell("", 120F));
+            endCellList.add(createCell("", 100F));
             endCellList.add(createCell("", 110F));
             endCellList.add(createCell("", 150F));
             endCellList.add(createCell("" + totalOrderCount, 90F, 16F));
             endCellList.add(createCell("", 110F));
-            endCellList.add(createCell("", 90F));
+            endCellList.add(createCell("", 80F));
             endCellList.add(createCell("", 110F));
-            endCellList.add(createCell("" + totalPrice+"￥", 110F, 16F));
+            endCellList.add(createCell("￥" + totalPrice, 110F, 16F));
             rowList.add(XEasyPdfHandler.Table.Row.build(endCellList));
         }
@@ -426,10 +429,10 @@ public class EasyPdfUtils {
         ClassLoader classLoader = getClass().getClassLoader();
         InputStream imageStream = null;
         if ("青岛吉庆天成饰品有限公司".equals(companyName)) {
-            signList.add(createCell("吉庆天成签字+日期：", 640F, 80F, 20F, XEasyPdfDefaultFontStyle.BOLD, XEasyPdfPositionStyle.CENTER, XEasyPdfPositionStyle.LEFT));
+            signList.add(createCell("吉庆天成签字+日期：", 680F, 80F, 20F, XEasyPdfDefaultFontStyle.BOLD, XEasyPdfPositionStyle.CENTER, XEasyPdfPositionStyle.LEFT));
             imageStream = classLoader.getResourceAsStream("images/jqtc.png");
         } else {
-            signList.add(createCell("翱特逸格签字+日期：", 640F, 80F, 20F, XEasyPdfDefaultFontStyle.BOLD, XEasyPdfPositionStyle.CENTER, XEasyPdfPositionStyle.LEFT));
+            signList.add(createCell("翱特逸格签字+日期：", 680F, 80F, 20F, XEasyPdfDefaultFontStyle.BOLD, XEasyPdfPositionStyle.CENTER, XEasyPdfPositionStyle.LEFT));
             imageStream  = classLoader.getResourceAsStream("images/alterego.png");
         }
         if (imageStream != null) {
@@ -448,7 +451,7 @@ public class EasyPdfUtils {
             log.info("图片资源未找到或不存在");
         }
-        signList.add(createCell("外加工签字+日期：", 1020F, 80F, 20F, XEasyPdfDefaultFontStyle.BOLD, XEasyPdfPositionStyle.CENTER, XEasyPdfPositionStyle.LEFT).setMarginLeft(230F));
+        signList.add(createCell("外加工签字+日期：", 980F, 80F, 20F, XEasyPdfDefaultFontStyle.BOLD, XEasyPdfPositionStyle.CENTER, XEasyPdfPositionStyle.LEFT).setMarginLeft(230F));
         rowList.add(XEasyPdfHandler.Table.Row.build(signList));
         table.addRow(rowList);
@@ -45,7 +45,10 @@ public class OrderProducePdfVO implements Serializable {
      * 客户STYLE#(客户款号)
      */
     private String customerStyle;
-
+    /**
+     * Modelo(REFERENCE)
+     */
+    private String modeleLo;
     /**
      * PO COLOR (订单颜色)
      */