From 0ca7d78f0e8e8a6984314803aba21ab1d25472b3 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 24 四月 2026 15:06:21 +0800
Subject: [PATCH] feat(production): 新增印刷定印单实体及相关接口和分页信息完善

---
 src/main/java/com/ruoyi/production/pojo/ProductionPrintOrder.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionPrintOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductionPrintOrder.java
index 6965945..58c7ce4 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionPrintOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionPrintOrder.java
@@ -1,5 +1,7 @@
 package com.ruoyi.production.pojo;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
@@ -11,9 +13,12 @@
 import com.ruoyi.production.dto.MaterialInfoDto;
 import com.ruoyi.production.dto.PlateMakingDto;
 import com.ruoyi.production.dto.ProcessContentDto;
+import com.ruoyi.production.dto.ProductOrderDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
 
 /**
  * 鍗板埛瀹氬嵃鍗�
@@ -256,4 +261,21 @@
      */
     @TableField(value = "client_name")
     private String clientName;
+
+
+    public ProductOrderDto convertProductOrderDto(@NotNull ProductOrderDto dto) {
+        dto.setCutSize(this.getCutSize());
+        dto.setSmallBoxQty(this.getSmallBoxQty());
+        dto.setMediumBoxQty(this.getMediumBoxQty());
+        // 鑹叉暟 涓哄伐搴忓紑鏁扮涓�涓�
+        if(CollUtil.isNotEmpty(this.processContent)){
+            ProcessContentDto processContentDto = BeanUtil.toBean(
+                    processContent.get(0),
+                    ProcessContentDto.class
+            );
+            dto.setPrintColorCount(processContentDto.getOpenCount());
+        }
+        // 澶囨敞宸茬粡濉厖鍒颁簡 ProductOrderDto涓棤闇�鍏冲績
+        return dto;
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.3