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/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCage.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCage.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCage.java
index e747ab1..4379860 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCage.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCage.java
@@ -1,7 +1,10 @@
package com.mes.downstorage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -15,36 +18,44 @@
* @author zhoush
* @since 2024-03-27
*/
+@Api(description = "缂撳瓨")
@Data
@EqualsAndHashCode(callSuper = false)
public class DownStorageCage implements Serializable {
+ @ApiModelProperty(hidden = true)
private static final long serialVersionUID = 1L;
/**
* 涓嬬墖鍓嶇悊鐗囩琛╥d
*/
+ @ApiModelProperty(value = "涓嬬墖鍓嶇悊鐗囩琛╥d", position = 2)
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 璁惧id
*/
+ @ApiModelProperty(value = "璁惧id", position = 3)
private Integer deviceId;
/**
* 鏍呮牸鍙�
*/
+ @ApiModelProperty(value = "鏍呮牸鍙�", position = 4)
private Integer slot;
/**
* 鍚敤鐘舵��
*/
- private String enableState;
+ @ApiModelProperty(value = "鍚敤鐘舵��", position = 5)
+ @TableField("enable_state")
+ private Integer enableState;
/**
* 鍓╀綑
*/
+ @ApiModelProperty(value = "鍓╀綑", position = 6)
private Integer remainWidth;
--
Gitblit v1.8.0