From da5c10b63235ff11cc6202891d985a68960a16fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9F=B3=E5=A4=B4=E4=BA=BA?= <3076767823@qq.com>
Date: Wed, 19 Mar 2025 10:50:30 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=9B=BE=E7=89=87=E6=B8=B2=E6=9F=93=E5=AE=BD=E5=BA=A6?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../print/request/ReceiptPrintRequest.java     |  8 ++++----
 .../service/impl/MS439PrintServiceImpl.java    |  2 +-
 .../service/impl/RegisterServiceImpl.java      | 18 +++++++++---------
 src/main/resources/templates/register.html     | 14 +++++++-------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/dpkj/modules/print/request/ReceiptPrintRequest.java b/src/main/java/com/dpkj/modules/print/request/ReceiptPrintRequest.java
index 7abbfac..3ccf4db 100644
--- a/src/main/java/com/dpkj/modules/print/request/ReceiptPrintRequest.java
+++ b/src/main/java/com/dpkj/modules/print/request/ReceiptPrintRequest.java
@@ -46,14 +46,14 @@ public class ReceiptPrintRequest implements Serializable {
     private String templateFillData;
 
     /**
-     * 小票渲染宽度，默认为：600
+     * 小票渲染宽度，默认为：690
      */
-    private Integer width = 600;
+    private Integer width = 690;
 
     /**
-     * 生成的模板的高度，默认为：950
+     * 生成的模板的高度，默认为：1200
      */
-    private Integer height = 950;
+    private Integer height = 1200;
 
 }
 
diff --git a/src/main/java/com/dpkj/modules/print/service/impl/MS439PrintServiceImpl.java b/src/main/java/com/dpkj/modules/print/service/impl/MS439PrintServiceImpl.java
index e89d6cd..40aba89 100644
--- a/src/main/java/com/dpkj/modules/print/service/impl/MS439PrintServiceImpl.java
+++ b/src/main/java/com/dpkj/modules/print/service/impl/MS439PrintServiceImpl.java
@@ -78,7 +78,7 @@ public class MS439PrintServiceImpl implements MS439PrintService {
 
         lexMarkDTO.setParam(param.toString());
         LexMarkResultDTO<LexMarkResultDTO.Param> paramLexMarkResultDTO = thirdService.callDevice(lexMarkDTO, LexMarkResultDTO.Param.class);
-        thirdService.close("HtmPrinter");
+//        thirdService.close("HtmPrinter");
         return paramLexMarkResultDTO;
     }
 
diff --git a/src/main/java/com/dpkj/modules/print/service/impl/RegisterServiceImpl.java b/src/main/java/com/dpkj/modules/print/service/impl/RegisterServiceImpl.java
index 1315384..e688606 100644
--- a/src/main/java/com/dpkj/modules/print/service/impl/RegisterServiceImpl.java
+++ b/src/main/java/com/dpkj/modules/print/service/impl/RegisterServiceImpl.java
@@ -48,22 +48,22 @@ public class RegisterServiceImpl implements PrintService {
         lexMarkDTO.setDevName("ReceiptPrinter");
         JSONObject param = new JSONObject();
         param.put("TimeOut", 30000);
-        param.put("formName", "ReceiptForm");
-        param.put("mediaName", "ReceiptMedia");
-        param.put("alignment", 0);
-        param.put("offsetX", 0);
-        param.put("offsetY", 0);
-        param.put("resolution", 1);
+        param.put("formName", "ReceiptForm");   // 表单名从
+        param.put("mediaName", "Blank");  // 媒介类型
+        param.put("alignment", 0);  // 对齐方式
+        param.put("offsetX", 0);  // x
+        param.put("offsetY", 0);   // y
+        param.put("resolution", 1);  //
         param.put("mediaCtrl", 1);
         param.put("fields", "LOGO=" + filePath);
         lexMarkDTO.setParam(param.toJSONString());
         LexMarkResultDTO<LexMarkResultDTO.Param> paramLexMarkResultDTO = thirdService.callDevice(lexMarkDTO, LexMarkResultDTO.Param.class);
         // 切纸
-        // this.thirdService.cutPaper("ReceiptPrinter", "ControlMedia", 4);
+        //this.thirdService.cutPaper("ReceiptPrinter", "ControlMedia", 4);
 
         File file = new File(filePath.toString());
         // 检查文件是否存在
-        if (file.exists() ) {
+        if (file.exists()) {
             // 尝试删除文件
             if (file.delete()) {
                 log.info("文件删除成功: " + filePath);
@@ -74,7 +74,7 @@ public class RegisterServiceImpl implements PrintService {
             log.info("文件不存在: " + filePath);
         }
 
-        this.thirdService.close("ReceiptPrinter");
+//        this.thirdService.close("ReceiptPrinter");
         return paramLexMarkResultDTO;
     }
 
diff --git a/src/main/resources/templates/register.html b/src/main/resources/templates/register.html
index 7f62bd8..8d46259 100644
--- a/src/main/resources/templates/register.html
+++ b/src/main/resources/templates/register.html
@@ -4,7 +4,7 @@
     <title>挂号单</title>
 </head>
 <body>
-<div style="font-size: 32px; margin-top: 30px;">
+<div style="font-size: 32px; margin-top: 5px;">
     <div style="">
         <div style="text-align: center; font-size: 40px; font-weight: 700;"><span th:text="${hospitalName}"></span></div>
         <div style="text-align: center; font-weight: 700; font-size: 28px;">****<span th:text="${registeTerminalName}"></span></span>****</div>
@@ -28,15 +28,15 @@
         <div style="margin-left: 59px;">支付方式：<span th:text="${paymentMethod}"></span></div>
         <div style="margin-left: 59px;">订&ensp;单&ensp;号：<span th:text="${orderNumber}"></span></div>
         <div style="margin-left: 59px; ">交易流水：<span th:text="${transactionNumber}"></span></div>
-        <div style="width: 100%; text-align: center">
+        <div style="width: 100%; text-align: center; margin-bottom: -20px;">
             <img style="display: inline-block; " th:src="${qrCodeBase64}" alt="QR Code"/>
         </div>
     </div>
-    <div>
-        <div style="margin-top: -20px; text-align: center; font-weight: 700;">-----------------------------------------------------------------------------</div>
-        <div style="font-size: 28px;margin-left: 59px; font-weight: 700;">备注(REFERENCE)：凭此条退费，请妥善保管！</div>
-        <div style="font-size: 28px;margin-left: 59px;">终&ensp;端&ensp;号：<span th:text="${terminalNumber}"></span></div>
-        <div style="font-size: 28px;margin-left: 59px;">打印时间：<span th:text="${printTime}"></span></div>
+    <div style="font-weight: 700; margin-top: -20px;">
+        <div style="margin-top: -40px; text-align: center; ">-----------------------------------------------------------------------------</div>
+        <div style="font-size: 32px;margin-left: 59px; ">备注：凭此条退费，请妥善保管！</div>
+        <div style="font-size: 32px;margin-left: 59px;">终&ensp;端&ensp;号：<span th:text="${terminalNumber}"></span></div>
+        <div style="font-size: 32px;margin-left: 59px;">打印时间：<span th:text="${printTime}"></span></div>
     </div>
 </div>
 </body>