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

固化室出库逻辑优化&agv信号反馈优化

Browse Source
This commit is contained in:
psh
2024-06-21 16:25:59 +08:00
parent 9166305707
commit 85e42f9ca4
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java
View File

@@ -234,10 +234,10 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
} else { } else {
//上报异常信息 //上报异常信息
//（不需要WCS反馈） //（不需要WCS反馈）
if (phase == 0x67) { if (phase == 0x67 || phase == 0x70 || phase == 0x71 || phase == 0x72 || phase == 0x73 || phase == 0x74) {
device = deviceAppService.findDeviceByCode(Integer.toString(arr[27])); device = deviceAppService.findDeviceByCode("AGV0" +agvaddr);
} else { } else {
device = deviceAppService.findDeviceByCode("AGV0" + Integer.toString(arr[20])); device = deviceAppService.findDeviceByCode("AGV0" + arr[20]);
} }
if (ObjectUtil.isNotEmpty(device)) { if (ObjectUtil.isNotEmpty(device)) {
if (device.getDeviceDriver() instanceof AgvNdcOneDeviceDriver) { if (device.getDeviceDriver() instanceof AgvNdcOneDeviceDriver) {

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java
View File

@@ -147,4 +147,7 @@ public class SchBasePoint implements Serializable {
@ApiModelProperty(value = "放货等待点") @ApiModelProperty(value = "放货等待点")
private String next_wait_point; private String next_wait_point;
@TableField(exist = false)
private String material_id;
} }

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java
View File

@@ -114,6 +114,7 @@ public class GHCMLTask extends AbstractTask {
JSONObject jsonObject = JSONObject.parseObject(requestParam); JSONObject jsonObject = JSONObject.parseObject(requestParam);
jsonObject.put("material_id", ObjectUtil.isNotEmpty(groupInfo) ? groupInfo.getMaterial_id() : null); jsonObject.put("material_id", ObjectUtil.isNotEmpty(groupInfo) ? groupInfo.getMaterial_id() : null);
SchBasePoint point = findNextPoint(nextRegionStr, jsonObject); SchBasePoint point = findNextPoint(nextRegionStr, jsonObject);
log.info("当前任务{}找到预计终点{}",task.getTask_id(),point.getPoint_code());
if (ObjectUtil.isEmpty(point)) { if (ObjectUtil.isEmpty(point)) {
throw new BadRequestException("涂板线[" + task.getPoint_code1() + "]未找到所需点位!"); throw new BadRequestException("涂板线[" + task.getPoint_code1() + "]未找到所需点位!");
} }