From c1c7cae9ebaa7f743e51660265c8dfa6ac52f10d Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 09 十月 2025 16:07:42 +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/mm/FinishedOperateLog.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 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..1530673 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,9 +2,13 @@
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 {
@@ -12,11 +16,31 @@
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;
+ @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