From 77c7984fb636f81a87208aea2bcffc701f6419e8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 23 十月 2024 16:01:26 +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 | 23 ++++++++++++++++++++++-
1 files changed, 22 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 9c03fa7..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;
@@ -26,7 +30,7 @@
//绫诲瀷
private String breakageType;
//鍙埄鐢�
- private Integer available;
+ private Boolean available;
//閫�鍥炲伐搴�
private String returnProcess;
//璐ｄ换宸ュ簭
@@ -43,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