root/zhuzhouzhongwu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:反馈mes接口

Browse Source
This commit is contained in:
zhengxuming
2025-09-10 17:45:45 +08:00
parent caab874beb
commit f4f163eb45
6 changed files with 87 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndcone/AgvNdcOneDeviceDriver.java
View File

@@ -728,6 +728,12 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
.build();
logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto);
//回传MES放货完毕 逻辑：acs-> lms -> mes
String task_code = inst.getTask_code();
JSONObject jsonObject = new JSONObject();
jsonObject.put("task_code", task_code);
acsToWmsService.uploadMes(jsonObject);
} catch (Exception e) {
e.printStackTrace();
}

7
acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java
View File

@@ -224,6 +224,13 @@ public interface AcsToWmsService {
*/
ApplyPlugPullSitResponse actionCheckMaterialBucket(JSONObject jsonObject);
/**
* 回传MES
* @param jsonObject
* @return
*/
ApplyPlugPullSitResponse uploadMes(JSONObject jsonObject);
/**
* 横移请求
* @param jsonObject

40
acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
View File

@@ -897,6 +897,46 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
}
}
@Override
public ApplyPlugPullSitResponse uploadMes(JSONObject param) {
log.info("向lms请求 ，lms向MES请求放料完成,请求参数{}", param);
String result = "";
try {
MDC.put(log_file_type, log_type);
ApplyPlugPullSitResponse applyPlugPullSitResponse = new ApplyPlugPullSitResponse();
if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) {
String wmsUrl = paramService.findByCode(AcsConfig.WMSURL).getValue();
AddressDto addressDto = addressService.findByCode("uploadMes");
String methods_url = addressDto.getMethods_url();
String url = wmsUrl + methods_url;
log.info("向lms请求 ，lms向MES请求放料完成----请求参数:{}", JSONObject.toJSONString(param));
try {
result = HttpRequest.post(url)
.addInterceptor(tLogHutoolhttpInterceptor)
.header(Header.USER_AGENT, "Hutool http")
.body(JSON.toJSONString(param))
.execute().body();
JSONObject jsonObject = JSONObject.parseObject(result);
applyPlugPullSitResponse = JSONObject.toJavaObject(jsonObject, ApplyPlugPullSitResponse.class);
LuceneLogDto luceneLogDto = new LuceneLogDto(4, "uploadMes", String.valueOf(applyPlugPullSitResponse.getstatus()),
JSON.toJSONString(param), String.valueOf(result), "ACS向LMS发送物料已经放好");
luceneLogService.interfaceExecuteLog(luceneLogDto);
} catch (Exception e) {
JSONObject jsonObject = JSONObject.parseObject(result);
log.info("向lms请求 ，lms向MES请求放料完成----返回参数{}", e.getMessage());
applyPlugPullSitResponse = JSONObject.toJavaObject(jsonObject, ApplyPlugPullSitResponse.class);
LuceneLogDto luceneLogDto = new LuceneLogDto(4, "向lms请求 ，lms向MES请求放料完成", String.valueOf(applyPlugPullSitResponse.getstatus()),
JSON.toJSONString(param),
String.valueOf(result), "ACS向LMS发送物料已经放好");
luceneLogService.interfaceExecuteLog(luceneLogDto);
}
}
return applyPlugPullSitResponse;
} finally {
MDC.remove(log_file_type);
}
}
@Override
public ApplyPlugPullSitResponse actionMove(JSONObject param) {
log.info("向lms请求横移,请求参数{}", param);

9
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/AcsToWmsController.java
View File

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.logging.annotation.Log;
import org.nl.wms.ext_manage.service.AcsToWmsService;
import org.redisson.executor.TasksService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -42,4 +43,12 @@ public class AcsToWmsController {
return new ResponseEntity<>(acsToWmsService.emptyMove(param), HttpStatus.OK);
}
@PostMapping("/upload-mes")
@Log(value = "ACS给WMS反馈物料已经放好，WMS反馈给MES")
@SaIgnore
public ResponseEntity<Object> uploadMes(@RequestBody JSONObject param) {
return new ResponseEntity<>(acsToWmsService.uploadMes(param), HttpStatus.OK);
}
}

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/AcsToWmsService.java
View File

@@ -25,4 +25,6 @@ public interface AcsToWmsService {
Map<String, Object> receiveTaskStatusAcs(String string);
AcsResponse emptyMove(JSONObject param);
AcsResponse uploadMes(JSONObject param);
}

23
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java
View File

@@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j;
import org.nl.common.exception.BadRequestException;
import org.nl.wms.ext_manage.enums.ResultAcsStatus;
import org.nl.wms.ext_manage.service.AcsToWmsService;
import org.nl.wms.ext_manage.service.WmsToMesService;
import org.nl.wms.ext_manage.service.util.AcsResponse;
import org.nl.wms.sch_manage.enums.TaskStatus;
import org.nl.wms.sch_manage.service.ISchBasePointService;
@@ -20,6 +21,7 @@ import org.nl.wms.sch_manage.service.util.AbstractTask;
import org.nl.wms.sch_manage.service.util.TaskFactory;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.redisson.executor.TasksService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
@@ -55,6 +57,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
@Autowired
private ISchBasePointService pointService;
/**
* WMS回传MES
*/
@Autowired
private WmsToMesService wmsToMesService;
/**
* 任务工厂服务
*/
@@ -133,4 +142,18 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
pointService.updateBatchById(Arrays.asList(inPoint, outPoint));
return AcsResponse.requestOk();
}
@Override
public AcsResponse uploadMes(JSONObject param) {
SchBaseTask schBaseTask = iSchBaseTaskService.getByCode(param.getString("task_code"));
if (schBaseTask == null) {
return AcsResponse.requestOk();
}
JSONObject jsonObject = new JSONObject();
jsonObject.put("status", 200);
jsonObject.put("message", "成功");
jsonObject.put("task_code", schBaseTask.getExt_task_code());
wmsToMesService.uploadMes(jsonObject);
return AcsResponse.requestOk();
}
}