From 8d6b17bfa56fd767c6f9de666eb0dd44c6b032cd Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 22 五月 2025 15:42:38 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/pp/DamageDetails.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/DamageDetails.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/DamageDetails.java
index 5d4e8aa..a0633e8 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/DamageDetails.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/DamageDetails.java
@@ -1,7 +1,11 @@
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.OrderGlassDetail;
+import com.example.erp.entity.sd.Product;
import lombok.Data;
@@ -13,6 +17,8 @@
private Integer id;
//鎶ュ伐缂栧彿
private String reportingWorkId;
+ //娴佺▼鍗″彿
+ private String processId;
//浜у搧搴忓彿
private String orderNumber;
//宸ヨ壓纭搴忓彿
@@ -24,7 +30,7 @@
//绫诲瀷
private String breakageType;
//鍙埄鐢�
- private Integer available;
+ private Boolean available;
//閫�鍥炲伐搴�
private String returnProcess;
//璐ｄ换宸ュ簭
@@ -41,4 +47,21 @@
private Integer patchStatus;
//璐ㄦ鐘舵��
private Integer qualityInsStatus;
+ //鏁伴噺
+ private Integer quantity;
+
+ @TableField(select = false,exist = false)
+ private String code;
+
+ @TableField(select = false,exist = false)
+ private String area;
+
+ @TableField(select = false,exist = false)
+ private ReportingWork reportingWork;
+
+ @TableField(select = false,exist = false)
+ private Order order;
+
+ @TableField(select = false,exist = false)
+ private OrderGlassDetail orderGlassDetail;
}
--
Gitblit v1.8.0