From 8d6b17bfa56fd767c6f9de666eb0dd44c6b032cd Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 22 五月 2025 15:42:38 +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/GlassDetailList.java | 98 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 98 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/otherSystem/GlassDetailList.java b/north-glass-erp/src/main/java/com/example/erp/dto/otherSystem/GlassDetailList.java
new file mode 100644
index 0000000..cbd5919
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/otherSystem/GlassDetailList.java
@@ -0,0 +1,98 @@
+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.persistence.Column;
+import javax.validation.constraints.NotNull;
+
+@Data
+@TableName("pp.optimize_detail")
+public class GlassDetailList {
+ @TableId(type = IdType.AUTO)
+ private Long id;
+ @TableField(select = false,exist = false)
+ private String glassId;
+
+ @TableField("project_no")//宸ョ▼鍙�
+ @NotNull(message = "This field cannot be null")
+ private String engineerId;
+
+ @TableField("process_id")//娴佺▼鍗�
+ @NotNull(message = "This field cannot be null")
+ private String flowCardId;
+
+ @TableField("order_sort")//璁㈠崟搴忓彿
+ @NotNull(message = "This field cannot be null")
+ private Integer orderNumber;
+
+ @NotNull(message = "This field cannot be null")
+ private Double width;
+ @NotNull(message = "This field cannot be null")
+ private Double height;
+ @TableField(select = false,exist = false)
+ private Double thickness;
+ @TableField(select = false,exist = false)
+ private String filmsId;
+
+ //鎬诲眰鏁�
+ @NotNull(message = "This field cannot be null")
+ private Integer totalLayer;
+
+ //褰撳墠灞傛暟
+ @NotNull(message = "This field cannot be null")
+ private Integer layer;
+
+ @NotNull(message = "This field cannot be null")
+ @TableField("stock_id")//鐗堝浘搴忓彿
+ private Integer patternSequence;
+
+ @NotNull(message = "This field cannot be null")
+ @TableField("p_width")//纾ㄥ墠瀹�
+ private Double edgWidth;
+
+ @TableField("p_height")//纾ㄥ墠楂�
+ @NotNull(message = "This field cannot be null")
+ private Double edgHeight;
+
+ @TableField("x_axis")//x鍧愭爣
+ @NotNull(message = "This field cannot be null")
+ private Integer xaxis;
+
+
+ @TableField("y_axis")//y鍧愭爣
+ private Integer yaxis;
+ @NotNull(message = "This field cannot be null")
+ @TableField(select = false,exist = false)//鍘熺墖鏃嬭浆瑙掑害
+ private String patternAngle;
+ @TableField("heat_layout_id")//閽㈠寲鐗堝浘鍙�
+ private Integer temperingLayoutId;
+ @TableField("heat_layout_sort")//閽㈠寲搴忓彿
+ private Integer temperingFeedSequence;
+
+ @TableField(select = false,exist = false)//閽㈠寲x鍧愭爣
+ private Integer xcoordinate;
+ @TableField(select = false,exist = false)//閽㈠寲y鍧愭爣
+ private Integer ycoordinate;
+ @TableField(select = false,exist = false)//鏃嬭浆瑙掑害閫嗘椂閽�
+ private Integer angle;
+ @TableField(select = false,exist = false)//閽㈠寲鏄惁鎺ュ彈妯斁
+ private Integer isHorizontal;
+ @TableField(select = false,exist = false)//鏄惁閰嶇墖
+ private Integer isMultiple;
+ @TableField(select = false,exist = false)//閰嶇墖鏈�澶у
+ private Double maxWidth;
+ @TableField(select = false,exist = false)//閰嶇墖鏈�澶ч珮
+ private Double maxHeight;
+ @TableField(select = false,exist = false)//鎵撴爣灞炴��
+ private String markIcon;
+ @TableField(select = false,exist = false)//鐢熶骇瑙勫垯id
+ private Integer ruleId;
+ @TableField(select = false,exist = false)//鏄惁鍚堝苟
+ private Integer combine;
+ @TableField(select = false,exist = false)//闄よ啘鏂瑰紡
+ private Integer filmRemove;
+}
--
Gitblit v1.8.0