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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
lishuai
2024-06-29 15:11:05 +08:00
parent 47613fdbbc a627c9c74c
commit 022eff8245
4 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java
View File

@@ -570,10 +570,24 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto);
}
String task_code = inst.getTask_code();
EXECUTOR.submit(() -> {
if(ObjectUtil.isNotEmpty(standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("feedbackToLms"))
&& StrUtil.equals("true", standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("feedbackToLms").toString())){
JSONObject jsonObject = new JSONObject();
jsonObject.put("task_code", task_code);
LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(standardOrdinarySiteDeviceDriver.getDevice_code())
.content("取货完成反馈:" + jsonObject.toJSONString() + ";设备:" + standardOrdinarySiteDeviceDriver.getDevice_code())
.build();
logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto);
acsToWmsService.actionFinishRequest2(jsonObject);
}
});
this.setPhase(phase);
} else if (device.getDeviceDriver() instanceof ManipulatorAgvStationDeviceDriver) {
manipulatorAgvStationDeviceDriver = (ManipulatorAgvStationDeviceDriver) device.getDeviceDriver();
try {
manipulatorAgvStationDeviceDriver.writing(3);
} catch (Exception e) {
@@ -588,15 +602,19 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
luceneExecuteLogService.deviceExecuteLog(logDto);
String task_code = inst.getTask_code();
EXECUTOR.submit(() -> {
boolean feedbackToLms = (boolean)manipulatorAgvStationDeviceDriver.getDevice().getExtraValue().get("feedbackToLms");
if(feedbackToLms){
if(ObjectUtil.isNotEmpty(manipulatorAgvStationDeviceDriver.getDevice().getExtraValue().get("feedbackToLms"))
&& StrUtil.equals("true", manipulatorAgvStationDeviceDriver.getDevice().getExtraValue().get("feedbackToLms").toString())){
JSONObject jsonObject = new JSONObject();
jsonObject.put("task_code", task_code);
LuceneLogDto logDto1 = LuceneLogDto.builder()
.device_code(manipulatorAgvStationDeviceDriver.getDevice_code())
.content("取货完成反馈:" + jsonObject.toJSONString() + ";设备:" + manipulatorAgvStationDeviceDriver.getDevice_code())
.build();
logDto1.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto1);
acsToWmsService.actionFinishRequest2(jsonObject);
}
});
} else if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) {
hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver();
try {

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

@@ -684,10 +684,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue();
AddressDto addressDto = addressService.findByCode("actionFinishRequest2");
String url = wmsurl + addressDto.getMethods_url();
log.info("feedbackDie - 反馈管芯请求路径{}", jsonObject);
log.info("actionFinishRequest2 - 设备工位取货完成反馈{}", jsonObject);
LuceneLogDto luceneLogDto = new LuceneLogDto(4,"actionFinishRequest2", "",
String.valueOf(jsonObject),
"", jsonObject.getString("task_code") + "任务取货完成反馈");
"", jsonObject.getString("task_code") + "设备工位取货完成反馈");
luceneLogService.interfaceExecuteLog(luceneLogDto);
try {
execute = HttpRequest.post(url)
@@ -701,7 +701,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
} catch (Exception e) {
LuceneLogDto luceneLogDto = new LuceneLogDto(4,"actionFinishRequest2", String.valueOf(execute.getStatus()),
JSON.toJSONString(execute.body()),
String.valueOf(execute.body()), jsonObject.getString("task_code") + "任务取货完成反馈失败");
String.valueOf(execute.body()), jsonObject.getString("task_code") + "设备工位取货完成反馈失败");
luceneLogService.interfaceExecuteLog(luceneLogDto);
}
}

5
acs2/nladmin-ui/src/views/acs/device/driver/manipulator_agv_station.vue
View File

@@ -80,6 +80,11 @@
<el-switch v-model="form.ignore_release_check" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="取货完成反馈" label-width="78px">
<el-switch v-model="form.feedbackToLms" />
</el-form-item>
</el-col>
</el-row>
<el-row>

5
acs2/nladmin-ui/src/views/acs/device/driver/standard_ordinary_site.vue
View File

@@ -38,6 +38,11 @@
<el-switch v-model="form.ignore_release_check" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="取货完成反馈" label-width="78px">
<el-switch v-model="form.feedbackToLms" />
</el-form-item>
</el-col>
</el-row>
<el-row>