From b8b5b799e8770d29ac0a5b8530c468d74173c487 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 03 一月 2025 23:22:53 +0800
Subject: [PATCH] 1、手动生成李赛克文件功能已完成、待联调 2、对接除膜机,调整对应的交互 3、中空两条线新增空闲信号,优先李赛克线优先 4、fixbug:指定工程后增加版图id排序,优先炉号从小到大,版序从小到大

---
 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/HollowFormulaDetails.java |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/HollowFormulaDetails.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/HollowFormulaDetails.java
index 5f6cf81..46d723c 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/HollowFormulaDetails.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/HollowFormulaDetails.java
@@ -34,29 +34,29 @@
      * 鍒嗗壊绾�
      */
     @ApiModelProperty(value = "闂撮殧鏉�1浠g爜 930涓撶敤")
-    private Integer frameOne;
+    private String frameOne;
     @ApiModelProperty(value = "闂撮殧鏉�2浠g爜 930涓撶敤")
-    private Integer frameTwo;
+    private String frameTwo;
     @ApiModelProperty(value = "闂撮殧鏉�3浠g爜 930涓撶敤")
-    private Integer frameThree;
+    private String frameThree;
     @ApiModelProperty(value = "闂撮殧鏉�4浠g爜 930涓撶敤")
-    private Integer frameFour;
+    private String frameFour;
     @ApiModelProperty(value = "瀵嗗皝宓屽叆 930涓撶敤")
-    private Integer sealInsert;
+    private String sealInsert;
     @ApiModelProperty(value = "姘斾綋1(0鏃� 1鏈�) 930涓撶敤")
-    private Integer casOne;
+    private String casOne;
     @ApiModelProperty(value = "姘斾綋2(0鏃� 1鏈�) 930涓撶敤")
-    private Integer casTwo;
+    private String casTwo;
     @ApiModelProperty(value = "姘斾綋3(0鏃� 1鏈�) 930涓撶敤")
-    private Integer casThree;
+    private String casThree;
     @ApiModelProperty(value = "姘斾綋4(0鏃� 1鏈�) 930涓撶敤")
-    private Integer casFour;
+    private String casFour;
     @ApiModelProperty(value = "闂撮殧妗嗙被鍨嬶紙tps鑳朵负05 閾濋棿闅旀潯01锛� 930涓撶敤")
-    private Integer intervalFrameType;
+    private String intervalFrameType;
     @ApiModelProperty(value = "闂撮殧妗嗗搴� 930涓撶敤")
-    private Integer intervalFrameWidth;
+    private String intervalFrameWidth;
     @ApiModelProperty(value = "闂撮殧妗嗛珮搴� 930涓撶敤")
-    private Integer intervalFrameHeight;
+    private String intervalFrameHeight;
     /**
      * 鍒涘缓鏃堕棿
      */

--
Gitblit v1.8.0