From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001 From: guoyujie <guoyujie@ng.com> Date: 星期四, 12 六月 2025 16:48:35 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override --- north-glass-erp/src/main/java/com/example/erp/dto/otherSystem/OptimizeProject.java | 74 +++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/otherSystem/OptimizeProject.java b/north-glass-erp/src/main/java/com/example/erp/dto/otherSystem/OptimizeProject.java new file mode 100644 index 0000000..34c0e2a --- /dev/null +++ b/north-glass-erp/src/main/java/com/example/erp/dto/otherSystem/OptimizeProject.java @@ -0,0 +1,74 @@ +package com.example.erp.dto.otherSystem; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +@Data +@TableName("pp.optimize_project") +public class OptimizeProject { + @TableId(type = IdType.AUTO) + private Long id; + //宸ョ▼鍙� + @NotNull(message = "This field cannot be null") + @TableField("project_no") + private String engineerId; + //宸ョ▼鍚嶇О + @TableField("project_name") + private String engineerName; + //骞冲潎鍒╃敤鐜� + @TableField("avg_cut_pct") + private Double avgAvailability; + //鏈夋晥鍒╃敤鐜� + @TableField("valid_cut_pct") + private Double validAvailability; + //灏剧墖鍒╃敤鐜� + @TableField("last_cut_pct") + private Double lastAvailability; + //灏忕墖鎬绘暟 + @NotNull(message = "This field cannot be null") + @TableField("glass_total") + private Integer glassTotal; + //灏忕墖鎬婚潰绉� + @TableField("glass_total_area") + private Double glassTotalArea; + //璁″垝鍘熺墖鎬绘暟 + @TableField("frist_stock_qty") + private Integer planPatternTotal; + //璁″垝鍘熺墖鎬婚潰绉� + @TableField(select = false,exist = false) + private Double planPatternTotalArea; + //瀹為檯鍘熺墖鎬绘暟 + @TableField("raw_stock_qty") + private Integer realityPatternTotal; + //瀹為檯鍘熺墖鎬婚潰绉� + @TableField("raw_stock_area") + private Double realityPatternTotalArea; + //鑶滅郴id + @TableField("glass_type") + private String filmsId; + @NotNull(message = "This field cannot be null") + private Integer type;//琛ュ崟0锛屾甯�1 + + @TableField("glass_thickness") + @NotNull(message = "This field cannot be null") + private Double thickness; + private String state; + + //鍘熺墖浣跨敤 + @TableField(select = false,exist = false) + private List<UpPattenList> upPattenList; + + //绗笁鏂规祦绋嬪崱琛� + @TableField(select = false,exist = false) + private List<FlowCardList> flowCardList; + + //浼樺寲灏忕墖鏄庣粏 + @TableField(select = false,exist = false) + private List<GlassDetailList> glassDetailList; +} -- Gitblit v1.8.0