[pdf 模版提交]

f6375080 · 133 · f6917f06 · f6375080 · f6375080 · f6375080
--- a/dev-file/src/main/java/com/tykj/dev/device/file/Controller/FileController.java
+++ b/dev-file/src/main/java/com/tykj/dev/device/file/Controller/FileController.java
@@ -122,10 +122,34 @@ public class FileController {
    @PostMapping("/printCheck")
    public ResponseEntity printCheck(@RequestBody Confirm confirm) {
        String[] content = JavaToPdfHtmlFreeMarker.freeMarkerRenderVerification2(confirm,url+"htmlModel/");
-        log.info("[file] 调用了生成确认单据对接口 confirm");
+        log.info("[file] 调用了生成核查确认单对接口 confirm");
+        return ResponseEntity.ok(JavaToPdfHtmlFreeMarker.createPdf90(content,url,preview,"confirm/"));
+    }
+
+
+    /**
+     * 生成单据 导出设备相关信息 核查的模版
+     * @return
+     */
+    @ApiOperation(value = "生成单据 导出设备相关信息 核查的模版")
+    @PostMapping("/exportDdevice")
+    public ResponseEntity exportDdevice(@RequestBody Confirm confirm) {
+        String[] content = JavaToPdfHtmlFreeMarker.freeMarkerRenderExportDevice(confirm,url+"htmlModel/");
+        log.info("[file] 调用了生成设备相关信息单据对接口 核查模版");
        return ResponseEntity.ok(JavaToPdfHtmlFreeMarker.createPdf90(content,url,preview,"confirm/"));
    }

+    /**
+     * 生成单据 导出设备相关信息 出入库类模版
+     */
+    @ApiOperation(value = "生成单据")
+    @PostMapping("/exportDdevice1")
+    public ResponseEntity exportDdevice1(@RequestBody Documents documents) throws IOException, DocumentException {
+        String[] content = JavaToPdfHtmlFreeMarker.freeMarkerRender(documents,url+"htmlModel/");
+        log.info("[file] 调用了生成出入单据对接口 出入库单据");
+        return ResponseEntity.ok(JavaToPdfHtmlFreeMarker.createPdf(content,url,preview,"documents/"));
+    }
+

    /**
     * 生成单据 确认单据合并

--- a/dev-file/src/main/java/com/tykj/dev/device/file/entity/DocumentDevice.java
+++ b/dev-file/src/main/java/com/tykj/dev/device/file/entity/DocumentDevice.java
@@ -55,6 +55,12 @@ public class DocumentDevice {
    @ApiModelProperty(value = "状态")
    private String status;

+    @ApiModelProperty
+    private String store;
+
+    @ApiModelProperty
+    private String ownUnit;
+
    private Integer oneCount;

    public Integer getLen(){

--- a/dev-file/src/main/java/com/tykj/dev/device/file/entity/ExportDevice.java
+++ b/dev-file/src/main/java/com/tykj/dev/device/file/entity/ExportDevice.java
+package com.tykj.dev.device.file.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName Check.java
+ * @Description TODO
+ * @createTime 2021年07月22日 12:29:00
+ */
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class ExportDevice {
+    private String model;
+
+    private String name;
+
+    private List<String> strings;
+
+    private Integer count;
+
+    private String seqStirng;
+
+    private Integer oneCount;
+
+    private String store;
+
+    private String ownUnit;
+
+}
--- a/dev-file/src/main/java/com/tykj/dev/device/file/service/Impl/PdfServiceImpl.java
+++ b/dev-file/src/main/java/com/tykj/dev/device/file/service/Impl/PdfServiceImpl.java
@@ -37,7 +37,7 @@ public class PdfServiceImpl implements PdfService {
    }

    private DocumentDevice toDocDev(ScriptSaveVo scriptSaveVo){
-       return new DocumentDevice(null,scriptSaveVo.getModel(),null,scriptSaveVo.getType(),scriptSaveVo.getSecretLevel(),scriptSaveVo.getInvisibleRange(),scriptSaveVo.getNum(),scriptSaveVo.getSeqNumber(),null,scriptSaveVo.getRemark(),null,null,null);
+       return new DocumentDevice(null,scriptSaveVo.getModel(),null,scriptSaveVo.getType(),scriptSaveVo.getSecretLevel(),scriptSaveVo.getInvisibleRange(),scriptSaveVo.getNum(),scriptSaveVo.getSeqNumber(),null,scriptSaveVo.getRemark(),null,null,null,null,null);
    }

 }
--- a/dev-file/src/main/java/com/tykj/dev/device/file/util/JavaToPdfHtmlFreeMarker.java
+++ b/dev-file/src/main/java/com/tykj/dev/device/file/util/JavaToPdfHtmlFreeMarker.java
--- a/dev-union/src/main/resources/bill10.html
+++ b/dev-union/src/main/resources/bill10.html
--- a/dev-union/src/main/resources/bill11.html
+++ b/dev-union/src/main/resources/bill11.html
--- a/dev-union/src/main/resources/bill7.html
+++ b/dev-union/src/main/resources/bill7.html
 <!DOCTYPE html>
 <html lang="en">
-<!--自查确认-->
+<!--自查确认 不使用-->
 <head>
    <meta charset="UTF-8" />
    <title>Document</title>

--- a/dev-union/src/main/resources/bill8.html
+++ b/dev-union/src/main/resources/bill8.html
 <!DOCTYPE html>
 <html lang="en">
-<!--核查确认单据-->
+<!--核查确认单据 不使用-->
 <head>
    <meta charset="UTF-8" />
    <title>Document</title>