From df143921e8ec85b43420b71961d73825521911d1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 23 十月 2025 10:14:49 +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 |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 46 insertions(+), 0 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
new file mode 100644
index 0000000..1530673
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedOperateLog.java
@@ -0,0 +1,46 @@
+package com.example.erp.entity.mm;
+
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Data
+public class FinishedOperateLog {
+    @TableId(type = IdType.AUTO)
+
+    private Long id;
+    private String operationOrderNumber;
+    private String orderId;
+    private Integer operationNumber;
+    private Integer quantity;
+    private String operateType;
+    private String operator;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime 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 Double computeArea;
+
+    private OrderDetail orderDetail;
+
+    private Order order;
+
+
+}

--
Gitblit v1.8.0