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

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-12-13 10:02:08 +08:00
parent 96f06bb6d0 a2051a8e2a
commit 52a0ba88ea
7 changed files with 103 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,8 @@ import org.nl.acs.device_driver.DeviceDriver;
import org.nl.acs.device_driver.RouteableDeviceDriver;
import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
import org.nl.acs.ext.wms.data.ApplyManipulatorActionRequest;
import org.nl.acs.ext.wms.data.ApplyManipulatorActionResponse;
import org.nl.acs.ext.wms.data.ApplyPaperActionRequest;
import org.nl.acs.ext.wms.data.ApplyPaperActionResponse;
import org.nl.acs.ext.wms.service.AcsToWmsService;
@@ -204,7 +206,7 @@ public class CasingStationConveyorDeviceDriver extends AbstractOpcDeviceDriver i
logServer.deviceExecuteLog(this.device_code, "", "", "信号qty：" + last_qty + "->" + qty);
}
if (move != 0 && task > 1 && task1 > 0) {
if (move != 0 && task > 0 && task1 > 0) {
update_instruction_status();
}
@@ -225,8 +227,6 @@ public class CasingStationConveyorDeviceDriver extends AbstractOpcDeviceDriver i
message = "";
Instruction instruction = null;
List toInstructions;
//纸管库申请任务
switch (mode) {
case 1:
@@ -255,12 +255,13 @@ public class CasingStationConveyorDeviceDriver extends AbstractOpcDeviceDriver i
last_error = error;
last_carrier_direction = carrier_direction;
last_task = task;
last_task1 = task1;
last_material1 = material1;
last_material2 = material2;
last_to_command = to_command;
last_qty = qty;
}
/**
* 更新指令状态
*/
@@ -277,13 +278,13 @@ public class CasingStationConveyorDeviceDriver extends AbstractOpcDeviceDriver i
inst.setInstruction_status("1");
inst.setExecute_device_code(this.device_code);
instructionService.update(inst);
logServer.deviceExecuteLog(device_code, "", "", "入库输送线任务开始反馈执行中状态,反馈成功,指令号:" + task);
logServer.deviceExecuteLog(device_code, "", "", "套管工位任务开始反馈执行中状态,反馈成功,指令号:" + task);
}
if (StrUtil.equals(inst.getInstruction_status(), "1") || StrUtil.equals(inst.getInstruction_status(), "0")) {
if (StrUtil.equals(this.getDeviceCode(), inst.getNext_device_code())) {
inst.setExecute_device_code(this.device_code);
finish_instruction();
logServer.deviceExecuteLog(device_code, "", "", "入库输送线任务开始反馈完成状态,反馈成功,指令号:" + task);
logServer.deviceExecuteLog(device_code, "", "", "套管工位任务开始反馈完成状态,反馈成功,指令号:" + task);
}
}
}

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

@@ -119,8 +119,8 @@ public class ItemProtocol {
list.add(new ItemDto(item_error, "报警", "DB101.W8"));
list.add(new ItemDto(item_task, "任务号1", "DB101.D116"));
list.add(new ItemDto(item_task1, "任务号2", "DB101.D118"));
list.add(new ItemDto(item_material1, "物料1", "DB102.STRING10.50"));
list.add(new ItemDto(item_material2, "物料2", "DB102.STRING62.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_qty, "数量", "DB101.W114"));
return list;
}

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

@@ -187,32 +187,32 @@ public class ItemProtocol {
public static List<ItemDto> getReadableItemDtos() {
ArrayList<ItemDto> list = new ArrayList<>();
list.add(new ItemDto(item_heartbeat, "心跳", "DB1.B0"));
list.add(new ItemDto(item_mode, "工作模式", "DB1.B1"));
list.add(new ItemDto(item_move, "光电信号", "DB1.B2"));
list.add(new ItemDto(item_action, "动作信号", "DB1.B3"));
list.add(new ItemDto(item_walk_y, "行走列", "DB1.B4"));
list.add(new ItemDto(item_error, "报警信号", "DB1.B5"));
list.add(new ItemDto(item_task, "任务号", "DB1.D6"));
list.add(new ItemDto(item_x_position, "x坐标", "DB1.REAL10"));
list.add(new ItemDto(item_y_position, "y坐标", "DB1.REAL14"));
list.add(new ItemDto(item_inflatable_shaft_size, "气胀轴尺寸", "DB1.C1"));
list.add(new ItemDto(item_heartbeat, "心跳", "DB100.W0"));
list.add(new ItemDto(item_mode, "工作模式", "DB100.W2"));
list.add(new ItemDto(item_move, "光电信号", "DB100.W4"));
list.add(new ItemDto(item_action, "动作信号", "DB100.W6"));
list.add(new ItemDto(item_walk_y, "行走列", "DB100.W8"));
list.add(new ItemDto(item_error, "报警信号", "DB100.W10"));
list.add(new ItemDto(item_task, "任务号", "DB100.D12"));
list.add(new ItemDto(item_x_position, "x坐标", "DB100.REAL16"));
list.add(new ItemDto(item_y_position, "y坐标", "DB100.REAL20"));
list.add(new ItemDto(item_inflatable_shaft_size, "气胀轴尺寸", "DB100.W24"));
return list;
}
public static List<ItemDto> getWriteableItemDtos() {
ArrayList<ItemDto> list = new ArrayList<>();
list.add(new ItemDto(item_to_command, "下发命令", "DB2.W0"));
list.add(new ItemDto(item_to_onset, "下发起始站", "DB2.W2"));
list.add(new ItemDto(item_to_target, "下发目标站", "DB2.W4"));
list.add(new ItemDto(item_to_task, "下发任务号", "DB2.D1"));
list.add(new ItemDto(item_to_putpoint, "反馈放货点", "DB2.D2"));
list.add(new ItemDto(item_to_new_getpoint, "反馈新取货点", "DB2.D3"));
list.add(new ItemDto(item_to_two_putpoint, "反馈二次放货点", "DB2.D4"));
list.add(new ItemDto(item_to_task_type, "下发任务类型", "DB2.D5"));
list.add(new ItemDto(item_inflatableShaftVersion, "气胀轴代数", "DB2.D6"));
list.add(new ItemDto(item_tube_num, "套管数量", "DB2.D7"));
list.add(new ItemDto(item_is_wrapped, "是否套轴", "DB2.D8"));
list.add(new ItemDto(item_to_command, "下发命令", "DB200.W0"));
list.add(new ItemDto(item_to_onset, "下发起始站", "DB200.W2"));
list.add(new ItemDto(item_to_target, "下发目标站", "DB200.W4"));
list.add(new ItemDto(item_to_task, "下发任务号", "DB200.D12"));
list.add(new ItemDto(item_to_putpoint, "反馈放货点", "DB200.W6"));
list.add(new ItemDto(item_to_new_getpoint, "反馈新取货点", "DB200.W8"));
list.add(new ItemDto(item_to_two_putpoint, "反馈二次放货点", "DB200.W10"));
list.add(new ItemDto(item_to_task_type, "下发任务类型", "DB200.W16"));
list.add(new ItemDto(item_inflatableShaftVersion, "气胀轴代数", "DB200.W18"));
list.add(new ItemDto(item_tube_num, "套管数量", "DB200.W20"));
list.add(new ItemDto(item_is_wrapped, "是否套轴", "DB200.W22"));
return list;
}

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

@@ -351,58 +351,58 @@ public class ItemProtocol {
public static List<ItemDto> getReadableItemDtos() {
ArrayList list = new ArrayList();
list.add(new ItemDto(item_heartbeat, "心跳", "DB101.W0"));
list.add(new ItemDto(item_mode, "工作模式", "DB101.W2"));
list.add(new ItemDto(item_move, "光电信号", "DB101.W3"));
list.add(new ItemDto(item_carrier_direction, "托盘方向", "DB101.W4"));
list.add(new ItemDto(item_error, "报警", "DB101.W58"));
list.add(new ItemDto(item_task, "任务号", "DB101.W68"));
list.add(new ItemDto(item_out_seq_arr, "出库顺序数组", "DB101.W5"));
list.add(new ItemDto(item_out_qty_arr, "出库数量数组", "DB101.W6"));
list.add(new ItemDto(item_material1, "物料1", "DB101.W7"));
list.add(new ItemDto(item_qty1, "数量1", "DB101.W19"));
list.add(new ItemDto(item_material2, "物料2", "DB101.W8"));
list.add(new ItemDto(item_qty2, "数量2", "DB101.W20"));
list.add(new ItemDto(item_material3, "物料3", "DB101.W9"));
list.add(new ItemDto(item_qty3, "数量3", "DB101.W21"));
list.add(new ItemDto(item_material4, "物料4", "DB101.W10"));
list.add(new ItemDto(item_qty4, "数量4", "DB101.W22"));
list.add(new ItemDto(item_material5, "物料5", "DB101.W11"));
list.add(new ItemDto(item_qty5, "数量5", "DB101.W23"));
list.add(new ItemDto(item_material6, "物料6", "DB101.W12"));
list.add(new ItemDto(item_qty6, "数量6", "DB101.W24"));
list.add(new ItemDto(item_material7, "物料7", "DB101.W13"));
list.add(new ItemDto(item_qty7, "数量7", "DB101.W25"));
list.add(new ItemDto(item_material8, "物料8", "DB101.W14"));
list.add(new ItemDto(item_qty8, "数量8", "DB101.W26"));
list.add(new ItemDto(item_material9, "物料9", "DB101.W15"));
list.add(new ItemDto(item_qty9, "数量9", "DB101.W27"));
list.add(new ItemDto(item_material10, "物料10", "DB101.W16"));
list.add(new ItemDto(item_qty10, "数量10", "DB101.W28"));
list.add(new ItemDto(item_material11, "物料11", "DB101.W17"));
list.add(new ItemDto(item_qty11, "数量11", "DB101.W29"));
list.add(new ItemDto(item_material12, "物料12", "DB101.W18"));
list.add(new ItemDto(item_qty12, "数量12", "DB101.W30"));
list.add(new ItemDto(item_heartbeat, "心跳", "1001.W0"));
list.add(new ItemDto(item_mode, "工作模式", "1001.W2"));
list.add(new ItemDto(item_move, "光电信号", "1001.W4"));
list.add(new ItemDto(item_carrier_direction, "托盘方向", "1001.W6"));
list.add(new ItemDto(item_error, "报警", "1001.W8"));
list.add(new ItemDto(item_task, "任务号", "1001.W10"));
list.add(new ItemDto(item_out_seq_arr, "出库顺序数组", "1001.String.150"));
list.add(new ItemDto(item_out_qty_arr, "出库数量数组", "1001.W166"));
list.add(new ItemDto(item_material1, "物料1", "1001.String170.50"));
list.add(new ItemDto(item_qty1, "数量1", "1001.W222"));
list.add(new ItemDto(item_material2, "物料2", "1001.String224.50"));
list.add(new ItemDto(item_qty2, "数量2", "1001.W276"));
list.add(new ItemDto(item_material3, "物料3", "1001.String278.50"));
list.add(new ItemDto(item_qty3, "数量3", "1001.W330"));
list.add(new ItemDto(item_material4, "物料4", "1001.String332.50"));
list.add(new ItemDto(item_qty4, "数量4", "1001.W384"));
list.add(new ItemDto(item_material5, "物料5", "1001.String386.50"));
list.add(new ItemDto(item_qty5, "数量5", "1001.W438"));
list.add(new ItemDto(item_material6, "物料6", "1001.String440.50"));
list.add(new ItemDto(item_qty6, "数量6", "1001.W492"));
list.add(new ItemDto(item_material7, "物料7", "1001.String494.50"));
list.add(new ItemDto(item_qty7, "数量7", "1001.W546"));
list.add(new ItemDto(item_material8, "物料8", "1001.String548.50"));
list.add(new ItemDto(item_qty8, "数量8", "1001.W600"));
list.add(new ItemDto(item_material9, "物料9", "1001.String602.50"));
list.add(new ItemDto(item_qty9, "数量9", "1001.W654"));
list.add(new ItemDto(item_material10, "物料10", "1001.String656.50"));
list.add(new ItemDto(item_qty10, "数量10", "1001.W708"));
list.add(new ItemDto(item_material11, "物料11", "1001.String710.50"));
list.add(new ItemDto(item_qty11, "数量11", "1001.W762"));
list.add(new ItemDto(item_material12, "物料12", "1001.String764.50"));
list.add(new ItemDto(item_qty12, "数量12", "1001.W816"));
return list;
}
public static List<ItemDto> getWriteableItemDtos() {
ArrayList list = new ArrayList();
list.add(new ItemDto(item_to_target , "下发仓位号", "DB102.W2"));
list.add(new ItemDto(item_to_command, "下发命令", "DB102.W4"));
list.add(new ItemDto(item_to_task, "下发任务号", "DB102.W1"));
list.add(new ItemDto(item_to_material1, "下发物料1", "DB102.W3"));
list.add(new ItemDto(item_to_out_qty1, "下发物料1数量", "DB102.W7"));
list.add(new ItemDto(item_to_seq1, "出库顺序1", "DB102.W10"));
list.add(new ItemDto(item_to_position1, "仓位1", "DB102.W13"));
list.add(new ItemDto(item_to_material2, "下发物料2", "DB102.W5"));
list.add(new ItemDto(item_to_out_qty2, "下发物料2数量", "DB102.W8"));
list.add(new ItemDto(item_to_seq2, "出库顺序2", "DB102.W11"));
list.add(new ItemDto(item_to_position2, "仓位2", "DB102.W14"));
list.add(new ItemDto(item_to_material3, "下发物料3", "DB102.W6"));
list.add(new ItemDto(item_to_out_qty3, "下发物料3数量", "DB102.W9"));
list.add(new ItemDto(item_to_seq3, "出库顺序3", "DB102.W12"));
list.add(new ItemDto(item_to_position3, "仓位3", "DB102.W15"));
list.add(new ItemDto(item_to_target , "下发仓位号", "1002.W0"));
list.add(new ItemDto(item_to_command, "下发命令", "1002.W2"));
list.add(new ItemDto(item_to_task, "下发任务号", "1002.DW4"));
list.add(new ItemDto(item_to_material1, "下发物料1", "1002.String8.50"));
list.add(new ItemDto(item_to_out_qty1, "下发物料1数量", "1002.W60"));
list.add(new ItemDto(item_to_seq1, "出库顺序1", "1002.W62"));
list.add(new ItemDto(item_to_position1, "仓位1", "1002.W64"));
list.add(new ItemDto(item_to_material2, "下发物料2", "1002.String66.50"));
list.add(new ItemDto(item_to_out_qty2, "下发物料2数量", "1002.W118"));
list.add(new ItemDto(item_to_seq2, "出库顺序2", "1002.W120"));
list.add(new ItemDto(item_to_position2, "仓位2", "1002.W122"));
list.add(new ItemDto(item_to_material3, "下发物料3", "1002.String124.50"));
list.add(new ItemDto(item_to_out_qty3, "下发物料3数量", "1002.W176"));
list.add(new ItemDto(item_to_seq3, "出库顺序3", "1002.W178"));
list.add(new ItemDto(item_to_position3, "仓位3", "1002.W180"));
return list;
}

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

@@ -75,11 +75,11 @@ public class ItemProtocol {
public static List<ItemDto> getReadableItemDtos() {
ArrayList list = new ArrayList();
list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0"));
list.add(new ItemDto(item_mode, "工作状态", "DB600.B2"));
list.add(new ItemDto(item_move, "光电开关信号", "DB600.B3"));
list.add(new ItemDto(item_error, "报警信号", "DB600.B5"));
list.add(new ItemDto(item_task1, "任务号1(行架任务号)", "DB600.D6"));
list.add(new ItemDto(item_heartbeat, "心跳", "DB104.W0"));
list.add(new ItemDto(item_mode, "工作状态", "DB104.W2"));
list.add(new ItemDto(item_move, "光电开关信号", "DB104.W4"));
list.add(new ItemDto(item_error, "报警信号", "DB104.W6"));
list.add(new ItemDto(item_task1, "任务号1(行架任务号)", "DB104.D8"));
// list.add(new ItemDto(item_task2, "任务号2(纸管任务号)", "DB600.D10"));
return list;
@@ -87,7 +87,7 @@ public class ItemProtocol {
public static List<ItemDto> getWriteableItemDtos() {
ArrayList list = new ArrayList();
list.add(new ItemDto(item_to_command, "作业命令", "DB601.W2"));
list.add(new ItemDto(item_to_command, "作业命令", "DB204.W0"));
return list;
}

20
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plugging_unplugging_machine/PluggingUnpluggingMachineDeviceDriver.java
View File

@@ -141,16 +141,16 @@ public class PluggingUnpluggingMachineDeviceDriver extends AbstractOpcDeviceDriv
applyBushing();
}
break;
case 5:
if ((task1 > 0) && !requireSucess) {
bushingSucess();
}
break;
case 6:
if (task1 > 0 && !requireSucess) {
pullingSucess();
}
break;
// case 5:
// if ((task1 > 0) && !requireSucess) {
// bushingSucess();
// }
// break;
// case 6:
// if (task1 > 0 && !requireSucess) {
// pullingSucess();
// }
// break;
default:
break;

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

@@ -81,20 +81,20 @@ public class ItemProtocol {
public static List<ItemDto> getReadableItemDtos() {
ArrayList list = new ArrayList();
list.add(new ItemDto(item_heartbeat, "心跳", "DB102.W0"));
list.add(new ItemDto(item_mode, "工作状态", "DB102.W2"));
list.add(new ItemDto(item_move1, "光电开关信号1", "DB102.W4"));
list.add(new ItemDto(item_move1, "光电开关信号2", "DB102.W6"));
list.add(new ItemDto(item_qty1, "工位1重量", "DB102.REAL8"));
list.add(new ItemDto(item_qty2, "工位2重量", "DB102.REAL12"));
list.add(new ItemDto(item_error, "报警信号", "DB102.W16"));
list.add(new ItemDto(item_task, "任务号(行架任务号)", "DB102.D18"));
list.add(new ItemDto(item_heartbeat, "心跳", "DB103.W0"));
list.add(new ItemDto(item_mode, "工作状态", "DB103.W2"));
list.add(new ItemDto(item_move1, "光电开关信号1", "DB103.W4"));
list.add(new ItemDto(item_move1, "光电开关信号2", "DB103.W6"));
list.add(new ItemDto(item_qty1, "工位1重量", "DB103.REAL8"));
list.add(new ItemDto(item_qty2, "工位2重量", "DB103.REAL12"));
list.add(new ItemDto(item_error, "报警信号", "DB103.W16"));
list.add(new ItemDto(item_task, "任务号(行架任务号)", "DB103.D18"));
return list;
}
public static List<ItemDto> getWriteableItemDtos() {
ArrayList list = new ArrayList();
list.add(new ItemDto(item_to_command, "作业命令", "DB202.W0"));
list.add(new ItemDto(item_to_command, "作业命令", "DB203.W0"));
return list;
}
}