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/asrs/entity/mes/MesCallOutApply.java | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/mes/MesCallOutApply.java b/src/main/java/com/zy/asrs/entity/mes/MesCallOutApply.java
index 1d141cf..dd78348 100644
--- a/src/main/java/com/zy/asrs/entity/mes/MesCallOutApply.java
+++ b/src/main/java/com/zy/asrs/entity/mes/MesCallOutApply.java
@@ -12,23 +12,23 @@
@Data
public class MesCallOutApply extends MesParent {
-// // 浠诲姟缂栧彿
-// private String taskno;
-// // 浠诲姟鍚嶇О
-// private String taskname;
-// // 鐢熶骇璁㈠崟鍙�
-// @JsonProperty("OrderNo")
-// private String OrderNo;
+ // 浠诲姟缂栧彿
+ private String taskno;
+ // 浠诲姟鍚嶇О
+ private String taskname;
+ // 鐢熶骇璁㈠崟鍙�
+ @JsonProperty("OrderNo")
+ private String OrderNo;
// 杩愯緭绫诲瀷锛屽瓧鍏稿��(wms_tranfs_type) 06 瑁呴厤棰嗘枡锛�01锛氱┖鎵�
@JsonProperty("TransType")
@JSONField(name = "TransType")
private String TransType;
-// // 鐢熶骇绾跨紪鐮�
-// @JsonProperty("ProductLineId")
-// private String ProductLineId;
-// // 宸ヤ綅缂栫爜
-// @JsonProperty("StationId")
-// private String StationId;
+ // 鐢熶骇绾跨紪鐮�
+ @JsonProperty("ProductLineId")
+ private String ProductLineId;
+ // 宸ヤ綅缂栫爜
+ @JsonProperty("StationId")
+ private String StationId;
// 褰撳墠宸ュ簭
@JsonProperty("CurProcess")
@JSONField(name = "CurProcess")
@@ -37,6 +37,11 @@
@JsonProperty("Itemdata")
@JSONField(name = "Itemdata")
private List<MesOutApplyItem> Itemdata;
+
+ // 绌烘墭鐩樻暟閲�
+ @JsonProperty("EmptyCount")
+ @JSONField(name = "EmptyCount")
+ private List<MesOutApplyItem> EmptyCount;
// 锛坰fc_shop_route_consume锛塵es涓厤鐩樿〃鍚�
@Data
@@ -56,6 +61,17 @@
@JsonProperty("ItemBarcode")
@JSONField(name = "ItemBarcode")
private String ItemBarcode;
+
+ // 鐗╂枡浜岀淮鐮�
+ @JsonProperty("stationAGV")
+ @JSONField(name = "stationAGV")
+ private String stationAGV;
+
+ //鎵樼洏鐮�
+ private String wmsBarcode;
+
+ //鏂欐灦鍙�
+ private String rackNumber;
}
}
--
Gitblit v1.9.1