From 1724f77c35022b643c28dd3e5547679a5edc2d49 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 17 三月 2026 14:17:26 +0800
Subject: [PATCH] Merge branch 'springboot3.5_cs' into spring3.5
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/MESController.java | 16 +---------------
1 files changed, 1 insertions(+), 15 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/MESController.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/MESController.java
index 325814a..5a33cc2 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/MESController.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/MESController.java
@@ -19,7 +19,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -46,20 +46,6 @@
if (Objects.isNull(objParams)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
-// // 杩斿洖妯℃嫙鏁版嵁
-// if (SIMULATED_DATA_ENABLE.equals("1")) {
-// JSONArray params = paramsFormat(objParams);
-// List<MatPreparationOrder> orders = JSON.parseArray(params.toJSONString(), MatPreparationOrder.class);
-// JSONArray array = ERPController.map;
-// for (int i = 0; i < ERPController.map.size(); i++) {
-// JSONObject obj = array.getJSONObject(i);
-// obj.put("orderNo", orders.get(0).getOrderNo());
-// obj.put("matNr", orders.get(0).getOrderItems().get(0).getMatNr());
-// }
-// ERPController.map = array;
-//
-// return CommonResponse.ok();
-// }
JSONArray params = paramsFormat(objParams);
List<MatPreparationOrder> orders = JSON.parseArray(params.toJSONString(), MatPreparationOrder.class);
--
Gitblit v1.9.1