From a04d735ab3f2e9c52ebf52c35dfa1506d86d416d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 24 七月 2025 17:01:57 +0800
Subject: [PATCH] 修改流程卡打印获取第一个工序不正确问题，在制品汇总报表添加批次
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
index 2ae7498..4da708b 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
@@ -4,14 +4,17 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.example.erp.entity.mm.FinishedGoodsInventory;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDate;
+import java.util.List;
@Data
+@TableName("sd.`order_detail`")
public class OrderDetail {
@TableId(type = IdType.AUTO)
private Long id;
@@ -34,13 +37,18 @@
private String remarks;
private Double bendRadius;
private String edgingType;
+ private Double archRise;
private Double weight;
private Double perimeter;
+ private Double monolithicPerimeter;
private String otherColumns;
private Integer warehouseNum;
private Integer deliveryNum;
private Integer returnNum;
private Integer state;
+ private String fileName;
+ @TableField(select = false,exist= false)
+ private String fileData;
private LocalDate createTime;
private LocalDate updateTime;
@TableField(select = false,exist= false)
@@ -51,12 +59,26 @@
private DeliveryDetail deliveryDetail;
@TableField(select = false,exist= false)
private FinishedGoodsInventory finishedGoodsInventory;
+ @TableField(select = false,exist= false)
+ private List<OrderGlassDetail> orderGlassDetails;
+
@TableField(exist= false)
private String levelOne;
@TableField(exist= false)
private String levelTwo;
@TableField(exist= false)
private String totalThickness;
+ @TableField(exist= false)
+ private Integer differentSize;//鐢ㄤ簬鏍囩鎵撳嵃鏃� 鏄庣粏鏄惁鏄剧ず
//private Product product;
+ @TableField(exist= false,select = false)
+ private String processId;
+ @TableField(exist= false,select = false)
+ private String baiscQuantity;
+ @TableField(exist= false,select = false)
+ private Integer landingSequence;
+ @TableField(exist= false,select = false)
+ private Double thickness;
+
}
--
Gitblit v1.8.0