fix: 修复补空载具未将点位的载具号清除

This commit is contained in:
yanps
2024-08-13 15:36:09 +08:00
parent b018644aea
commit 540b5f39dc
7 changed files with 5 additions and 5 deletions

View File

@@ -393,7 +393,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
Map<String, Object> extraValue = standar.getDevice().getExtraValue();
boolean is_empty = false;
if (ObjectUtil.isNotEmpty(extraValue.get("is_empty"))) {
is_empty = (boolean) extraValue.get("is_empty");
is_empty = extraValue.get("is_empty").equals("true") ? true : false;
}
data = feedBackStatus(data, index, 4, inst, task, 1, is_empty);
} catch (Exception e) {

Binary file not shown.

View File

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
import java.util.List;
//@Component
@Component
@RequiredArgsConstructor
@Order(100)
public class JobRunner implements ApplicationRunner {

View File

@@ -127,7 +127,7 @@ public class FTGTask extends AbstractTask {
if (ObjectUtil.isNotEmpty(schBasePoint2)) {
PointUtils.updateByIngTaskCode(schBasePoint2);
pointService.update(Wrappers.lambdaUpdate(SchBasePoint.class).eq(SchBasePoint::getPoint_code, point_code2)
.set(SchBasePoint::getIs_lock, false));
.set(SchBasePoint::getIs_lock, false).set(SchBasePoint::getVehicle_code, null));
}
// 任务完成
taskObj.setTask_status(TaskStatus.FINISHED.getCode());

View File

@@ -129,7 +129,7 @@ public class SortingCMTTask extends AbstractTask {
if (ObjectUtil.isNotEmpty(schBasePoint2)) {
PointUtils.updateByIngTaskCode(schBasePoint2);
pointService.update(Wrappers.lambdaUpdate(SchBasePoint.class).eq(SchBasePoint::getPoint_code, point_code2)
.set(SchBasePoint::getIs_lock, false));
.set(SchBasePoint::getIs_lock, false).set(SchBasePoint::getVehicle_code,null));
}
// 任务完成
taskObj.setTask_status(TaskStatus.FINISHED.getCode());

View File

@@ -116,7 +116,7 @@ public class SortingCNTTask extends AbstractTask {
if (ObjectUtil.isNotEmpty(schBasePoint2)) {
PointUtils.updateByIngTaskCode(schBasePoint2);
pointService.update(Wrappers.lambdaUpdate(SchBasePoint.class).eq(SchBasePoint::getPoint_code, point_code2)
.set(SchBasePoint::getIs_lock, false));
.set(SchBasePoint::getIs_lock, false).set(SchBasePoint::getVehicle_code,null));
}
// 任务完成
taskObj.setTask_status(TaskStatus.FINISHED.getCode());

Binary file not shown.