From f6200ebe355ac91ca2e1a261dd6d2237f3d046b6 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期一, 06 四月 2026 16:06:11 +0800
Subject: [PATCH] 托盘报错增加显示
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index bd0bf0d..060c30f 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -18,6 +18,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -48,11 +49,11 @@
private String maktx;
@ApiModelProperty(value= "瑙勬牸")
- @ExcelProperty("瑙勬牸")
+ //@ExcelProperty("瑙勬牸")
private String specs;
@ApiModelProperty(value= "璐у搧鐗瑰緛")
- @ExcelProperty("璐у搧鐗瑰緛")
+ //@ExcelProperty("璐у搧鐗瑰緛")
private String batch;
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@@ -103,10 +104,11 @@
private Double safeQty;
@ApiModelProperty(value= "閲嶉噺")
- private Double weight;
+ private BigDecimal weight;
@ApiModelProperty(value= "闀垮害")
- private Double man_length;
+ @TableField("man_length")
+ private Double manLength;
@ApiModelProperty(value= "浣撶Н")
private Double volume;
@@ -168,32 +170,33 @@
@ApiModelProperty(value= "鎷ユ湁鑰� 1: 鏉板厠 ")
private Integer owner;
- @ApiModelProperty(value= "瀹㈡埛缂栧彿")
- private Long uuid;
+ /**
+ * 澶囩敤1(PO)
+ */
+ @ApiModelProperty(value= "澶囩敤1")//PO
+ @ExcelProperty("瀹㈡埛PO")
+ private String standby1 = "1";
/**
- * 澶囩敤1
+ * 澶囩敤2(UPC)
*/
- @ApiModelProperty(value= "澶囩敤1")
- private String standby1 = "";
+ @ApiModelProperty(value= "澶囩敤2")//UPC
+ @ExcelProperty("鏉＄爜UPC")
+ private String standby2 = "1";
/**
- * 澶囩敤2
+ * 澶囩敤3(SKU)
*/
- @ApiModelProperty(value= "澶囩敤2")
- private String standby2 = "";
-
- /**
- * 澶囩敤3
- */
- @ApiModelProperty(value= "澶囩敤3")
- private String standby3 = "";
+ @ApiModelProperty(value= "澶囩敤3")//SKU
+ @ExcelProperty("瀹㈡埛SKU")
+ private String standby3 = "1";
/**
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
@TableField("box_type1")
+ @ExcelProperty("璐т富")
private String boxType1 = "1";
/**
@@ -208,6 +211,7 @@
*/
@ApiModelProperty(value= "澶囩敤3")
@TableField("box_type3")
+ @ExcelProperty("閲囪喘鍗曞彿")
private String boxType3 = "1";
/**
--
Gitblit v1.9.1