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/downworkstation/entity/DownWorkstionAndDownGlassinfo.java | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstionAndDownGlassinfo.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstionAndDownGlassinfo.java
index 0ebb340..c79112f 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstionAndDownGlassinfo.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstionAndDownGlassinfo.java
@@ -1,12 +1,9 @@
package com.mes.downworkstation.entity;
import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
/**
* <p>
@@ -19,8 +16,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
-public class DownWorkstionAndDownGlassinfo
-{
+public class DownWorkstionAndDownGlassinfo {
/**
* 涓嬬墖宸ヤ綅琛╥d
*/
@@ -53,14 +49,9 @@
private Integer workState;
- @TableField("total_quantity")
- private Integer totalquantity;
+ private Integer totalQuantity;
- @TableField("racks_number")
- private Integer Racksnumber;
-
-
-
+ private Integer racksNumber;
/**
* 椤哄簭
@@ -70,19 +61,19 @@
/**
* 瀹�
*/
- private Double width;
+ private double width;
/**
* 楂�
*/
- private Double height;
- private Double totalwidth;
+ private double height;
+ private double totalwidth;
- private Double totalheight;
+ private double totalheight;
/**
* 鍘氬害
*/
- private Double thickness;
+ private double thickness;
private String Filmsid;
--
Gitblit v1.8.0