From c32869d3e82034c2fef651168913cf6efb6faf75 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 18 三月 2025 11:14:53 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
index 6e784bc..c3c09a5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
@@ -22,66 +22,65 @@
@Data
@ExcelAutoColumnSize
@Accessors(chain = true)
-@ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = false)
+//@ToString(callSuper = true)
+//@EqualsAndHashCode(callSuper = false)
public class AsnOrderTemplate implements IExcelModel, IExcelDataModel, Serializable {
@Excel(name = "琛屽彿")
- @ExcelComment(example = "1357564255478")
+ @ExcelComment(value = "platItemId", example = "1357564255478")
private String platItemId;
@Excel(name = "鐗╂枡鍚嶇О")
- @ExcelComment(example = "鐗╂枡鍚嶇О")
+ @ExcelComment(value = "matnk",example = "鐗╂枡鍚嶇О")
private String matnk;
@Excel(name = "鏁伴噺")
- @ExcelComment(example = "25")
+ @ExcelComment(value = "anfme",example = "25")
private Double anfme;
@Excel(name = "搴撳瓨鍗曚綅")
- @ExcelComment(example = "涓�")
+ @ExcelComment(value = "stockUnit",example = "涓�")
private String stockUnit;
@Excel(name = "閲囪喘鏁伴噺")
- @ExcelComment(example = "25")
+ @ExcelComment(value = "purQty",example = "25")
private Double purQty;
@Excel(name = "閲囪喘鍗曚綅")
- @ExcelComment(example = "涓�")
+ @ExcelComment(value = "purUnit",example = "涓�")
private String purUnit;
@Excel(name = "宸插畬鎴愭暟閲�")
- @ExcelComment(example = "25")
+ @ExcelComment(value = "qty",example = "25")
private Double qty;
@Excel(name = "渚涘簲鍟嗙紪鐮�")
- @ExcelComment(example = "3654821")
+ @ExcelComment(value = "splrCode",example = "3654821")
private String splrCode;
@Excel(name = "渚涘簲鍟嗗悕绉�")
- @ExcelComment(example = "娴欐睙涓壃鎶�鏈叕鍙�")
+ @ExcelComment(value = "splrName",example = "娴欐睙涓壃鎶�鏈叕鍙�")
private String splrName;
@Excel(name = "渚涘簲鍟嗘壒娆�")
- @ExcelComment(example = "25251212")
+ @ExcelComment(value = "splrBatch",example = "25251212")
private String splrBatch;
@Excel(name = "浜岀淮鐮�")
- @ExcelComment(example = "")
+ @ExcelComment(value = "qrcode",example = "")
private String qrcode;
@Excel(name = "鏉″舰鐮�")
- @ExcelComment(example = "2354788")
+ @ExcelComment(value = "barcode",example = "2354788")
private String barcode;
@Excel(name = "鍖呰鍚嶇О")
- @ExcelComment(example = "绠�")
+ @ExcelComment(value = "packName",example = "绠�")
private String packName;
@Excel(name = "澶囨敞")
- @ExcelComment(example = "娉細鏄撶鍝侊紝杞绘嬁鏀�")
+ @ExcelComment(value = "memo",example = "娉細鏄撶鍝侊紝杞绘嬁鏀�")
private String memo;
-
private Integer rowNum;
--
Gitblit v1.9.1