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/mm/MaterialLog.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialLog.java b/north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialLog.java
index 50fa470..3ecc6bb 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialLog.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialLog.java
@@ -1,5 +1,6 @@
package com.example.erp.entity.mm;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.example.erp.entity.sd.OrderDetail;
@@ -10,25 +11,47 @@
@Data
public class MaterialLog {
@TableId(type = IdType.AUTO)
-
+ @ExcelProperty("缂栧彿")
private Long id;
+ @ExcelProperty("鎿嶄綔鍗曞彿")
private String operationOrderNumber;
+ @ExcelProperty("绫诲瀷")
private String operateType;
+ @ExcelProperty("搴忓彿")
private Integer operationNumber;
+ @ExcelProperty("搴撳瓨缂栧彿")
private Long inventoryId;
+ @ExcelProperty("鐗╂枡缂栫爜")
private Long materialCode;
+ @ExcelProperty("鐗╂枡鍚嶇О")
private String materialName;
+ @ExcelProperty("浜у湴")
private String producer;
+ @ExcelProperty("鍗曚綅")
private String unit;
+ @ExcelProperty("瀹藉害")
private Double width;
+ @ExcelProperty("楂樺害")
private Double height;
+ @ExcelProperty("鍘氬害")
private Double thickness;
+ @ExcelProperty("鏁伴噺")
private Integer quantity;
+ @ExcelProperty("鍗曠墖闈㈢Н")
private Double singlePieceArea;
+ @ExcelProperty("搴撳瓨鍖哄煙")
private String inventoryArea;
+ @ExcelProperty("澶囨敞")
private String remarks;
+ @ExcelProperty("宸ョ▼鍙�")
+ private String projectNo;
+ @ExcelProperty("鎿嶄綔浜�")
private String operator;
+ @ExcelProperty("鍒涘缓鏃堕棿")
private LocalDate operateTime;
+ @ExcelProperty("浼樺寲浣跨敤鏁伴噺")
+ private Integer useCount;
+
}
--
Gitblit v1.8.0