diff --git a/src/main/java/com/gaotao/modules/dashboard/task/DashboardPushTask.java b/src/main/java/com/gaotao/modules/dashboard/task/DashboardPushTask.java index c097f79..874f072 100644 --- a/src/main/java/com/gaotao/modules/dashboard/task/DashboardPushTask.java +++ b/src/main/java/com/gaotao/modules/dashboard/task/DashboardPushTask.java @@ -183,9 +183,6 @@ public class DashboardPushTask { } JsonNode sortingStations = rootNode.get("sortingStations"); - - String orderNo = rootNode.get("orderNo")!=null ? rootNode.get("orderNo").asText() : ""; - // 处理返回的数据 for (JsonNode station : sortingStations) { String sortingStation = station.get("sortingStation").asText(); @@ -195,7 +192,6 @@ public class DashboardPushTask { if (devCode.equals(sortingStation) && materials != null && materials.isArray()) { for (JsonNode material : materials) { Map item = convertWcsMaterialToPickingItem(material); - item.put("orderNo", orderNo); // 添加订单号字段 stationList.add(item); } } @@ -237,6 +233,12 @@ public class DashboardPushTask { item.put("storageLocation", material.has("sortingStation") ? material.get("sortingStation").asText() : ""); + item.put("orderPartNo", material.has("orderPartNo") ? + material.get("orderPartNo").asText() : ""); + + item.put("orderNo", material.has("orderNo") ? + material.get("orderNo").asText() : ""); + return item; }