From a1f7856f0f450883c7060444a4fc2b721720a051 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 15 四月 2026 11:00:05 +0800
Subject: [PATCH] 1.erp对接新增字段 2.电视机数据
---
src/main/java/com/zy/asrs/entity/BasDevp.java | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index 0e683f1..7be3d1c 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -8,12 +8,15 @@
import com.zy.system.service.UserService;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.utils.Utils;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
+import java.util.Locale;
@Data
@TableName("asr_bas_devp")
@@ -140,8 +143,24 @@
@TableField("io_time")
private Date ioTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "缁戝畾搴撳尯锛堜粎绠＄悊鐢ㄩ�旓級")
private String area;
+
+ @ApiModelProperty(value= "鍏ュ簱绗竴浼樺厛鍫嗗灈鏈猴紝CSV")
+ @TableField("in_first_crn_csv")
+ private String inFirstCrnCsv;
+
+ @ApiModelProperty(value= "鍏ュ簱绗簩浼樺厛鍫嗗灈鏈猴紝CSV")
+ @TableField("in_second_crn_csv")
+ private String inSecondCrnCsv;
+
+ @ApiModelProperty(value= "鍏ュ簱绗竴浼樺厛姹犲綋鍓嶅爢鍨涙満鍙�")
+ @TableField("in_first_crn_current_no")
+ private Integer inFirstCrnCurrentNo;
+
+ @ApiModelProperty(value= "鍏ュ簱绗簩浼樺厛姹犲綋鍓嶅爢鍨涙満鍙�")
+ @TableField("in_second_crn_current_no")
+ private Integer inSecondCrnCurrentNo;
@ApiModelProperty(value= "")
@TableField("in_ok")
@@ -214,6 +233,10 @@
@TableField("cart_pos")
private Integer cartPos;
+ @ApiModelProperty(value = "1妤兼媶鍨涗笂浼犲彔鐩樺洖搴撴爣璁�")
+ @TableField("report_sign")
+ private Integer reportSign;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
@@ -222,15 +245,32 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
+ public String getArea$() {
+ if (Cools.isEmpty(this.area)) {
+ return "";
+ }
+ List<Integer> areas = Utils.parseStorageAreas(this.area);
+ if (!Cools.isEmpty(areas)) {
+ StringBuilder builder = new StringBuilder();
+ for (Integer areaNo : areas) {
+ if (builder.length() > 0) {
+ builder.append("銆�");
+ }
+ builder.append(Utils.formatStorageArea(areaNo));
+ }
+ return builder.toString();
+ }
+ return this.area.trim();
+ }
public String getLocType1$() {
if (null == this.locType1){ return null; }
switch (this.locType1){
case 0:
return "鏈煡";
case 1:
- return "灏忓簱浣�";
+ return "浣庡簱浣�";
case 2:
- return "澶у簱浣�";
+ return "楂樺簱浣�";
default:
return String.valueOf(this.locType1);
}
@@ -297,3 +337,4 @@
}
}
+
--
Gitblit v1.9.1