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/common/servicebase/src/main/java/com/mes/pp/entity/request/AwaitingRepair.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/AwaitingRepair.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/AwaitingRepair.java
index 13d0253..5d08d26 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/AwaitingRepair.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/AwaitingRepair.java
@@ -4,7 +4,6 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
-import java.time.LocalDateTime;
/**
* <p>
@@ -80,7 +79,7 @@
/**
* 鐗囨爣璁帮紙浣嶇疆锛�
*/
- private Integer glassAddress;
+ private String glassAddress;
/**
* 琛ョ墖鏁伴噺
@@ -90,12 +89,12 @@
/**
* 瀹�
*/
- private Double width;
+ private double width;
/**
* 楂�
*/
- private Double height;
+ private double height;
/**
* 褰㈢姸
@@ -150,12 +149,12 @@
/**
* 娆$牬闈㈢Н
*/
- private LocalDateTime patchArea;
+ private double patchArea;
/**
* 璐ㄦ鍛�
*/
- private LocalDateTime qualityInspector;
+ private String qualityInspector;
--
Gitblit v1.8.0