From f5b4f189e460480a96acf3d1864344d8d5d92695 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 07 五月 2025 10:18:57 +0800
Subject: [PATCH] PO单模板优化 ASN单模板优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java | 191 +++++++++++++++++++++++++----------------------
1 files changed, 102 insertions(+), 89 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 c605541..c36fa76 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
@@ -3,11 +3,13 @@
import cn.afterturn.easypoi.excel.annotation.Excel;
import cn.afterturn.easypoi.handler.inter.IExcelDataModel;
import cn.afterturn.easypoi.handler.inter.IExcelModel;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.manager.entity.excel.annotation.ExcelAutoColumnSize;
import com.vincent.rsf.server.manager.entity.excel.annotation.ExcelComment;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -26,8 +28,8 @@
/**
* 缂栧彿
*/
- @Excel(name = "缂栧彿")
- @ApiModelProperty(value= "缂栧彿")
+ @Excel(name = "*缂栧彿")
+ @ApiModelProperty(value = "*缂栧彿")
@ExcelComment(value = "code", example = "ASN5945272236")
private String code;
@@ -35,39 +37,17 @@
* PO鍗曞彿
*/
@Excel(name = "PO鍗曞彿")
- @ApiModelProperty(value= "PO鍗曞彿")
+ @ApiModelProperty(value = "PO鍗曞彿")
@ExcelComment(value = "poCode", example = "PO59755695")
private String poCode;
- /**
- * PO鍗曟嵁鏍囪瘑
- */
- @Excel(name = "PO鍗曟嵁鏍囪瘑")
- @ApiModelProperty(value= "PO鍗曟嵁鏍囪瘑")
- @ExcelComment(value = "poId", example = "123456698")
- private String poId;
-
- /**
- * 鍗曟嵁绫诲瀷
- */
- @Excel(name = "鍗曟嵁绫诲瀷")
- @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
- @ExcelComment(value = "type", example = "鍏ュ簱鍗�")
- private String type;
-
- /**
- * 涓氬姟绫诲瀷
- */
- @Excel(name = "涓氬姟绫诲瀷")
- @ApiModelProperty(value= "涓氬姟绫诲瀷")
- @ExcelComment(value = "wkType", example = "瀹屽伐鍏ュ簱鍗�")
- private String wkType;
-
-
- @Excel(name = "鎵ц鐘舵��")
- @ApiModelProperty(value= "鎵ц鐘舵��")
- @ExcelComment(value = "exceStatus", example = "0")
- private String exceStatus;
+// /**
+// * PO鍗曟嵁鏍囪瘑
+// */
+// @Excel(name = "PO鍗曟嵁鏍囪瘑")
+// @ApiModelProperty(value= "PO鍗曟嵁鏍囪瘑")
+// @ExcelComment(value = "poId", example = "123456698")
+// private String poId;
@Excel(name = "琛屽彿")
@ApiModelProperty("琛屽彿")
@@ -75,93 +55,126 @@
private String platItemId;
- @Excel(name = "鐗╂枡缂栫爜")
- @ApiModelProperty("鐗╂枡缂栫爜")
- @ExcelComment(value = "matnrCode",example = "102010101545")
+ /**
+ * 鍗曟嵁绫诲瀷
+ */
+ @Excel(name = "*鍗曟嵁绫诲瀷")
+ @ApiModelProperty(value = "*鍗曟嵁绫诲瀷")
+ @ExcelComment(value = "type", example = "閲囪喘鍏ュ簱鍗�")
+ private String type;
+
+ /**
+ * 涓氬姟绫诲瀷
+ */
+ @Excel(name = "*涓氬姟绫诲瀷")
+ @ApiModelProperty(value = "*涓氬姟绫诲瀷")
+ @ExcelComment(value = "wkType", example = "瀹屽伐鍏ュ簱鍗�")
+ private String wkType;
+
+
+// @Excel(name = "鎵ц鐘舵��")
+// @ApiModelProperty(value= "鎵ц鐘舵��")
+// @ExcelComment(value = "exceStatus", example = "0")
+// private String exceStatus;
+
+
+ @Excel(name = "*鐗╂枡缂栫爜")
+ @ApiModelProperty("*鐗╂枡缂栫爜")
+ @ExcelComment(value = "matnrCode", example = "102010101545")
private String matnrCode;
@Excel(name = "鐗╂枡鍚嶇О")
@ApiModelProperty("鐗╂枡鍚嶇О")
- @ExcelComment(value = "maktx",example = "澶╃憺019-澶鍨嬫敮鏋�-55椋炴満杞粦鑹诧紝涓夎杞洊鍠锋紗閾惰壊 锛堝甫鏀讳笣閽夛級鍙�")
+ @ExcelComment(value = "maktx", example = "澶╃憺019-澶鍨嬫敮鏋�-55椋炴満杞粦鑹诧紝涓夎杞洊鍠锋紗閾惰壊 锛堝甫鏀讳笣閽夛級鍙�")
private String maktx;
- @Excel(name = "鐗╂枡瑙勬牸")
- @ApiModelProperty("鐗╂枡瑙勬牸")
- @ExcelComment(value = "maktx",example = "2*3*6")
- private String spec;
-
-
- @Excel(name = "鐗╂枡鍨嬪彿")
- @ApiModelProperty("鐗╂枡鍨嬪彿")
- @ExcelComment(value = "maktx",example = "abc")
- private String model;
-
-
- @Excel(name = "鏁伴噺")
- @ApiModelProperty("鏁伴噺")
- @ExcelComment(value = "anfme",example = "25")
- private String anfme;
-
- @Excel(name = "搴撳瓨鍗曚綅")
- @ApiModelProperty("搴撳瓨鍗曚綅")
- @ExcelComment(value = "stockUnit",example = "涓�")
- private String stockUnit;
-
- @Excel(name = "閲囪喘鏁伴噺")
- @ApiModelProperty("閲囪喘鏁伴噺")
- @ExcelComment(value = "purQty",example = "0")
- private String purQty;
-
- @Excel(name = "閲囪喘鍗曚綅")
- @ApiModelProperty("閲囪喘鍗曚綅")
- @ExcelComment(value = "purUnit",example = "涓�")
- private String purUnit;
-
- @Excel(name = "宸插畬鎴愭暟閲�")
- @ApiModelProperty("宸插畬鎴愭暟閲�")
- @ExcelComment(value = "qty",example = "0")
- private String qty;
-
+ // @Excel(name = "鐗╂枡瑙勬牸")
+// @ApiModelProperty("鐗╂枡瑙勬牸")
+// @ExcelComment(value = "maktx",example = "2*3*6")
+// private String spec;
+//
+//
+// @Excel(name = "鐗╂枡鍨嬪彿")
+// @ApiModelProperty("鐗╂枡鍨嬪彿")
+// @ExcelComment(value = "maktx",example = "abc")
+// private String model;
@Excel(name = "渚涘簲鍟嗙紪鐮�")
@ApiModelProperty("渚涘簲鍟嗙紪鐮�")
- @ExcelComment(value = "splrCode",example = "685947")
+ @ExcelComment(value = "splrCode", example = "685947")
private String splrCode;
@Excel(name = "渚涘簲鍟嗗悕绉�")
@ApiModelProperty("渚涘簲鍟嗗悕绉�")
- @ExcelComment(value = "splrName",example = "娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�")
+ @ExcelComment(value = "splrName", example = "娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�")
private String splrName;
+
+
+// @Excel(name = "搴撳瓨鍗曚綅")
+// @ApiModelProperty("搴撳瓨鍗曚綅")
+// @ExcelComment(value = "stockUnit", example = "涓�")
+// private String stockUnit;
+
+// @Excel(name = "閲囪喘鏁伴噺")
+// @ApiModelProperty("閲囪喘鏁伴噺")
+// @ExcelComment(value = "purQty", example = "0")
+// private String purQty;
+//
+// @Excel(name = "閲囪喘鍗曚綅")
+// @ApiModelProperty("閲囪喘鍗曚綅")
+// @ExcelComment(value = "purUnit", example = "涓�")
+// private String purUnit;
+
+// @Excel(name = "宸插畬鎴愭暟閲�")
+// @ApiModelProperty("宸插畬鎴愭暟閲�")
+// @ExcelComment(value = "qty", example = "0")
+// private String qty;
+
@Excel(name = "渚涘簲鍟嗘壒娆�")
@ApiModelProperty("渚涘簲鍟嗘壒娆�")
- @ExcelComment(value = "splrBatch",example = "25251212")
+ @ExcelComment(value = "splrBatch", example = "25251212")
private String splrBatch;
+
+ @Excel(name = "*鏁伴噺")
+ @ApiModelProperty("*鏁伴噺")
+ @ExcelComment(value = "anfme", example = "75")
+ private String anfme;
+
// @Excel(name = "浜岀淮鐮�")
// @ApiModelProperty("浜岀淮鐮�")
// @ExcelComment(value = "qrcode",example = "")
// private String qrcode;
- @Excel(name = "鏉″舰鐮�")
- @ApiModelProperty("鏉″舰鐮�")
- @ExcelComment(value = "barcode",example = "")
- private String barcode;
+ // @Excel(name = "鏉″舰鐮�")
+// @ApiModelProperty("鏉″舰鐮�")
+// @ExcelComment(value = "barcode", example = "")
+// private String barcode;
+//
+// @Excel(name = "璺熻釜鐮�")
+// @ApiModelProperty("璺熻釜鐮�")
+// @ExcelComment(value = "trackCode", example = "")
+// private String trackCode;
+ @Excel(name = "鐗╂祦鍗曞彿")
+ @ApiModelProperty("鐗╂祦鍗曞彿")
+ @ExcelComment(value = "logicNo", example = "SF100064851")
+ private String logicNo;
- @Excel(name = "璺熻釜鐮�")
- @ApiModelProperty("璺熻釜鐮�")
- @ExcelComment(value = "trackCode",example = "")
- private String trackCode;
+ @Excel(name = "棰勮閫佽揪鏃堕棿")
+ @ApiModelProperty("棰勮閫佽揪鏃堕棿")
+ @ExcelComment(value = "arrTime", example = "2025-05-21")
+ private String arrTime;
- @Excel(name = "鍖呰鍚嶇О")
- @ApiModelProperty("鍖呰鍚嶇О")
- @ExcelComment(value = "packName",example = "绠�")
- private String packName;
+// @Excel(name = "鍖呰鍚嶇О")
+// @ApiModelProperty("鍖呰鍚嶇О")
+// @ExcelComment(value = "packName", example = "绠�")
+// private String packName;
@Excel(name = "澶囨敞")
@ApiModelProperty("澶囨敞")
- @ExcelComment(value = "memo",example = "娉細鏄撶鍝侊紝杞绘嬁鏀�")
+ @ExcelComment(value = "memo", example = "娉細鏄撶鍝侊紝杞绘嬁鏀�")
private String memo;
}
--
Gitblit v1.9.1