From dee0bff47af3c0b84b2e97c595cbb45e0cd500b1 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 02 十一月 2024 14:26:48 +0800
Subject: [PATCH] 批量导入
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 13ad69c..c049038 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -37,34 +37,34 @@
@ExcelProperty("鏁伴噺")
private Double anfme;
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- @ExcelProperty("鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "瑙勬牸")
+ @ExcelProperty("瑙勬牸")
private String matnr;
@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
@ExcelProperty("鍟嗗搧鍚嶇О")
private String maktx;
- @ApiModelProperty(value= "瑙勬牸")
- @ExcelProperty("瑙勬牸")
+ @ApiModelProperty(value= "鎺ュご")
private String specs;
- @ApiModelProperty(value= "璐у搧鐗瑰緛")
- @ExcelProperty("璐у搧鐗瑰緛")
+ @ApiModelProperty(value= "绠卞彿")
+// @ExcelProperty("绠卞彿")
private String batch;
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
- @ExcelProperty("鍗曟嵁缂栧彿")
+// @ExcelProperty("鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value= "鍗峰彿")
private String model;
@ApiModelProperty(value= "棰滆壊")
private String color;
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value= "鏈ㄧ绫诲瀷")
+ @ExcelProperty("鏈ㄧ绫诲瀷")
private String brand;
@ApiModelProperty(value= "鍗曚綅")
@@ -128,7 +128,7 @@
@TableField("dead_time")
private String deadTime;
- @ApiModelProperty(value= "棰勮澶╂暟")
+ @ApiModelProperty(value= "鐞嗚揣鏍囪瘑 0鏈悊璐э紝1鐞嗚揣涓紝2鐞嗚揣瀹屾垚")
@TableField("dead_warn")
private Integer deadWarn;
@@ -188,6 +188,20 @@
}
}
+ public String getDeadWarn$(){
+ if (null == this.deadWarn){ return "鏈悊璐�"; }
+ switch (this.deadWarn){
+ case 0:
+ return "鏈悊璐�";
+ case 1:
+ return "鐞嗚揣涓�";
+ case 2:
+ return "宸茬悊璐�";
+ default:
+ return String.valueOf(this.beBatch);
+ }
+ }
+
public String getSource$(){
if (null == this.source){ return null; }
switch (this.source){
@@ -241,7 +255,7 @@
if (!Cools.isEmpty(basBoxType)){
return String.valueOf(basBoxType.getBoxSpecs());
}
- return null;
+ return this.brand;
}
public String getModiTime$(){
--
Gitblit v1.9.1