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/OptimizeEngineering.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/OptimizeEngineering.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/OptimizeEngineering.java
index 38b62f7..5b214f1 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/OptimizeEngineering.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/OptimizeEngineering.java
@@ -25,17 +25,17 @@
     /**
      * 骞冲潎鍒╃敤鐜�
      */
-    private Double avgCutPct;
+    private double avgCutPct;
 
     /**
      * 鏈夋晥鍒╃敤鐜�
      */
-    private Double validCutPct;
+    private double validCutPct;
 
     /**
      * 灏剧墖鍒╃敤鐜�
      */
-    private Double lastCutPct;
+    private double lastCutPct;
 
     /**
      * 鐘舵��
@@ -49,7 +49,7 @@
     /**
      * 灏忕墖鎬婚潰绉�
      */
-    private Double glassTotalArea;
+    private double glassTotalArea;
     /**
      * 璁″垝鍘熺墖鎬绘暟
      */
@@ -57,7 +57,7 @@
     /**
      * 璁″垝鍘熺墖鎬婚潰绉�
      */
-    private Double rawStockArea;
+    private double rawStockArea;
     /**
      * 瀹為檯鍘熺墖鎬绘暟
      */
@@ -65,11 +65,11 @@
     /**
      * 瀹為檯鍘熺墖鎬婚潰绉�
      */
-    private Double actualStockArea;
+    private double actualStockArea;
     /**
      * 鑶滅郴
      */
-    private  String glassType;
+    private String glassType;
     /**
      * 澶囨敞
      */

--
Gitblit v1.8.0