From 0696db2f8a83d32d8c00ba55967694ed1a76f4d0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 05 五月 2025 16:07:35 +0800
Subject: [PATCH] 1. 往来企业问题修复 2. 组托问题修复 3. 库位信息问题修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 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 c1ffab9..c8b8e13 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
@@ -74,15 +74,30 @@
@ExcelComment(value = "platItemId", example = "1357564255478")
private String platItemId;
- @Excel(name = "鐗╂枡鍚嶇О")
- @ApiModelProperty("鐗╂枡鍚嶇О")
- @ExcelComment(value = "maktx",example = "鐗╂枡鍚嶇О")
- private String maktx;
@Excel(name = "鐗╂枡缂栫爜")
@ApiModelProperty("鐗╂枡缂栫爜")
- @ExcelComment(value = "matnrCode",example = "鐗╂枡缂栫爜")
+ @ExcelComment(value = "matnrCode",example = "102010101545")
private String matnrCode;
+
+
+ @Excel(name = "鐗╂枡鍚嶇О")
+ @ApiModelProperty("鐗╂枡鍚嶇О")
+ @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("鏁伴噺")
@@ -96,7 +111,7 @@
@Excel(name = "閲囪喘鏁伴噺")
@ApiModelProperty("閲囪喘鏁伴噺")
- @ExcelComment(value = "purQty",example = "25")
+ @ExcelComment(value = "purQty",example = "0")
private String purQty;
@Excel(name = "閲囪喘鍗曚綅")
@@ -106,7 +121,7 @@
@Excel(name = "宸插畬鎴愭暟閲�")
@ApiModelProperty("宸插畬鎴愭暟閲�")
- @ExcelComment(value = "qty",example = "25")
+ @ExcelComment(value = "qty",example = "0")
private String qty;
@Excel(name = "渚涘簲鍟嗙紪鐮�")
@@ -134,6 +149,11 @@
@ExcelComment(value = "barcode",example = "2354788")
private String barcode;
+ @Excel(name = "璺熻釜鐮�")
+ @ApiModelProperty("璺熻釜鐮�")
+ @ExcelComment(value = "trackCode",example = "2354788")
+ private String trackCode;
+
@Excel(name = "鍖呰鍚嶇О")
@ApiModelProperty("鍖呰鍚嶇О")
@ExcelComment(value = "packName",example = "绠�")
--
Gitblit v1.9.1