From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +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/sd/OrderProcessDetail.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderProcessDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderProcessDetail.java
index 22ed0fe..2a34115 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderProcessDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderProcessDetail.java
@@ -1,19 +1,31 @@
package com.example.erp.entity.sd;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
+import java.time.LocalDate;
+
@Data
+@TableName("sd.order_process_detail")
public class OrderProcessDetail {
@TableId(type = IdType.AUTO)
private Long id;
+ private String orderId;
+ private String processId;
+ private String orderNumber;
+ private Integer technologyNumber;
private String process;
- private Integer reportingworkNum;
- private Integer brokenNum;
+ private int reportingWorkNumCount;
+ private int reportingWorkNum;
+ private int brokenNum;
+ @ExcelProperty("淇敼鏃ユ湡")
+ private LocalDate updateTime;
- private Order order;
- private OrderDetail orderDetail;
- private Product product;
+// private Order order;
+// private OrderDetail orderDetail;
+// private Product product;
}
--
Gitblit v1.8.0