From 307cd7a9860c804eddd56465f0423efb950337dc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 25 七月 2025 14:16:53 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedOperateLog.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedOperateLog.java b/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedOperateLog.java
index 80c328e..7d65eee 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedOperateLog.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedOperateLog.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.example.erp.entity.sd.Order;
+import com.example.erp.entity.sd.OrderDetail;
import lombok.Data;
import java.time.LocalDate;
@@ -12,11 +14,29 @@
private Long id;
private String operationOrderNumber;
- private Long productNumber;
- private Integer operationNumber ;
+ private String orderId;
+ private Integer operationNumber;
+ private Integer quantity;
private String operateType;
private String operator;
private LocalDate operateTime;
+ private String staterOperationOrderNumber;
+ private String endOperationOrderNumber;
+
+ private String status;
+ private Boolean isState;
+ private String reviewed;
+ private LocalDate reviewedTime;
+ private String type;
+ private String remarks;
+ private String processId;
+
+ private Double area;
+ private Double money;
+
+ private OrderDetail orderDetail;
+
+ private Order order;
}
--
Gitblit v1.8.0