From 8052785b8f8c423b3ba62b2c546d628b801b18dc Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期二, 30 十二月 2025 08:41:31 +0800
Subject: [PATCH] 新增 动态补片功能

---
 north-glass-erp/src/main/java/com/example/erp/dto/pp/MesCalculateDTO.java |  247 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 247 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/MesCalculateDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/MesCalculateDTO.java
new file mode 100644
index 0000000..59784d4
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/MesCalculateDTO.java
@@ -0,0 +1,247 @@
+package com.example.erp.dto.pp;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author yujie
+ * @date 2025/12/23 9:23
+ */
+
+
+@Data
+public class MesCalculateDTO {
+
+    @JsonProperty("engineerId")
+    private String engineerId;
+    //    private String projectNo;
+
+    @JsonProperty("rawQueueList")
+    private Object rawQueueList;
+
+    private Double usageRate;
+
+    @JsonProperty("engineeringRawQueueList")
+    private List<EngineeringRawQueue> engineeringRawQueueList;
+    //    private List<materialDetail> materialDetails;
+
+    @JsonProperty("glassInfoList")
+    private List<GlassInfo> glassInfoList;
+//    private List<GlassDetail> glassDetails;
+
+    @JsonProperty("damageList")
+    private List<DamageList> damageList;
+
+    @Data
+    public static class EngineeringRawQueue{
+        @JsonProperty("id")
+        private String id;
+//        private String stockCode;
+
+
+
+        @JsonProperty("engineeringId")
+        private String engineeringId;
+//        private String projectNo;
+
+        @JsonProperty("filmsId")
+        private String filmsId;
+//        private String glassType;
+
+        @JsonProperty("rawGlassWidth")
+        private Double rawGlassWidth;
+//        private Double width;
+
+        @JsonProperty("rawGlassHeight")
+        private Double rawGlassHeight;
+//        private Double height;
+
+        @JsonProperty("rawGlassThickness")
+        private String rawGlassThickness;
+//        private String glassThickness;
+
+        private Integer quantity = 1;
+
+        private Integer priority = 0;
+
+        private Integer materialType = 1;
+
+        private Integer rawSequence;
+
+        private Integer state;
+
+        private String createTime;
+
+        private String updateTime;
+
+        private Object usageRate;
+    }
+
+    @Data
+    public static class GlassInfo {
+
+        private Integer id;
+
+        @JsonProperty("flowCardId")
+        private String flowCardId;
+//        private String processId;
+
+        private String orderNumber;
+
+        private Double width;
+
+        private Double height;
+
+        private Integer thickness;
+
+        private String filmsId;
+
+        private Integer layer;
+
+        private Integer totalLayer;
+
+        @JsonProperty("edgWidth")
+        private Double edgWidth;
+//        private Double widthGrind;
+
+        @JsonProperty("edgHeight")
+        private Double edgHeight;
+//        private Double heightGrind;
+
+        private Integer isMultiple;
+
+        private Double maxWidth;
+
+        private Double maxHeight;
+
+        private Object isHorizontal;
+
+        private Integer rawSequence;
+
+        private Integer temperingLayoutId;
+
+        private Integer temperingFeedSequence;
+
+        private Double angle;
+
+        private String engineerId;
+
+        private Object ruleId;
+
+        private String glassId;
+
+        private Integer combine;
+
+        private String markIcon;
+
+        private Integer quantity = 1;
+
+        private Integer patchState = 1;
+
+        private Object filmRemove;
+
+        private String flowCardSequence;
+
+        private String process;
+
+        private Integer rawAngle;
+
+        private Integer hollowCombineDirection;
+
+        private Integer productSortNumber;
+
+        private Object shelfOrder;
+
+        private Object graphNo;
+
+        private Object processParam;
+
+        private Integer ycoordinate;
+
+        private Integer xcoordinate;
+
+        private Integer xaxis;
+
+        private Integer yaxis;
+
+    }
+
+    @Data
+    public static class DamageList {
+        private Integer id;
+
+        private String flowCardId;
+
+        private String orderNumber;
+
+        private Double width;
+
+        private Double height;
+
+        private Integer thickness;
+
+        private String filmsId;
+
+        private Integer layer;
+
+        private Integer totalLayer;
+
+        private Double edgWidth;
+
+        private Double edgHeight;
+
+        private Integer isMultiple;
+
+        private Double maxWidth;
+
+        private Double maxHeight;
+
+        private Object isHorizontal;
+
+        private Integer rawSequence;
+
+        private Integer temperingLayoutId;
+
+        private Integer temperingFeedSequence;
+
+        private Double angle;
+
+        private String engineerId;
+
+        private Object ruleId;
+
+        private String glassId;
+
+        private Integer combine;
+
+        private String markIcon;
+
+        private Object filmRemove;
+
+        private String flowCardSequence;
+
+        private String process;
+
+        private Integer rawAngle;
+
+        private Integer hollowCombineDirection;
+
+        private Integer productSortNumber;
+
+        private Object shelfOrder;
+
+        private Object graphNo;
+
+        private Object processParam;
+
+        private Integer xcoordinate;
+
+        private Integer ycoordinate;
+
+        private Integer xaxis;
+
+        private Integer yaxis;
+    }
+}

--
Gitblit v1.8.0