From 4d5ee0c593e9312d73e3e5fac0d79df6fcd99ee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9F=B3=E5=A4=B4=E4=BA=BA?= <3076767823@qq.com>
Date: Thu, 13 Mar 2025 09:55:35 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=B0=8F=E7=A5=A8=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E6=9C=BA=E5=A2=9E=E5=8A=A0=E7=BA=B8=E5=BC=A0=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/RegisterServiceImpl.java     | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

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 b0e5f74..1c75862 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
@@ -8,10 +8,7 @@ import com.dpkj.common.dto.LexMarkResultDTO;
 import com.dpkj.common.exception.RRException;
 import com.dpkj.common.utils.TemplateUtils;
 import com.dpkj.common.utils.ThirdService;
-import com.dpkj.modules.print.enums.MS439DeviceStatusEnum;
-import com.dpkj.modules.print.enums.MS439InkStatusEnum;
-import com.dpkj.modules.print.enums.MS439MediaStatusEnum;
-import com.dpkj.modules.print.enums.MS439TonerStatusEnum;
+import com.dpkj.modules.print.enums.*;
 import com.dpkj.modules.print.service.PrintService;
 import com.dpkj.modules.print.vo.PrinterStatus;
 import org.springframework.stereotype.Service;
@@ -72,6 +69,20 @@ public class RegisterServiceImpl implements PrintService {
         }
 
         PrinterStatus ms439 = status.getData();
+        // 获取打印机纸张
+        String stPaperEx = ms439.getStPaperEx();
+        if (stPaperEx == null || stPaperEx.equals("")) {
+            throw new RRException("获取打印机纸张状态出问题");
+        }
+        String[] papers = stPaperEx.split("\\|");
+        if ( papers.length < 1) {
+            throw new RRException("打印机纸盒数量不对");
+        }
+        String paperStatus = papers[0];
+        if ( !(paperStatus.equals(MS439PaperStatusEnum.PAPERFULL.getPrintCode()) || paperStatus.equals(MS439PaperStatusEnum.PAPERLOW.getPrintCode()))){
+            throw new RRException(MS439PaperStatusEnum.getPCode(paperStatus), MS439PaperStatusEnum.getMessage(paperStatus));
+        }
+
         // 校验打印机是否正常,除了HEALTHY都抛异常
         if (!ms439.getStDeviceStatus().equals(MS439DeviceStatusEnum.HEALTHY.getPrintCode()) ) {
             throw new RRException(500, ms439.getStDeviceStatus());