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/GlassStorageModule/src/main/java/com/mes/rawusage/entity/RawUsage.java | 109 +++---------------------------------------------------
1 files changed, 6 insertions(+), 103 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/entity/RawUsage.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/entity/RawUsage.java
index 56e7dac..4715716 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/entity/RawUsage.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/entity/RawUsage.java
@@ -5,6 +5,9 @@
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.stereotype.Component;
/**
*
@@ -12,6 +15,9 @@
* @author system
* @since 2024-07-09 14:51:27
*/
+@Data
+@Component
+@EqualsAndHashCode(callSuper = false)
@TableName("raw_usage")
@ApiModel(value = "RawUsage", description = " ")
public class RawUsage implements Serializable{
@@ -97,108 +103,5 @@
private String batchId;
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getRawType() {
- return rawType;
- }
-
- public void setRawType(String rawType) {
- this.rawType = rawType;
- }
-
- public Float getRawWidth() {
- return rawWidth;
- }
-
- public void setRawWidth(Float rawWidth) {
- this.rawWidth = rawWidth;
- }
-
- public Float getRawHeight() {
- return rawHeight;
- }
-
- public void setRawHeight(Float rawHeight) {
- this.rawHeight = rawHeight;
- }
-
- public Float getRawThickness() {
- return rawThickness;
- }
-
- public void setRawThickness(Float rawThickness) {
- this.rawThickness = rawThickness;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public String getColor() {
- return color;
- }
-
- public void setColor(String color) {
- this.color = color;
- }
-
- public Integer getPieces() {
- return pieces;
- }
-
- public void setPieces(Integer pieces) {
- this.pieces = pieces;
- }
-
- public Integer getLeftPieces() {
- return leftPieces;
- }
-
- public void setLeftPieces(Integer leftPieces) {
- this.leftPieces = leftPieces;
- }
-
- public String getQrcode() {
- return qrcode;
- }
-
- public void setQrcode(String qrcode) {
- this.qrcode = qrcode;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public Date getProductionTime() {
- return productionTime;
- }
-
- public void setProductionTime(Date productionTime) {
- this.productionTime = productionTime;
- }
-
- public String getBatchId() {
- return batchId;
- }
-
- public void setBatchId(String batchId) {
- this.batchId = batchId;
- }
}
\ No newline at end of file
--
Gitblit v1.8.0