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/MESController.java | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 158 insertions(+), 7 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..325814a 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,43 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.vincent.rsf.framework.common.R;
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.feign.wms.WmsServerFeignClient;
+import com.vincent.rsf.openApi.feign.wms.fallback.WmsServerFeignClientFallback;
+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.beans.factory.annotation.Autowired;
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.ArrayList;
import java.util.List;
+import java.util.Map;
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;
+ @Autowired(required = false)
+ private WmsServerFeignClient wmsServerFeignClient;
+
@ApiOperation("澶囨枡閫氱煡")
@PostMapping("/callMaterial")
@@ -29,14 +46,27 @@
if (Objects.isNull(objParams)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- // 杩斿洖妯℃嫙鏁版嵁
- if (SIMULATED_DATA_ENABLE.equals("0")) {
- return CommonResponse.ok();
- }
+// // 杩斿洖妯℃嫙鏁版嵁
+// 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);
// 鏁版嵁澶勭悊锛岃浆鍙憇erver
+ for (MatPreparationOrder order : orders) {
+ mesReportService.callMaterial(order);
+ }
return CommonResponse.ok();
}
@@ -47,7 +77,7 @@
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
// 杩斿洖妯℃嫙鏁版嵁
- if (SIMULATED_DATA_ENABLE.equals("0")) {
+ if (SIMULATED_DATA_ENABLE.equals("1")) {
return CommonResponse.ok();
}
@@ -70,8 +100,51 @@
JSONArray params = paramsFormat(objParams);
List<Task> tasks = JSON.parseArray(params.toJSONString(), Task.class);
- // 鏁版嵁澶勭悊锛岃浆鍙憇erver
- return CommonResponse.ok();
+ // 鏁版嵁澶勭悊锛岃浆鍙憇erver http://127.0.0.1:8085/rsf-server/pda/callForEmptyContainers {"staNo":"103-1","type":"3"}
+ int success = 0;
+ StringBuilder errorMsg = new StringBuilder();
+ for (Task task : tasks) {
+ try {
+ if (wmsServerFeignClient == null) {
+ log.warn("WmsServerFeignClient鏈敞鍏ワ紝鏃犳硶杩涜璋冪敤");
+ return CommonResponse.error("鏈嶅姟鏈垵濮嬪寲");
+ }
+
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("type", task.getPalletType());
+ jsonObject.put("taskNo", task.getTaskNo());
+ jsonObject.put("staNo", task.getEndStationId());
+ jsonObject.put("taskOrigin", "mes");
+
+ log.info("mes绌烘墭鍑哄簱鍙傛暟锛� {}", JSON.toJSONString(jsonObject));
+
+ // 鐩存帴浼犻�掑疄浣撶被锛孎eign浼氳嚜鍔ㄥ簭鍒楀寲涓篔SON
+ R result = wmsServerFeignClient.callForEmptyContainers(jsonObject);
+
+ log.info("mes绌烘墭鍑哄簱杩斿洖缁撴灉锛� {}", JSON.toJSONString(result));
+
+ if (result != null) {
+ Integer code = (Integer) result.get("code");
+ if (code != null && code == 200) {
+ success++;
+ } else {
+ errorMsg.append((String) result.get("msg"));
+ }
+ } else {
+ return CommonResponse.error("绌烘墭鍑哄簱鎵ц澶辫触锛氳繑鍥炵粨鏋滀负绌�");
+ }
+ } catch (Exception e) {
+ log.error("绌烘墭鍑哄簱鎵ц澶辫触", e);
+ String errorMessage = WmsServerFeignClientFallback.filterErrorMessage(e);
+ errorMsg.append(errorMessage);
+ }
+ }
+
+ if (success == tasks.size()) {
+ return CommonResponse.ok();
+ } else {
+ return CommonResponse.error(errorMsg.toString());
+ }
}
@ApiOperation("绌烘墭鍏ュ簱")
@@ -88,7 +161,85 @@
JSONArray params = paramsFormat(objParams);
List<Task> tasks = JSON.parseArray(params.toJSONString(), Task.class);
// 鏁版嵁澶勭悊锛岃浆鍙憇erver
+ int success = 0;
+ StringBuilder errorMsg = new StringBuilder();
+ for (Task task : tasks) {
+ try {
+ if (wmsServerFeignClient == null) {
+ log.warn("WmsServerFeignClient鏈敞鍏ワ紝鏃犳硶杩涜璋冪敤");
+ return CommonResponse.error("鏈嶅姟鏈垵濮嬪寲");
+ }
+
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("containerNo", task.getPalletId());
+ jsonObject.put("taskNo", task.getTaskNo());
+ jsonObject.put("transferStationNo", task.getStartStationId());
+ jsonObject.put("taskOrigin", "mes");
+
+ log.info("mes绌烘墭鍏ュ簱鍙傛暟锛� {}", JSON.toJSONString(jsonObject));
+
+ // 鐩存帴浼犻�掑疄浣撶被锛孎eign浼氳嚜鍔ㄥ簭鍒楀寲涓篔SON
+ R result = wmsServerFeignClient.emptyContainerWarehousing(jsonObject);
+
+ log.info("mes绌烘墭鍏ュ簱杩斿洖缁撴灉锛� {}", JSON.toJSONString(result));
+
+ if (result != null) {
+ Integer code = (Integer) result.get("code");
+ if (code != null && code == 200) {
+ success++;
+ } else {
+ errorMsg.append((String) result.get("msg"));
+ }
+ } else {
+ return CommonResponse.error("绌烘墭鍏ュ簱鎵ц澶辫触锛氳繑鍥炵粨鏋滀负绌�");
+ }
+ } catch (Exception e) {
+ log.error("绌烘墭鍏ュ簱鎵ц澶辫触", e);
+ String errorMessage = WmsServerFeignClientFallback.filterErrorMessage(e);
+ errorMsg.append(errorMessage);
+ }
+ }
+
+ if (success == tasks.size()) {
+ return CommonResponse.ok();
+ } else {
+ return CommonResponse.error(errorMsg.toString());
+ }
+ }
+
+ // 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