From 0d9b0dab20eae44c817944e98c967dfd8832f580 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 25 四月 2026 17:13:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/production/pojo/ProductionPrintOrder.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 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..fdcb92f 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionPrintOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionPrintOrder.java
@@ -1,9 +1,12 @@
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;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
@@ -11,9 +14,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;
/**
* 鍗板埛瀹氬嵃鍗�
@@ -114,19 +120,19 @@
* 鍒剁増
*/
@TableField(value = "plate_making",typeHandler = JacksonTypeHandler.class)
- private List<PlateMakingDto> plateMaking;
+ private List<PlateMakingDto> plateMaking = new ArrayList<>();
/**
* 宸ュ簭鍔犲伐鍐呭
*/
@TableField(value = "process_content",typeHandler = JacksonTypeHandler.class)
- private List<ProcessContentDto> processContent;
+ private List<ProcessContentDto> processContent = new ArrayList<>();
/**
* 鏉愭枡淇℃伅
*/
@TableField(value = "material_info",typeHandler = JacksonTypeHandler.class)
- private List<MaterialInfoDto> materialInfo;
+ private List<MaterialInfoDto> materialInfo = new ArrayList<>();
/**
* 宸ヨ壓瑕佹眰
@@ -256,4 +262,27 @@
*/
@TableField(value = "client_name")
private String clientName;
+
+ /**
+ * 鍒囨枡鍥剧ず閫夋嫨 鍗曢��
+ */
+ @TableField(value = "cutting_diagram_checkout")
+ private String cuttingDiagramCheckout;
+
+
+ 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