From 4e40afebef0f4eaa846f9c02bd3243c863d0a0e7 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 11 三月 2026 14:10:38 +0800
Subject: [PATCH] lsh#
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/MesReportServiceImpl.java | 29 ++++++++---------------------
1 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/MesReportServiceImpl.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/MesReportServiceImpl.java
index 4393a85..ab1644b 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/MesReportServiceImpl.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/MesReportServiceImpl.java
@@ -215,8 +215,14 @@
taskResult.setStatus(task.getStatus());
} else if (params instanceof Map) {
Map<String, Object> map = (Map<String, Object>) params;
- taskResult.setTaskNo((String) map.get("TaskNo"));
- taskResult.setStatus((Integer) map.get("Status"));
+ String taskNo = (String) map.get("taskNo");
+ String taskOrigin = (String) map.get("taskOrigin");
+ if (!"mes".equals(taskOrigin)) {
+ return CommonResponse.ok();
+ }
+
+ taskResult.setTaskNo(taskNo);
+ taskResult.setStatus(2);
}
MesReportOne<TaskResult> reportOne = new MesReportOne<>();
@@ -304,25 +310,6 @@
headers.add("Content-Type", "application/json");
headers.add("api-version", "v2.0");
-// List<Map<String, Object>> maps = new ArrayList<>();
-// Map<String, Object> mapParams = new HashMap<>();
-////// mapParams.put("orderNo", params.getOrderNo());
-////// mapParams.put("anfme", params.getAnfme());
-////// mapParams.put("type", params.getType());
-////// mapParams.put("wkType", params.getWkType());
-////// mapParams.put("exceStatus", params.getExceStatus());
-////// mapParams.put("orderItems", params.getOrderItems());
-////// maps.add(mapParams);
-////
-//// JSONObject params = JSONObject.parseObject(JSON.toJSONString(order));
-//// JSONObject mappedData = ParamsMapUtils.apiMaps("mes", "orderId", params);
-//// mappedData.put("updateBy", "mes");
-//// mapParams = objectToMap(mappedData);
-//// maps.add(mapParams);
-// log.info("淇敼璁㈠崟淇℃伅鍙婄姸鎬侊細 {}锛� 璇锋眰鍙傛暟锛� {}", wmsUrl, JSONArray.toJSONString(order));
-// HttpEntity<List<Map<String, Object>>> httpEntity = new HttpEntity<>(maps, headers);
-//// ArrayList<Order> orders = new ArrayList<>();
-//// orders.add(order);
HttpEntity httpEntity = new HttpEntity<>(order, headers);
// mes/callMaterial
ResponseEntity<String> exchange = restTemplate.exchange(wmsUrl, HttpMethod.POST, httpEntity, String.class);//cs
--
Gitblit v1.9.1