From 828b592b5f8e31204f93bcc2ea0c5866bdc0dcf0 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 06 十二月 2023 20:18:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1
---
src/main/java/com/zy/common/model/LocDto.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index ca099a3..785eb50 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -27,9 +27,34 @@
private List<Integer> staNos;
+ private List<String> agvStaNos;
+
private Integer staNo;
+ private String agvStaNo;
+
+ private String specs;
+
+ //閿�鍞鍗曞彿
+ private String csocode;
+
+ //閿�鍞鍗曡鍙�
+ private String isoseq;
+
+ //鏂欑鐮�
+ private String containerCode;
+
public LocDto() {
+ }
+
+ public LocDto(String locNo, Double anfme, String matnr, String batch, String csocode, String isoseq, String containerCode) {
+ this.locNo = locNo;
+ this.anfme = anfme;
+ this.matnr = matnr;
+ this.batch = batch;
+ this.csocode = csocode;
+ this.isoseq = isoseq;
+ this.containerCode = containerCode;
}
public LocDto(String locNo, String matnr, String batch, Double anfme) {
@@ -67,4 +92,11 @@
}
}
+ public void setAgvStaNos(List<String> agvStaNos){
+ this.agvStaNos = agvStaNos;
+ if(!Cools.isEmpty(agvStaNos)){
+ this.agvStaNo = agvStaNos.get(0);
+ }
+ }
+
}
--
Gitblit v1.9.1