实现mes空托和agv任务接口

lbq

昨天 076cd7a73eb60c86d43eda67c5625704576d44cc

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/MESController.java

@@ -3,20 +3,26 @@
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;
@@ -30,6 +36,8 @@

    @Resource
    private MesReportService mesReportService;
    @Autowired(required = false)
    private WmsServerFeignClient wmsServerFeignClient;


    @ApiOperation("备料通知")
@@ -92,8 +100,51 @@

        JSONArray params = paramsFormat(objParams);
        List<Task> tasks = JSON.parseArray(params.toJSONString(), Task.class);
        // 数据处理，转发server
        // 数据处理，转发server          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));

                // 直接传递实体类，Feign会自动序列化为JSON
                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("空托入库")
@@ -110,7 +161,50 @@
        JSONArray params = paramsFormat(objParams);
        List<Task> tasks = JSON.parseArray(params.toJSONString(), Task.class);
        // 数据处理，转发server
        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));

                // 直接传递实体类，Feign会自动序列化为JSON
                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 测试推送功能