From 29d3f24dc43df41103bc5f483bfc439494a80971 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 17 十二月 2025 09:30:32 +0800
Subject: [PATCH] 对接mes 对接华晓agv 对接海康agv 初始化开发

---
 src/main/java/com/zy/asrs/entity/mes/MesOutApply.java |   87 +++++++++++++++++++++++++++++--------------
 1 files changed, 58 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/mes/MesOutApply.java b/src/main/java/com/zy/asrs/entity/mes/MesOutApply.java
index 2c79729..230e26a 100644
--- a/src/main/java/com/zy/asrs/entity/mes/MesOutApply.java
+++ b/src/main/java/com/zy/asrs/entity/mes/MesOutApply.java
@@ -12,37 +12,66 @@
 @Data
 public class MesOutApply extends MesParent {
 
-//    // 浠诲姟缂栧彿
-//    private String taskno;
-//    // 浠诲姟鍚嶇О
-//    private String taskname;
-//    // 鐢熶骇璁㈠崟鍙�
-//    @JsonProperty("OrderNo")
-//    @JSONField(name = "OrderNo")
-//    private String OrderNo;
-    // 杩愯緭绫诲瀷锛屽瓧鍏稿��(wms_tranfs_type) 01锛氱珛搴撳嚭绌烘墭锛�02 绔嬪簱鍏ョ┖鎵橈紱03 绔嬪簱鍑烘瘺鍧紱 04 绔嬪簱鍥炴瘺鍧紱 05 绔嬪簱鍑烘垚鍝侊紱06 绔嬪簱鍏ユ垚鍝侊紱
+    // 浠诲姟缂栧彿
+    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("Itemno")
-    @JSONField(name = "Itemno")
-    private String Itemno;
-    // 鏁伴噺
-    @JsonProperty("Qty")
-    @JSONField(name = "Qty")
-    private Integer Qty;
-//    // 鐢熶骇绾跨紪鐮�
-//    @JsonProperty("ProductLineId")
-//    @JSONField(name = "ProductLineId")
-//    private String ProductLineId;
-//    // 宸ヤ綅缂栫爜
-//    @JsonProperty("StationId")
-//    @JSONField(name = "StationId")
-//    private String StationId;
-    // 鐗╂枡浜岀淮鐮�
-    @JsonProperty("ItemBarcode")
-    @JSONField(name = "ItemBarcode")
-    private List<String> ItemBarcode;
+    // 鐢熶骇绾跨紪鐮�
+    @JsonProperty("ProductLineId")
+    private String ProductLineId;
+    // 宸ヤ綅缂栫爜
+    @JsonProperty("StationId")
+    private String StationId;
+    // 褰撳墠宸ュ簭
+    @JsonProperty("CurProcess")
+    @JSONField(name = "CurProcess")
+    private String CurProcess;
+    // 閰嶇洏淇℃伅
+    @JsonProperty("Itemdata")
+    @JSONField(name = "Itemdata")
+    private List<MesOutApply.MesOutApplyItem> Itemdata;
+
+    // 绌烘墭鐩樻暟閲�
+    @JsonProperty("EmptyCount")
+    @JSONField(name = "EmptyCount")
+    private Integer EmptyCount;
+
+    // 锛坰fc_shop_route_consume锛塵es涓厤鐩樿〃鍚�
+    @Data
+    public static class MesOutApplyItem {
+
+        // 閰嶇洏鍙�
+        private String trayid;
+        // 闆朵欢缂栫爜
+        @JsonProperty("Itemno")
+        @JSONField(name = "Itemno")
+        private String Itemno;
+        // 鏁伴噺
+        @JsonProperty("Qty")
+        @JSONField(name = "Qty")
+        private Integer Qty;
+        // 鐗╂枡浜岀淮鐮�
+        @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