From a49cdaa669f18d92e8fef5d84da536c0465670db Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 17 十二月 2025 21:21:07 +0800
Subject: [PATCH] 1.新增组托入库生成AGV搬运任务，执行AGV搬运任务时判断堆垛机接驳站点是否有空料架，有的话需要进行搬离（没有出库任务的情况下） 2.完善配盘出库单agv目标地点，可能是区域也可能是站点 Q为区域；Z为站点 3.完善立库入库找规则方法
---
src/main/java/com/zy/common/model/LocDto.java | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 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..eaaffee 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -1,6 +1,7 @@
package com.zy.common.model;
import com.core.common.Cools;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@@ -18,10 +19,27 @@
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;
private Double anfme;
+
+ /**
+ * 鏄惁鍐荤粨 "鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�"
+ */
+ private Integer frozen = 1;
+
+ private Integer frozenLoc = 1;
+
+// private Integer frozen$;
private boolean lack = false;
@@ -67,4 +85,28 @@
}
}
+ public String getFrozen$() {
+ if (null == this.frozen){ return null; }
+ switch (this.frozen){
+ case 0:
+ return "姝ｅ父";
+ case 1:
+ return "宸插喕缁�";
+ default:
+ 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