From 260ad701e251aaa71a1bf5531bd98d93cb91c2bf Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 19 十一月 2025 11:18:57 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java
index 1ed3fc0..57cba52 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java
@@ -1,14 +1,20 @@
package com.example.erp.entity.pp;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderGlassDetail;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.time.LocalDate;
+import java.util.List;
@Data
public class ReportingWorkDetail {
+ @TableId(type = IdType.AUTO)
//鑷ID
private Integer id;
//鎶ュ伐缂栧彿
@@ -18,13 +24,17 @@
//宸ヨ壓纭搴忓彿
private String technologyNumber;
//瀹屽伐鏁伴噺
- private Integer completedQuantity;
+ private int completedQuantity;
//娆＄牬鏁伴噺
- private Integer breakageQuantity;
+ private int breakageQuantity;
//娆＄牬鍘熷洜
private String breakageReason;
//绫诲瀷
private String breakageType;
+ //瀹�
+ private Double childWidth;
+ //楂�
+ private Double childHeight;
//鍙埄鐢�
private Integer available;
//閫�鍥炲伐搴�
@@ -54,21 +64,36 @@
//寰呰繑宸ユ暟閲�
private Integer waitReworkQuantity;
//杩斿伐瀹℃牳鐘舵��
- private Integer reviewerState;
+ private Integer reviewStatus;
//杩斿伐瀹℃牳浜�
private String reviewer;
//杩斿伐鏃堕棿
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate reworkTime;
//杩斿伐鏇存柊鏃堕棿
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate reworkUpdateTime;
//杩斿伐闈㈢Н
- private double reworkArea;
+ // private double reworkArea;
+
+ //鎶ュ伐淇敼鐢ㄨˉ鐗囩姸鎬�
+ @TableField(select = false,exist= false)
+ private String patchStatusOther;
+
+ //娆＄牬鍒楄〃
+ @TableField(select = false,exist= false)
+ private List<DamageDetails>
+ damageDetails;
//澶栭敭鎶ュ伐涓昏〃
+ @TableField(select = false,exist= false)
private ReportingWork reportingWork;
+ @TableField(select = false,exist= false)
private Order order;
+ @TableField(select = false,exist= false)
private OrderDetail orderDetail;
+ @TableField(select = false,exist= false)
private OrderGlassDetail orderGlassDetail;
}
--
Gitblit v1.8.0