From a484168b903a919b24d65a5d95dea88a04d8f34c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 26 十二月 2024 13:50:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs
---
src/main/java/com/zy/common/model/LocDto.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index 970d523..5399cce 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -1,8 +1,10 @@
package com.zy.common.model;
+import com.core.common.Cools;
import lombok.Data;
import java.util.List;
+import java.util.Map;
/**
* Created by vincent on 2022/3/28
@@ -24,7 +26,10 @@
private boolean lack = false;
- private List<Integer> staNos;
+ private List<staListDto> staNos;
+
+ private Integer staNo;
+ private String staName;
public LocDto() {
}
@@ -52,9 +57,22 @@
this.orderNo = orderNo;
this.anfme = anfme;
}
+ @Data
+ public static class staListDto{
+ private Integer staNo;
+ private String staName;
+ }
public String getTitle() {
return this.matnr + "锛�" + this.maktx + "锛�";
}
+ public void setStaNos(List<staListDto> staNos) {
+ this.staNos = staNos;
+ if (!Cools.isEmpty(staNos)) {
+ this.staNo = staNos.get(0).getStaNo();
+ this.staName = staNos.get(0).getStaName();
+ }
+ }
+
}
--
Gitblit v1.9.1