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

fix: 路由路线修改、开盖位

Browse Source
This commit is contained in:
LENOVO
2024-05-06 09:32:57 +08:00
parent 8207f52961
commit d2d7f4228e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java
View File

@@ -213,7 +213,7 @@ public class UnBoxLableConveyorDeviceDriver extends AbstractOpcDeviceDriver impl
if (!applyUnbox(instruction)){
if (ObjectUtil.isNotEmpty(instruction)) {
try {
instructionService.finish(instruction);
// instructionService.finish(instruction);
} catch (Exception e) {
throw new RuntimeException(e);
}

1
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java
View File

@@ -331,6 +331,7 @@ public class RouteLineServiceImpl extends CommonServiceImpl<RouteLineMapper, Rou
List<RouteLine> list = new LambdaQueryChainWrapper<>(routeLineMapper)
.eq(RouteLine::getDevice_code, dto.getDevice_code())
.eq(RouteLine::getNext_device_code, dto.getNext_device_code())
.eq(RouteLine::getRoute_plan_id, dto.getRoute_plan_id())
.list();
if (list.size() == 0) {
// wo.insert(json);