From 8dfd55ef1c0eccf3adf105f0d4f5828bdbc3f86d Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 23 一月 2026 18:52:47 +0800
Subject: [PATCH] lsh#自动组托

---
 rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/MESController.java |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 56 insertions(+), 2 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 734a128..e4ca70b 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
@@ -2,26 +2,35 @@
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.vincent.rsf.framework.exception.CoolException;
 import com.vincent.rsf.openApi.entity.dto.CommonResponse;
 import com.vincent.rsf.openApi.entity.phyz.*;
+import com.vincent.rsf.openApi.service.phyz.MesReportService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Objects;
 
 import static com.vincent.rsf.openApi.controller.AuthController.SIMULATED_DATA_ENABLE;
 import static com.vincent.rsf.openApi.controller.phyz.ERPController.paramsFormat;
 
+@Slf4j
 @RestController
 @RequestMapping("/mes")
 @Api("閾跺骇鏂板伐鍘傦紙浜旀湡锛塎ES鎺ュ彛")
 public class MESController {
+
+    @Resource
+    private MesReportService mesReportService;
+
 
     @ApiOperation("澶囨枡閫氱煡")
     @PostMapping("/callMaterial")
@@ -30,7 +39,17 @@
             throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
         }
         // 杩斿洖妯℃嫙鏁版嵁
-        if (SIMULATED_DATA_ENABLE.equals("0")) {
+        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();
         }
 
@@ -47,7 +66,7 @@
             throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
         }
         // 杩斿洖妯℃嫙鏁版嵁
-        if (SIMULATED_DATA_ENABLE.equals("0")) {
+        if (SIMULATED_DATA_ENABLE.equals("1")) {
             return CommonResponse.ok();
         }
 
@@ -91,4 +110,39 @@
         return CommonResponse.ok();
     }
 
+    // region 娴嬭瘯鎺ㄩ�佸姛鑳�
+    @ApiOperation("鎵樼洏淇℃伅鍚屾")
+    @PostMapping("/syncPalletInfo")
+    public CommonResponse syncPalletInfo(@RequestBody Object objParams) {
+        try {
+            return mesReportService.syncPalletInfo(objParams);
+        } catch (Exception e) {
+            log.error("mes, syncPalletInfo", e);
+        }
+        return CommonResponse.ok();
+    }
+
+    @ApiOperation("绔欑偣淇℃伅鍚屾")
+    @PostMapping("/syncStationInfo")
+    public CommonResponse syncStationInfo(@RequestBody Object objParams) {
+        try {
+            return mesReportService.syncStationInfo(objParams);
+        } catch (Exception e) {
+            log.error("mes, syncStationInfo", e);
+        }
+        return CommonResponse.ok();
+    }
+
+    @ApiOperation("AGV浠诲姟鍥炶皟")
+    @PostMapping("/reportTaskExecute")
+    public CommonResponse reportTaskExecute(@RequestBody Object objParams) {
+        try {
+            return mesReportService.reportTaskExecute(objParams);
+        } catch (Exception e) {
+            log.error("mes, reportTaskExecute", e);
+        }
+        return CommonResponse.ok();
+    }
+    // endregion
+
 }

--
Gitblit v1.9.1