From 7045b984af43d5825058b4df4b4dbc7a08cf2db2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:33:53 +0800
Subject: [PATCH] 对接
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index bd7eab3..ca5b7dd 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.LocMastService;
+import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -34,12 +35,12 @@
@ExcelProperty("鏁伴噺")
private Double anfme;
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- @ExcelProperty("鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "鍝佸彿")
+ @ExcelProperty("鍝佸彿")
private String matnr;
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- @ExcelProperty("鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value= "鍝佸悕")
+ @ExcelProperty("鍝佸悕")
private String maktx;
@ApiModelProperty(value= "鎵瑰彿")
@@ -47,11 +48,12 @@
private String batch;
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
- @ExcelProperty("鍗曟嵁缂栧彿")
+// @ExcelProperty("鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
@ApiModelProperty(value= "瑙勬牸")
+ @ExcelProperty("瑙勬牸")
private String specs;
@ApiModelProperty(value= "鍨嬪彿")
@@ -60,10 +62,12 @@
@ApiModelProperty(value= "棰滆壊")
private String color;
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value= "绫诲瀷")
+ @ExcelProperty("绫诲瀷")
private String brand;
@ApiModelProperty(value= "鍗曚綅")
+ @ExcelProperty("鍗曚綅")
private String unit;
@ApiModelProperty(value= "鍗曚环")
@@ -110,6 +114,7 @@
private String threeCode;
@ApiModelProperty(value= "渚涘簲鍟�")
+ @ExcelProperty("渚涘簲鍟�")
private String supp;
@ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
@@ -132,7 +137,7 @@
private Integer source;
@ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer check;
+ private Integer inspect;
@ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
private Integer danger;
@@ -154,7 +159,12 @@
private Date appeTime;
@ApiModelProperty(value= "澶囨敞")
+ @ExcelProperty("澶囨敞")
private String memo;
+
+ @ApiModelProperty(value= "bom鍙�")
+ @TableField("bom_code")
+ private String bomCode;
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
@@ -191,15 +201,15 @@
}
}
- public String getCheck$(){
- if (null == this.check){ return null; }
- switch (this.check){
+ public String getInspect$(){
+ if (null == this.inspect){ return null; }
+ switch (this.inspect){
case 1:
return "鏄�";
case 0:
return "鍚�";
default:
- return String.valueOf(this.check);
+ return String.valueOf(this.inspect);
}
}
@@ -231,7 +241,6 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
-
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
@@ -248,4 +257,8 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
}
--
Gitblit v1.9.1