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/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java
index 2c7de7c..5a79a88 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java
@@ -29,8 +29,8 @@
/**
* 澶х悊鐗囩琛╥d
*/
- @ApiModelProperty(value = "澶х悊鐗囩琛╥d", position = 2)
- @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "澶х悊鐗囩琛╥d", position = 2)
+ @TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
@@ -46,15 +46,26 @@
private Integer slot;
/**
+ * 鏍呮牸鍙�
+ */
+ @ApiModelProperty(value = "鏈�灏忓帤搴�", position = 5)
+ private Integer minThickness;
+ /**
+ * 鏍呮牸鍙�
+ */
+ @ApiModelProperty(value = "鏈�澶у帤搴�", position = 6)
+ private Integer maxThickness;
+
+ /**
* 鍚敤鐘舵��
*/
- @ApiModelProperty(value = "鍚敤鐘舵��", position = 5)
+ @ApiModelProperty(value = "鍚敤鐘舵��", position = 7)
private Integer enableState;
/**
* 鍓╀綑瀹藉害
*/
- @ApiModelProperty(value = "鍓╀綑瀹藉害", position = 6)
+ @ApiModelProperty(value = "鍓╀綑瀹藉害", position = 8)
private Integer remainWidth;
@ApiModelProperty(hidden = true)
--
Gitblit v1.8.0