From 7b72d43503aa5df4c152b777777085d3cd5e2132 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期六, 06 十二月 2025 15:49:25 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
---
src/main/java/com/zy/common/model/LocDto.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index fd543b4..19410a6 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -19,6 +19,14 @@
private String maktx;
private String batch;
+ private String brand = "";
+ private String standby1 = "";
+ private String standby2 = "";
+ private String standby3 = "";
+
+ private String boxType1 = "1";
+ private String boxType2 = "1";
+ private String boxType3 = "1";
private String orderNo;
@@ -27,7 +35,9 @@
/**
* 鏄惁鍐荤粨 "鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�"
*/
- private Integer frozen;
+ private Integer frozen = 1;
+
+ private Integer frozenLoc = 1;
// private Integer frozen$;
@@ -36,6 +46,10 @@
private List<Integer> staNos;
private Integer staNo;
+
+ private List<String> agvStaNos;
+
+ private String agvStaNo;
public LocDto() {
}
@@ -75,15 +89,34 @@
}
}
+ public void setAgvStaNos(List<String> agvStaNos) {
+ this.agvStaNos = agvStaNos;
+ if (!Cools.isEmpty(agvStaNos)) {
+ this.agvStaNo = agvStaNos.get(0);
+ }
+ }
+
public String getFrozen$() {
if (null == this.frozen){ return null; }
switch (this.frozen){
case 0:
- return "鏈喕缁�";
+ return "姝ｅ父";
case 1:
return "宸插喕缁�";
default:
- return "鏈喕缁�";
+ return "姝ｅ父";
+ }
+ }
+
+ public String getFrozenLoc$() {
+ if (null == this.frozenLoc){ return null; }
+ switch (this.frozenLoc){
+ case 0:
+ return "姝ｅ父";
+ case 1:
+ return "宸插喕缁�";
+ default:
+ return "姝ｅ父";
}
}
--
Gitblit v1.9.1