From 07fc18f77a9764bd47857e30d65abc03cc1e439c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 16:21:56 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/common/model/LocDto.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 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 59dcf61..38c5d0c 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -27,11 +27,48 @@
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;
+
+ // 宸ュ簭鐘舵�� 1锛氬緟鍔犲伐锛�2锛氬凡鍔犲伐锛�3锛氭棤闇�鍔犲伐
+ private Integer processSts;
+
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, Double anfme, String matnr, String batch, String csocode, String isoseq, String containerCode,Integer processSts) {
+ this.locNo = locNo;
+ this.anfme = anfme;
+ this.matnr = matnr;
+ this.batch = batch;
+ this.csocode = csocode;
+ this.isoseq = isoseq;
+ this.containerCode = containerCode;
+ this.processSts = processSts;
}
public LocDto(String locNo, String matnr, String batch, Double anfme) {
@@ -58,6 +95,17 @@
this.anfme = anfme;
}
+
+ public LocDto(String locNo, String matnr, String maktx, String batch, String orderNo, Double anfme,Integer processSts) {
+ this.locNo = locNo;
+ this.matnr = matnr;
+ this.maktx = maktx;
+ this.batch = batch;
+ this.orderNo = orderNo;
+ this.anfme = anfme;
+ this.processSts = processSts;
+ }
+
public String getTitle() {
return this.matnr + "锛�" + this.maktx + "锛�";
}
@@ -69,4 +117,11 @@
}
}
+ public void setAgvStaNos(List<String> agvStaNos){
+ this.agvStaNos = agvStaNos;
+ if(!Cools.isEmpty(agvStaNos)){
+ this.agvStaNo = agvStaNos.get(0);
+ }
+ }
+
}
--
Gitblit v1.9.1