From 0ed1e068ed2b04ae91f4a520de476588ca00db37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Wed, 25 Sep 2024 18:20:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E7=AE=A1=E7=90=86-=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E9=85=8D=E7=BD=AE=EF=BC=9A=E6=89=93=E5=8D=B0=E6=9C=BA?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ysk/cashier/dto/shop/ShopPrinterDTO.java  | 89 ++++++++++++++++++-
 .../pojo/shop/TbPrintMachineEntity.java       | 29 ++++++
 2 files changed, 116 insertions(+), 2 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/ShopPrinterDTO.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/ShopPrinterDTO.java
index 027342b6..e7667640 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/ShopPrinterDTO.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/ShopPrinterDTO.java
@@ -16,41 +16,126 @@ import java.util.Date;
 public class ShopPrinterDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    /**
+     * id
+     */
     private Integer id;
 
+    /**
+     * 名称
+     */
     private String name;
 
+    /**
+     * 冗余/遗留字段
+     */
     private String type;
 
+    /**
+     * 打印机类型：本地打印机-local USB打印机-USB 云打印机-network
+     */
     private String connectionType;
 
+    /**
+     * 打印机编号/IP地址
+     */
     private String address;
 
+    /**
+     * 打印机密钥/端口
+     */
     private String port;
 
+    /**
+     * 打印类型 标签-label 出品-kitchen 小票-cash
+     */
     private String subType;
 
+    /**
+     * 启用状态 0-启用 1-停用
+     */
     private Integer status;
 
+    /**
+     * 店铺id
+     */
     private String shopId;
 
+    /**
+     * 冗余/遗留字段
+     */
     private String categoryIds;
 
+    /**
+     * 打印机品牌
+     * 云想印 = yxyPrinter
+     * 飞鹅 = fePrinter
+     * 本地 = local
+     * USB = printer
+     */
     private String contentType;
 
+    /**
+     * 创建时间
+     */
     private String createdAt;
 
+    /**
+     * 更新时间
+     */
     private String updatedAt;
 
+    /**
+     * 排序码 从小到大升序排列
+     */
     private Integer sort;
 
+    /**
+     * 冗余/遗留字段
+     */
     private String vendorId;
 
+    /**
+     * 冗余/遗留字段
+     */
     private String productId;
+    /**
+     * 冗余/遗留字段（打印机个性化配置，存储JSON数据）
+     */
     private String config;
 
+    /**
+     * 小票尺寸 58mm 80mm
+     */
+    private String receiptSize;
+    /**
+     * 分类打印 0-所以 1-部分分类 2-部分商品
+     */
+    private String classifyPrint;
+    /**
+     * 桌台打印 0-所有 1-部分
+     */
+    private String tablePrint;
+    /**
+     * 打印数量 c1m1^2=顾客+商家[2张] m1^1=商家[1张] c1^1顾客[1张] c2m1^3顾客2+商家1[3张]
+     */
+    private String printQty;
+    /**
+     * 打印方式 1-普通 2-单个菜
+     */
+    private String printMethod;
+    /**
+     * 打印类型，JSON数组 1-确认退款单 2-交班单 3-排队取号
+     */
+    private String printType;
+    /**
+     * 打印单据 0-全部打印 1-仅厨房 2-仅前台
+     */
+    private String printReceipt;
+
+
     public String getCreatedAt() {
-        if("".equals(createdAt) || createdAt == null){
+        if ("".equals(createdAt) || createdAt == null) {
             return "";
         }
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -58,7 +143,7 @@ public class ShopPrinterDTO implements Serializable {
     }
 
     public String getUpdatedAt() {
-        if("".equals(updatedAt) || updatedAt == null){
+        if ("".equals(updatedAt) || updatedAt == null) {
             return "";
         }
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPrintMachineEntity.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPrintMachineEntity.java
index 710660f5..18bbe528 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPrintMachineEntity.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPrintMachineEntity.java
@@ -42,4 +42,33 @@ public class TbPrintMachineEntity implements Serializable {
     private String vendorId;
     private String productId;
 
+    /**
+     * 小票尺寸 58mm 80mm
+     */
+    private String receiptSize;
+    /**
+     * 分类打印 0-所以 1-部分分类 2-部分商品
+     */
+    private String classifyPrint;
+    /**
+     * 桌台打印 0-所有 1-部分
+     */
+    private String tablePrint;
+    /**
+     * 打印数量 c1m1^2=顾客+商家[2张] m1^1=商家[1张] c1^1顾客[1张] c2m1^3顾客2+商家1[3张]
+     */
+    private String printQty;
+    /**
+     * 打印方式 1-普通 2-单个菜
+     */
+    private String printMethod;
+    /**
+     * 打印类型，JSON数组 1-确认退款单 2-交班单 3-排队取号
+     */
+    private String printType;
+    /**
+     * 打印单据 0-全部打印 1-仅厨房 2-仅前台
+     */
+    private String printReceipt;
+
 }