From 1577c2e2874c1fad9ac684356bf0e568c3015045 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 27 十一月 2024 09:46:15 +0800
Subject: [PATCH] 1、大理片笼新增进笼规则，计算本工程下所有玻璃的虚拟格子信息，按照虚拟格子，匹配笼内的实际格子，进笼之后查看格子是否有到齐的，执行调度任务 2、卧理修改任务执行顺序，移除捕获异常操作 3、不覆盖原有逻辑，新增opc任务，避免任务重复执行报错
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java
index 76f2923..3fa49a8 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiOperation;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -51,22 +50,22 @@
/**
* 鍘熺墖瀹�
*/
- private Double patternWidth;
+ private double patternWidth;
/**
* 鍘熺墖楂�
*/
- private Double patternHeigth;
+ private double patternHeight;
/**
* 鍘熺墖鍘氬害
*/
- private Double patternThickness;
+ private double patternThickness;
/**
* 鑶滅郴
*/
- private Integer filmsId;
+ private String filmsId;
/**
* 鏁伴噺
--
Gitblit v1.8.0