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

rev 更新套管工位

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2023-12-13 15:48:41 +08:00
parent d1be5733b8
commit e0808d770c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/CasingStationConveyorDeviceDriver.java
View File

@@ -241,7 +241,7 @@ public class CasingStationConveyorDeviceDriver extends AbstractOpcDeviceDriver i
case 3: case 3:
log.info("运行中"); log.info("运行中");
break; break;
case 4: case 5:
if (move == 1 && !requireSucess && task > 0 && task1 > 0) { if (move == 1 && !requireSucess && task > 0 && task1 > 0) {
//申请套管校验 //申请套管校验
// apply_for_casing_inspection(material1, material2); // apply_for_casing_inspection(material1, material2);

4
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/ItemProtocol.java
View File

@@ -117,11 +117,11 @@ public class ItemProtocol {
list.add(new ItemDto(item_move, "光电信号", "DB101.W4")); list.add(new ItemDto(item_move, "光电信号", "DB101.W4"));
list.add(new ItemDto(item_carrier_direction, "托盘方向", "DB101.W6")); list.add(new ItemDto(item_carrier_direction, "托盘方向", "DB101.W6"));
list.add(new ItemDto(item_error, "报警", "DB101.W8")); list.add(new ItemDto(item_error, "报警", "DB101.W8"));
list.add(new ItemDto(item_task, "任务号1", "DB101.DW116"));
list.add(new ItemDto(item_task1, "任务号2", "DB101.DW118"));
list.add(new ItemDto(item_material1, "物料1", "DB101.STRING10.50")); list.add(new ItemDto(item_material1, "物料1", "DB101.STRING10.50"));
list.add(new ItemDto(item_material2, "物料2", "DB101.STRING62.50")); list.add(new ItemDto(item_material2, "物料2", "DB101.STRING62.50"));
list.add(new ItemDto(item_qty, "数量", "DB101.W114")); list.add(new ItemDto(item_qty, "数量", "DB101.W114"));
list.add(new ItemDto(item_task, "纸管库任务号", "DB101.D116"));
list.add(new ItemDto(item_task1, "行架任务号", "DB101.D120"));
return list; return list;
} }