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

Compare commits

base: root:acs_dev_kep
Branches Tags
root:master root:merge&mdm0417 root:master_merge_0523 root:feature/dev_mdm_0522 root:acs_dev root:acs_dev_kep root:agv_twoFloorAgvScreen_acs_dev root:master_merge root:master_1 root:feature/sso_function_v1205
...
compare: root:1919e0f5f73dfc745a2d993fba887ebaf6982b77
Branches Tags
root:merge&mdm0417 root:master_merge_0523 root:feature/dev_mdm_0522 root:acs_dev root:acs_dev_kep root:agv_twoFloorAgvScreen_acs_dev root:master_merge root:master_1 root:master root:feature/sso_function_v1205

2 Commits
acs_dev_ke ... 1919e0f5f7

Author SHA1 Message Date
ls
1919e0f5f7 Merge remote-tracking branch 'origin/acs_dev' into acs_dev 2026-01-26 10:00:44 +08:00
ls
6bb12efd46 add: 请求频率 2026-01-26 10:00:25 +08:00
1 changed files with 1 additions and 1 deletions
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

@@ -202,7 +202,7 @@ public class UnBoxLableConveyorDeviceDriver extends AbstractOpcDeviceDriver impl
} }
//空箱出库开盖位，申请开盖 //空箱出库开盖位，申请开盖
if (mode == 15 && move == 1 && task > 0) { if (mode == 15 && move == 1 && task > 0 && !requireSucess) {
Instruction instruction = instructionService.findByCode(String.valueOf(task)); Instruction instruction = instructionService.findByCode(String.valueOf(task));
//不允许开盖，完成出库任务，自动去扫码位 //不允许开盖，完成出库任务，自动去扫码位
if (instruction == null || StrUtil.isEmpty(instruction.getVehicle_code())) { if (instruction == null || StrUtil.isEmpty(instruction.getVehicle_code())) {