From 076cd7a73eb60c86d43eda67c5625704576d44cc Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期二, 03 二月 2026 17:32:03 +0800
Subject: [PATCH] 实现mes空托和agv任务接口
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java | 88 ++++++++++++++++++++++----------------------
1 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java
index d2f59c7..091ef44 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java
@@ -170,50 +170,50 @@
condition = new InventoryQueryCondition();
}
- if (SIMULATED_DATA_ENABLE.equals("1")) {
- String x = "[\n" +
- " {\n" +
- " \"locId\": \"LOC-A-01-01\",\n" +
- " \"wareHouseId\": \"WH001\",\n" +
- " \"wareHouseName\": \"鍘熸枡浠撳簱\",\n" +
- " \"palletId\": \"PALLET001\",\n" +
- " \"matNr\": \"MAT10001\",\n" +
- " \"makTx\": \"閽㈡潗Q235\",\n" +
- " \"spec\": \"鍥芥爣GB/T700-2006\",\n" +
- " \"anfme\": 10.5,\n" +
- " \"unit\": \"鍚╘",\n" +
- " \"status\": \"鍙敤\",\n" +
- " \"orderType\": 1,\n" +
- " \"orderNo\": \"Order202698921\",\n" +
- " \"prepareType\": 1,\n" +
- " \"planNo\": \"PLAN202601060001\",\n" +
- " \"batch\": \"BATCH20260106001\",\n" +
- " \"stockOrgId\": \"ORG001\"\n" +
- " },\n" +
- " {\n" +
- " \"locId\": \"LOC-B-02-03\",\n" +
- " \"wareHouseId\": \"WH002\",\n" +
- " \"wareHouseName\": \"鎴愬搧浠撳簱\",\n" +
- " \"palletId\": \"PALLET002\",\n" +
- " \"matNr\": \"MAT20001\",\n" +
- " \"makTx\": \"鐢垫満缁勪欢\",\n" +
- " \"spec\": \"380V 50Hz\",\n" +
- " \"anfme\": 50,\n" +
- " \"unit\": \"鍙癨",\n" +
- " \"status\": \"鍙敤\",\n" +
- " \"orderType\": \"1\",\n" +
- " \"orderNo\": \"SO202601060001\",\n" +
- " \"prepareType\": 1,\n" +
- " \"planNo\": \"PLAN202601060002\",\n" +
- " \"batch\": \"BATCH20260106002\",\n" +
- " \"stockOrgId\": \"ORG001\"\n" +
- " }\n" +
- "]";
- if (map == null || map.isEmpty()) {
- map = JSON.parseArray(x);
- }
- return CommonResponse.ok(JSONArray.parseArray(map.toJSONString(), InventoryDetails.class));
- }
+// if (SIMULATED_DATA_ENABLE.equals("1")) {
+// String x = "[\n" +
+// " {\n" +
+// " \"locId\": \"LOC-A-01-01\",\n" +
+// " \"wareHouseId\": \"WH001\",\n" +
+// " \"wareHouseName\": \"鍘熸枡浠撳簱\",\n" +
+// " \"palletId\": \"PALLET001\",\n" +
+// " \"matNr\": \"MAT10001\",\n" +
+// " \"makTx\": \"閽㈡潗Q235\",\n" +
+// " \"spec\": \"鍥芥爣GB/T700-2006\",\n" +
+// " \"anfme\": 10.5,\n" +
+// " \"unit\": \"鍚╘",\n" +
+// " \"status\": \"鍙敤\",\n" +
+// " \"orderType\": 1,\n" +
+// " \"orderNo\": \"Order202698921\",\n" +
+// " \"prepareType\": 1,\n" +
+// " \"planNo\": \"PLAN202601060001\",\n" +
+// " \"batch\": \"BATCH20260106001\",\n" +
+// " \"stockOrgId\": \"ORG001\"\n" +
+// " },\n" +
+// " {\n" +
+// " \"locId\": \"LOC-B-02-03\",\n" +
+// " \"wareHouseId\": \"WH002\",\n" +
+// " \"wareHouseName\": \"鎴愬搧浠撳簱\",\n" +
+// " \"palletId\": \"PALLET002\",\n" +
+// " \"matNr\": \"MAT20001\",\n" +
+// " \"makTx\": \"鐢垫満缁勪欢\",\n" +
+// " \"spec\": \"380V 50Hz\",\n" +
+// " \"anfme\": 50,\n" +
+// " \"unit\": \"鍙癨",\n" +
+// " \"status\": \"鍙敤\",\n" +
+// " \"orderType\": \"1\",\n" +
+// " \"orderNo\": \"SO202601060001\",\n" +
+// " \"prepareType\": 1,\n" +
+// " \"planNo\": \"PLAN202601060002\",\n" +
+// " \"batch\": \"BATCH20260106002\",\n" +
+// " \"stockOrgId\": \"ORG001\"\n" +
+// " }\n" +
+// "]";
+// if (map == null || map.isEmpty()) {
+// map = JSON.parseArray(x);
+// }
+// return CommonResponse.ok(JSONArray.parseArray(map.toJSONString(), InventoryDetails.class));
+// }
try {
if (wmsServerFeignClient == null) {
--
Gitblit v1.9.1