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

add:套管完成,重量为0，不反馈LMS

Browse Source
This commit is contained in:
gengby
2025-06-11 16:44:54 +08:00
parent 1827f702bd
commit dfcaeea731
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/AcsConfig.java
View File

@@ -78,6 +78,11 @@ public interface AcsConfig {
*/ */
String HASWMS = "hasWms"; String HASWMS = "hasWms";
/**
* 是否存在wms系统
*/
String pgErrorSendLms = "pgErrorSendLms";
/** /**
* 是否请求wms系统 * 是否请求wms系统
*/ */

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorManipulatorDeviceDriver.java
View File

@@ -262,7 +262,7 @@ public class VolumeTwoManipulatorManipulatorDeviceDriver extends AbstractOpcDevi
this.iserror = true; this.iserror = true;
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(device_code)
.content(this.device_code + "读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null") .content(this.device_code + "读取信号值时出现异常:" + Arrays.toString(var17.getStackTrace()) + ",this.itemProtocol is null")
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);

15
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java
View File

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject;
import lombok.Data; import lombok.Data;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.nl.acs.AcsConfig;
import org.nl.acs.agv.server.AgvService; import org.nl.acs.agv.server.AgvService;
import org.nl.acs.common.base.CommonFinalParam; import org.nl.acs.common.base.CommonFinalParam;
import org.nl.acs.device.domain.Device; import org.nl.acs.device.domain.Device;
@@ -481,6 +482,16 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl
return; return;
} else { } else {
this.bushingSucess_time = date; this.bushingSucess_time = date;
if (StrUtil.equals(paramService.findByCode(AcsConfig.pgErrorSendLms).getValue(), CommonFinalParam.ONE)){
if (weight1 == 0 && weight2 == 0) {
Map<String, Object> map = new LinkedHashMap<>();
map.put("to_command", 99);
this.writing(map);
requireSucess = false;
message = "套管完成失败,重量为0";
}
}
ApplyPlugPullSiteRequest applyPlugPullSiteRequest = new ApplyPlugPullSiteRequest(); ApplyPlugPullSiteRequest applyPlugPullSiteRequest = new ApplyPlugPullSiteRequest();
ApplyPlugPullSitResponse applyPlugPullSitResponse; ApplyPlugPullSitResponse applyPlugPullSitResponse;
applyPlugPullSiteRequest.setDevice_code(device_code); applyPlugPullSiteRequest.setDevice_code(device_code);
@@ -495,8 +506,8 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl
param.put("type", CommonFinalParam.TYPE_TWO); param.put("type", CommonFinalParam.TYPE_TWO);
param.put("weight1", String.valueOf(weight1)); param.put("weight1", String.valueOf(weight1));
param.put("material1", String.valueOf(material1)); param.put("material1", String.valueOf(material1));
param.put("weight1", String.valueOf(weight1)); param.put("weight2", String.valueOf(weight2));
param.put("material1", String.valueOf(material1)); param.put("material2", String.valueOf(material2));
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(device_code)
.content("申请套管完成任务,请求参数:" + param) .content("申请套管完成任务,请求参数:" + param)