From 4955996ab044bc275ac78da3543b9d9f5ad7f8d9 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 12 十二月 2025 16:21:26 +0800
Subject: [PATCH] 提交浏览发货信息
---
north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedOperateLog.java | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 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..ce6ee15 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
@@ -1,10 +1,15 @@
package com.example.erp.entity.mm;
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.OrderDetail;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.time.LocalDate;
+import java.time.LocalDateTime;
@Data
public class FinishedOperateLog {
@@ -12,11 +17,43 @@
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;
+
+ /*搴撳瓨鏁伴噺*/
+ @TableField(select = false,exist = false)
+ private Integer quantityAvailable;
+
+ /*骞虫柟姣背*/
+ @TableField(select = false,exist = false)
+ private Double squareMillimeter;
+
+ /*鎾ら攢鏁伴噺*/
+ @TableField(select = false,exist = false)
+ private Integer cancelAvailable;
+
+ private OrderDetail orderDetail;
+
+ private Order order;
}
--
Gitblit v1.8.0