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 | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index b4f54f2..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,14 @@
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
@@ -141,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")
@@ -231,18 +249,18 @@
if (Cools.isEmpty(this.area)) {
return "";
}
- String normalized = this.area.trim();
- String upper = normalized.toUpperCase(Locale.ROOT);
- if ("1".equals(normalized) || "A".equals(upper) || "A鍖�".equals(upper) || "A搴�".equals(upper) || "A搴撳尯".equals(upper)) {
- return "A搴撳尯";
+ 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();
}
- if ("2".equals(normalized) || "B".equals(upper) || "B鍖�".equals(upper) || "B搴�".equals(upper) || "B搴撳尯".equals(upper)) {
- return "B搴撳尯";
- }
- if ("3".equals(normalized) || "C".equals(upper) || "C鍖�".equals(upper) || "C搴�".equals(upper) || "C搴撳尯".equals(upper)) {
- return "C搴撳尯";
- }
- return normalized;
+ return this.area.trim();
}
public String getLocType1$() {
if (null == this.locType1){ return null; }
--
Gitblit v1.9.1