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

opt:越南富佳优化

Browse Source
This commit is contained in:
郑旭明\73939
2025-09-26 13:54:03 +08:00
parent 6335da2009
commit 618bd36582
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java
View File

@@ -183,25 +183,25 @@ public class ItemProtocol {
public static List<ItemDto> getReadableItemDtos() {
ArrayList list = new ArrayList();
list.add(new ItemDto(item_heartbeat, "心跳", "DB101.B0"));
list.add(new ItemDto(item_mode, "工作模式", "DB101.B2"));
list.add(new ItemDto(item_move, "光电信号", "DB101.B3"));
list.add(new ItemDto(item_type, "出入库信号", "DB101.B4"));
list.add(new ItemDto(item_actionRequest, "动作请求", "DB101.B5"));
list.add(new ItemDto(item_action, "动作类型", "DB101.B6"));
list.add(new ItemDto(item_error, "报警", "DB101.B58"));
list.add(new ItemDto(item_barcode, "载具号", "DB101.B60"));
list.add(new ItemDto(item_task, "任务号", "DB101.D68"));
list.add(new ItemDto(item_heartbeat, "心跳", "VW15000"));
list.add(new ItemDto(item_mode, "工作模式", "VW15028"));
list.add(new ItemDto(item_move, "光电信号", "VW15030"));
list.add(new ItemDto(item_action, "取放信号", "VW15032"));
list.add(new ItemDto(item_error, "报警", "VW15034"));
list.add(new ItemDto(item_type, "出入库信号", "VW15036"));
list.add(new ItemDto(item_actionRequest, "动作请求", "VW15038"));
list.add(new ItemDto(item_barcode, "载具号", "VW15040"));
list.add(new ItemDto(item_task, "任务号", "VD15024"));
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.D1"));
list.add(new ItemDto(item_to_barcode, "下发托盘号", "DB102.B5"));
list.add(new ItemDto(item_to_taskNum, "下发出库任务数", "DB102.B6"));
list.add(new ItemDto(item_to_command, "下发命令", "VW16028"));
list.add(new ItemDto(item_to_target, "下发目标站", "VW16030"));
list.add(new ItemDto(item_to_barcode, "下发托盘号", "VW16032"));
list.add(new ItemDto(item_to_task, "下发任务号", "VD16024"));
list.add(new ItemDto(item_to_taskNum, "下发出库任务数", "VW16034"));
return list;
}

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/CreateTaskRequest.java
View File

@@ -94,6 +94,8 @@ public class CreateTaskRequest extends BaseRequest {
*/
private String ext_task_id;
private String ext_task_uuid;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -90,7 +90,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
String data = datas.get(i).toString();
CreateTaskRequest request = JsonUtl.format(data, CreateTaskRequest.class);
String paper_array = request.getPaper_array();
String ext_task_id = request.getExt_task_id();
String ext_task_id = request.getExt_task_uuid();
String task_code = request.getTask_code();
String start_device_code = request.getStart_device_code();
String start_device_code2 = request.getStart_device_code2();