From 0477b72d30cfe7d412edeb237aa587b1c5242207 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 09 七月 2024 08:34:31 +0800
Subject: [PATCH] 1、任务新增计时功能,日志打印每次任务执行的周期 2、卧式理片笼更新出片规则:都为禁用(2),笼子不出玻璃;存在一个禁用,07片台可以存玻璃;都非禁用:两片台有玻璃笼子不出片

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
index f69a142..0c6ae56 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
@@ -35,22 +35,22 @@
     /**
      * 娴佺▼鍗$幓鐠冪被鍨�
      */
-    private String glassType;
+    private Integer glassType;
 
     /**
      * 瀹�
      */
-    private Double width;
+    private double width;
 
     /**
      * 楂�
      */
-    private Double height;
+    private double height;
 
     /**
      * 鍘氬害
      */
-    private Double thickness;
+    private double thickness;
 
     /**
      * 鑶滅郴
@@ -70,12 +70,12 @@
     /**
      * 纾ㄥ墠瀹�
      */
-    private Double edgWidth;
+    private double edgWidth;
 
     /**
      * 纾ㄥ墠楂�
      */
-    private Double edgHeight;
+    private double edgHeight;
 
     /**
      * 鏄惁閰嶇墖
@@ -85,12 +85,12 @@
     /**
      * 閰嶇墖鏈�澶у
      */
-    private Double maxWidth;
+    private double maxWidth;
 
     /**
      * 閰嶇墖鏈�澶ч珮
      */
-    private Double maxHeight;
+    private double maxHeight;
 
     /**
      * 閽㈠寲鏄惁鎺ュ彈妯斁
@@ -125,7 +125,7 @@
     /**
      * 鏃嬭浆瑙掑害锛堥�嗘椂閽堬級
      */
-    private Integer angle;
+    private double angle;
 
     /**
      * 宸ョ▼鍙�

--
Gitblit v1.8.0