From 65ae6084f552c035eb5640afbd8f73e6054e3b6c Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 16 七月 2024 21:15:53 +0800
Subject: [PATCH] 1、大理片:fixbug:大理片出片逻辑修改,钢化版图是否到齐:sql逻辑问题,包含人工出片任务,造成钢化版图是否到齐需要获取已出片的玻璃,造成已出笼的玻璃会重复计算并准备生成钢化任务,但获取的玻璃信息为空,造成插入钢化表异常。且排除已出笼的钢化版图较复杂(暂不关联钢化小片表),目前解决方案:把所有到齐的钢化版图数据查出来,排除笼内玻璃为空的 2、移除已配置完mapperscan已扫描仍有@Mapper注解的

---
 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
index 586a7b3..c9321fa 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
@@ -2,9 +2,10 @@
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
 
 /**
  * <p>
@@ -39,17 +40,17 @@
     /**
      * 骞冲潎鍒╃敤鐜�
      */
-    private Double avgAvailability;
+    private double avgAvailability;
 
     /**
      * 鏈夋晥鍒╃敤鐜�
      */
-    private Double validAvailability;
+    private double validAvailability;
 
     /**
      * 灏剧墖鍒╃敤鐜�
      */
-    private Double lastAvailability;
+    private double lastAvailability;
 
     /**
      * 鐘舵��
@@ -64,7 +65,7 @@
     /**
      * 灏忕墖鎬婚潰绉�
      */
-    private Double glassTotalArea;
+    private double glassTotalArea;
 
     /**
      * 璁″垝鍘熺墖鎬绘暟
@@ -74,7 +75,7 @@
     /**
      * 璁″垝鍘熺墖鎬婚潰绉�
      */
-    private Double planPatternTotalArea;
+    private double planPatternTotalArea;
 
     /**
      * 瀹為檯鍘熺墖鎬绘暟
@@ -84,7 +85,7 @@
     /**
      * 瀹為檯鍘熺墖鎬婚潰绉�
      */
-    private Double realityPatternTotalArea;
+    private double realityPatternTotalArea;
 
     /**
      * 鑶滅郴id

--
Gitblit v1.8.0