From b67bf724fc788cb3b86641c7eb7a35cdbc4c7a93 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 06 五月 2025 20:17:25 +0800
Subject: [PATCH] PO单导入功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java | 67 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 21 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 6c59ceb..c605541 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
@@ -45,7 +45,7 @@
@Excel(name = "PO鍗曟嵁鏍囪瘑")
@ApiModelProperty(value= "PO鍗曟嵁鏍囪瘑")
@ExcelComment(value = "poId", example = "123456698")
- private Long poId;
+ private String poId;
/**
* 鍗曟嵁绫诲瀷
@@ -59,30 +59,50 @@
* 涓氬姟绫诲瀷
*/
@Excel(name = "涓氬姟绫诲瀷")
- @ApiModelProperty("涓氬姟绫诲瀷")
- @ExcelComment(value = "wkType", example = "鐢熶骇鍏ュ簱")
+ @ApiModelProperty(value= "涓氬姟绫诲瀷")
+ @ExcelComment(value = "wkType", example = "瀹屽伐鍏ュ簱鍗�")
private String wkType;
@Excel(name = "鎵ц鐘舵��")
- @ApiModelProperty("鎵ц鐘舵��")
- @ExcelComment(value = "exceStatus", example = "鏈墽琛�")
- private Short exceStatus;
+ @ApiModelProperty(value= "鎵ц鐘舵��")
+ @ExcelComment(value = "exceStatus", example = "0")
+ private String exceStatus;
@Excel(name = "琛屽彿")
- @ExcelComment(value = "platItemId", example = "1357564255478")
@ApiModelProperty("琛屽彿")
+ @ExcelComment(value = "platItemId", example = "1357564255478")
private String platItemId;
+
+
+ @Excel(name = "鐗╂枡缂栫爜")
+ @ApiModelProperty("鐗╂枡缂栫爜")
+ @ExcelComment(value = "matnrCode",example = "102010101545")
+ private String matnrCode;
+
@Excel(name = "鐗╂枡鍚嶇О")
@ApiModelProperty("鐗╂枡鍚嶇О")
- @ExcelComment(value = "matnk",example = "鐗╂枡鍚嶇О")
- private String matnk;
+ @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 Double anfme;
+ private String anfme;
@Excel(name = "搴撳瓨鍗曚綅")
@ApiModelProperty("搴撳瓨鍗曚綅")
@@ -91,8 +111,8 @@
@Excel(name = "閲囪喘鏁伴噺")
@ApiModelProperty("閲囪喘鏁伴噺")
- @ExcelComment(value = "purQty",example = "25")
- private Double purQty;
+ @ExcelComment(value = "purQty",example = "0")
+ private String purQty;
@Excel(name = "閲囪喘鍗曚綅")
@ApiModelProperty("閲囪喘鍗曚綅")
@@ -101,17 +121,17 @@
@Excel(name = "宸插畬鎴愭暟閲�")
@ApiModelProperty("宸插畬鎴愭暟閲�")
- @ExcelComment(value = "qty",example = "25")
- private Double qty;
+ @ExcelComment(value = "qty",example = "0")
+ private String qty;
@Excel(name = "渚涘簲鍟嗙紪鐮�")
@ApiModelProperty("渚涘簲鍟嗙紪鐮�")
- @ExcelComment(value = "splrCode",example = "3654821")
+ @ExcelComment(value = "splrCode",example = "685947")
private String splrCode;
@Excel(name = "渚涘簲鍟嗗悕绉�")
@ApiModelProperty("渚涘簲鍟嗗悕绉�")
- @ExcelComment(value = "splrName",example = "娴欐睙涓壃鎶�鏈叕鍙�")
+ @ExcelComment(value = "splrName",example = "娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�")
private String splrName;
@Excel(name = "渚涘簲鍟嗘壒娆�")
@@ -119,16 +139,21 @@
@ExcelComment(value = "splrBatch",example = "25251212")
private String splrBatch;
- @Excel(name = "浜岀淮鐮�")
- @ApiModelProperty("浜岀淮鐮�")
- @ExcelComment(value = "qrcode",example = "")
- private String qrcode;
+// @Excel(name = "浜岀淮鐮�")
+// @ApiModelProperty("浜岀淮鐮�")
+// @ExcelComment(value = "qrcode",example = "")
+// private String qrcode;
@Excel(name = "鏉″舰鐮�")
@ApiModelProperty("鏉″舰鐮�")
- @ExcelComment(value = "barcode",example = "2354788")
+ @ExcelComment(value = "barcode",example = "")
private String barcode;
+ @Excel(name = "璺熻釜鐮�")
+ @ApiModelProperty("璺熻釜鐮�")
+ @ExcelComment(value = "trackCode",example = "")
+ private String trackCode;
+
@Excel(name = "鍖呰鍚嶇О")
@ApiModelProperty("鍖呰鍚嶇О")
@ExcelComment(value = "packName",example = "绠�")
--
Gitblit v1.9.1