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

add:新增一楼立库任务类型以及行架报警信息

Browse Source
This commit is contained in:
tuqiang
2024-07-30 17:46:15 +08:00
parent 24c61f2fe5
commit 7bc69d49eb
22 changed files with 130 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java
View File

@@ -1382,6 +1382,11 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
jo4.put("script_args", script_args1);
ja.add(jo4);
JSONObject jo6 = new JSONObject();
jo6.put("blockId", IdUtil.simpleUUID());
jo6.put("location", inst.getStart_point_code());
jo6.put("binTask", "Script");
ja.add(jo6);
JSONObject jo7 = new JSONObject();
jo7.put("blockId", IdUtil.simpleUUID());
@@ -1474,7 +1479,11 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
jo4.put("script_args", script_args1);
ja.add(jo4);
JSONObject jo6 = new JSONObject();
jo6.put("blockId", IdUtil.simpleUUID());
jo6.put("location", inst.getStart_point_code());
jo6.put("binTask", "Script");
ja.add(jo6);
JSONObject jo7 = new JSONObject();
jo7.put("blockId", IdUtil.simpleUUID());

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java
View File

@@ -646,7 +646,7 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
jo.put("task", task);
jo.put("walk_y", walk_y);
jo.put("isOnline", this.getIsonline());
jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError())));
jo.put("error", ErrorUtil.getDictDetail("zjzxhj_error_type", String.valueOf(this.getError())));
jo.put("isError", this.getIserror());
jo.put("message", LangProcess.msg(message));
jo.put("notCreateTaskMessage", notCreateTaskMessage);

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java
View File

@@ -597,7 +597,7 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
jo.put("action", action);
jo.put("task", task);
jo.put("isOnline", this.getIsonline());
jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError())));
jo.put("error", ErrorUtil.getDictDetail("mxrkhj_error_type", String.valueOf(this.getError())));
jo.put("isError", this.getIserror());
jo.put("message", LangProcess.msg(message));
jo.put("notCreateTaskMessage", notCreateTaskMessage);

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java
View File

@@ -615,7 +615,7 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
jo.put("action", action);
jo.put("task", task);
jo.put("isOnline", this.getIsonline());
jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError())));
jo.put("error", ErrorUtil.getDictDetail("thrkhj_error_type", String.valueOf(this.getError())));
jo.put("isError", this.getIserror());
jo.put("message", LangProcess.msg(message));
jo.put("notCreateTaskMessage", notCreateTaskMessage);

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/rgv/OneRgvDeviceDriver.java
View File

@@ -318,12 +318,12 @@ public class OneRgvDeviceDriver extends AbstractOpcDeviceDriver implements Devic
/*jo.put("task", task);*/
/*jo.put("walk_y", this.walk_y);*/
map.put("isOnline", this.getIsonline());
map.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError())));
map.put("error", ErrorUtil.getDictDetail("rgv_error_type", String.valueOf(this.getError())));
map.put("isError", this.getIserror());
map.put("message", LangProcess.msg(message));
// map.put("message", LangProcess.msg(message));
/*jo.put("notCreateTaskMessage", notCreateTaskMessage);
jo.put("notCreateInstMessage",notCreateInstMessage);*/
map.put("feedMessage", LangProcess.msg(feedMessage));
// map.put("feedMessage", LangProcess.msg(feedMessage));
map.put("driver_type", "siemens_conveyor");
map.put("is_click", true);
JSONObject jo = new JSONObject(map);

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java
View File

@@ -656,7 +656,7 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice
jo.put("action", action);
jo.put("task", task);
jo.put("isOnline", this.getIsonline());
jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError())));
jo.put("error", ErrorUtil.getDictDetail("mxddhj_error_type", String.valueOf(this.getError())));
jo.put("isError", this.getIserror());
jo.put("message", LangProcess.msg(message));
jo.put("notCreateTaskMessage", notCreateTaskMessage);

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorManipulatorDeviceDriver.java
View File

@@ -704,7 +704,7 @@ public class VolumeTwoManipulatorManipulatorDeviceDriver extends AbstractOpcDevi
jo.put("action", action);
jo.put("task", task);
jo.put("isOnline", this.getIsonline());
jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError())));
jo.put("error", ErrorUtil.getDictDetail("zjxxhj_error_type", String.valueOf(this.getError())));
jo.put("isError", this.getIserror());
jo.put("message", LangProcess.msg(message));
jo.put("notCreateTaskMessage", notCreateTaskMessage);

18
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java
View File

@@ -214,11 +214,11 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl
if (mode == 0) {
this.setIsonline(false);
message = "universal_off-line";
message = "脱机";
//有报警
} else if (error != 0) {
this.setIserror(true);
message = "universal_message3";
message = "有报警";
//无报警
} else {
this.setIsonline(true);
@@ -888,19 +888,17 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl
requireSucess = LangProcess.msg("universal_actionMessage5");
}
jo.put("requireSucess", requireSucess);
if (this.getAction() == 1) {
action = LangProcess.msg("universal_delivery");
if (this.getAction() == 0) {
action = LangProcess.msg("universal_actionMessage1");
} else if (this.getAction() == 1) {
action = LangProcess.msg("universal_actionMessage6");
} else if (this.getAction() == 2) {
action = LangProcess.msg("universal_completed");
} else if (this.getAction() == 3) {
action = LangProcess.msg("universal_releasing");
} else if (this.getAction() == 4) {
action = LangProcess.msg("universal_releasing_completed");
action = LangProcess.msg("universal_actionMessage7");
}
jo.put("device_name", this.getDevice().getDevice_name());
jo.put("mode", mode);
jo.put("move", move);
/*jo.put("action", action);*/
jo.put("action", action);
jo.put("error", ErrorUtil.getDictDetail("cbj_error_type", String.valueOf(this.getError())));
jo.put("isOnline", this.getIsonline());
jo.put("isError", this.getIserror());

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java
View File

@@ -439,7 +439,7 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
task = readyTaskDtos.get(0);
}
if (ObjectUtil.isNotEmpty(task)) {
break;
break;
}
}
}
@@ -592,7 +592,7 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
if (ObjectUtil.isNotEmpty(to_spec4)) {
map.put("to_spec3", to_spec4);
}
}else {
} else {
map.put("to_material3", to_material3);
if (ObjectUtil.isNotEmpty(to_material4)) {
map.put("to_material4", to_material4);
@@ -757,7 +757,7 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
map.put("is_click", true);
map.put("message", LangProcess.msg(message));
map.put("notCreateTaskMessage", LangProcess.msg(notCreateTaskMessage));
map.put("notCreateInstMessage", LangProcess.msg(notCreateInstMessage));
map.put("notCreateInstMessage", this.getDeviceCode() + LangProcess.msg(notCreateInstMessage));
map.put("error", ErrorUtil.getDictDetail("bqhj_error_type", String.valueOf(this.getError())));
/*jo.put("x", xPosition);
jo.put("y", yPosition);*/

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

@@ -210,4 +210,15 @@ public class CreateTaskRequest extends BaseRequest {
* agv二次分配类型（1、普通任务 2、取货二次分配 3、防货二次分配 4、取放货二次分配）
*/
private Integer agv_action_type;
/**
* 任务类型
* 12 木箱入库行架任务
* 13 装箱入库行架任务
* 14 退货入库行架任务
* 15 RGV输送任务
* 16 子卷下线行架任务
* 17 木箱堆叠行架任务
*/
private String class_type;
}

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

@@ -89,6 +89,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
HttpResponse result2 = null;
try {
result2 = HttpRequest.post(url)
.addInterceptor(tLogHutoolhttpInterceptor)
.header(Header.USER_AGENT, "Hutool http")
.header("Authorization", token)
.body(String.valueOf(jo))
.execute();
@@ -213,6 +215,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
HttpResponse result2 = null;
try {
result2 = HttpRequest.post(url)
.addInterceptor(tLogHutoolhttpInterceptor)
.header(Header.USER_AGENT, "Hutool http")
.header("Authorization", token)
.body(String.valueOf(param))
.execute();
@@ -253,6 +257,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
HttpResponse result2 = null;
try {
result2 = HttpRequest.post(url)
.addInterceptor(tLogHutoolhttpInterceptor)
.header(Header.USER_AGENT, "Hutool http")
.header("Authorization", token)
.body(String.valueOf(param))
.execute();
@@ -293,6 +299,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
HttpResponse result2 = null;
try {
result2 = HttpRequest.post(url)
.addInterceptor(tLogHutoolhttpInterceptor)
.header(Header.USER_AGENT, "Hutool http")
.header("Authorization", token)
.body(String.valueOf(param))
.execute();
@@ -407,6 +415,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
try {
// String result = "";
String result = HttpRequest.post(url)
.addInterceptor(tLogHutoolhttpInterceptor)
.header(Header.USER_AGENT, "Hutool http")
.body(JSON.toJSONString(param))
.execute().body();
JSONObject jsonObject = JSONObject.parseObject(result);
@@ -436,6 +446,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
log.info("applyBlankButtonTask----反馈表处按钮请求路径{}", url);
try {
result = HttpRequest.post(url)
.addInterceptor(tLogHutoolhttpInterceptor)
.header(Header.USER_AGENT, "Hutool http")
.header("Authorization", token)
.body(String.valueOf(param))
.execute();
@@ -475,6 +487,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
try {
//
result = HttpRequest.post(url)
.addInterceptor(tLogHutoolhttpInterceptor)
.header(Header.USER_AGENT, "Hutool http")
.body(JSON.toJSONString(param))
.execute().body();
JSONObject jsonObject = JSONObject.parseObject(result);
@@ -516,6 +530,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
try {
//
result = HttpRequest.post(url)
.addInterceptor(tLogHutoolhttpInterceptor)
.header(Header.USER_AGENT, "Hutool http")
.body(JSON.toJSONString(param))
.execute().body();
JSONObject jsonObject = JSONObject.parseObject(result);
@@ -550,6 +566,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
log.info("RGV工位上有货申请行架任务----请求参数:{}", JSONObject.toJSONString(param));
try {
result = HttpRequest.post(url)
.addInterceptor(tLogHutoolhttpInterceptor)
.header(Header.USER_AGENT, "Hutool http")
.body(JSON.toJSONString(param))
.execute().body();
JSONObject jsonObject = JSONObject.parseObject(result);
@@ -586,6 +604,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
try {
// String result = "";
String result = HttpRequest.post(url)
.addInterceptor(tLogHutoolhttpInterceptor)
.header(Header.USER_AGENT, "Hutool http")
.body(JSON.toJSONString(param))
.execute().body();
JSONObject jsonObject = JSONObject.parseObject(result);
@@ -619,6 +639,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
HttpResponse result2 = null;
try {
result2 = HttpRequest.post(url)
.addInterceptor(tLogHutoolhttpInterceptor)
.header(Header.USER_AGENT, "Hutool http")
.header("Authorization", token)
.body(String.valueOf(param))
.execute();
@@ -659,6 +681,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
HttpResponse result2 = null;
try {
result2 = HttpRequest.post(url)
.addInterceptor(tLogHutoolhttpInterceptor)
.header(Header.USER_AGENT, "Hutool http")
.header("Authorization", token)
.body(String.valueOf(param))
.execute();
@@ -679,7 +703,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
}
log.info("secondaryAllocationPoint-----输出参数{}", result2.body());
LuceneLogDto luceneLogDto = new LuceneLogDto(4,"secondaryAllocationPoint", String.valueOf(result2.getStatus()),
JSON.toJSONString(param), String.valueOf(result2.body()), "二期发货申请捆扎、贴标");
JSON.toJSONString(param), String.valueOf(result2.body()), "追加诺宝动作块");
luceneLogService.interfaceExecuteLog(luceneLogDto);
return result2.body();
@@ -697,6 +721,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
String url = wmsurl + addressDto.getMethods_url();
try {
execute = HttpRequest.post(url)
.addInterceptor(tLogHutoolhttpInterceptor)
.header(Header.USER_AGENT, "Hutool http")
.body(String.valueOf(jsonObject))
.execute();
} catch (Exception e) {
@@ -731,6 +757,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
log.info("feedbackDie - 反馈管芯请求路径{}", param);
try {
result2 = HttpRequest.post(url)
.addInterceptor(tLogHutoolhttpInterceptor)
.header(Header.USER_AGENT, "Hutool http")
.header("Authorization", token)
.body(String.valueOf(param))
.execute();
@@ -765,6 +793,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
log.info("callShaftFromCache - 请求密集库出气胀轴，申请行架任务请求路径{}", param);
try {
result2 = HttpRequest.post(url)
.addInterceptor(tLogHutoolhttpInterceptor)
.header(Header.USER_AGENT, "Hutool http")
.header("Authorization", token)
.body(String.valueOf(param))
.execute();
@@ -799,6 +829,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
log.info("gccQueryStationState - 请求路径{}", uri);
String responseBody = HttpRequest
.get(uri)
.addInterceptor(tLogHutoolhttpInterceptor)
.header(Header.USER_AGENT, "Hutool http")
.execute()
.body();
log.info("gccQueryStationState - 响应参数{}", responseBody);
@@ -829,6 +861,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
log.info("sendDeviceStatus - 请求参数 {}", param);
HttpResponse response = HttpRequest
.post(url)
.addInterceptor(tLogHutoolhttpInterceptor)
.header(Header.USER_AGENT, "Hutool http")
.body(param.toString())
.execute();
log.info("sendDeviceStatus - 返回参数 {}", response.body());
@@ -855,6 +889,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
HttpResponse result2 = null;
try {
result2 = HttpRequest.post(url)
.addInterceptor(tLogHutoolhttpInterceptor)
.header(Header.USER_AGENT, "Hutool http")
.header("Authorization", token)
.body(String.valueOf(param))
.execute();

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

@@ -130,6 +130,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
String vehicle_type = request.getVehicle_type();
String route_plan_code = request.getRoute_plan_code();
String task_type = request.getTask_type();
String class_type = request.getClass_type();
String truss_type = request.getTruss_type();
Integer agv_action_type = request.getAgv_action_type();
String empty_site = request.getEmpty_site();
@@ -354,6 +355,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
jo.put("params", params);
jo.put("params2", params2);
jo.put("task_type", StrUtil.isEmpty(task_type) ? 1 : Integer.parseInt(task_type));
jo.put("class_type", class_type);
jo.put("route_plan_code", route_plan_code);
jo.put("paper_array", JSONUtil.toJsonStr(paper_array));
jo.put("truss_type", JSONUtil.toJsonStr(truss_type));

23
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -412,7 +412,12 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
if (StrUtil.isEmpty(dto.getLink_num())) {
dto.setIs_send(task.getLink_num());
}
dto.setInstruction_type(task.getTask_type());
if (ObjectUtil.isNotEmpty(task.getTask_type()) && task.getClass_type().length()==2) {
dto.setInstruction_type(task.getClass_type());
} else {
dto.setInstruction_type(task.getTask_type());
}
// 起点设备与终点设备相同则为初始指令
if (StrUtil.equals(task.getStart_device_code(), dto.getStart_device_code())) {
if (!StrUtil.equals(dto.getCompound_inst(), "0")
@@ -421,16 +426,16 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
dto.setCompound_inst_data(task.getCompound_task_data());
}
}
dto.setCreate_by(ObjectUtil.isNotEmpty(currentUsername) ? currentUsername : dto.getStart_device_code()+":自动创建");
dto.setUpdate_by(ObjectUtil.isNotEmpty(currentUsername) ? currentUsername : dto.getStart_device_code()+":自动创建");
dto.setCreate_by(ObjectUtil.isNotEmpty(currentUsername) ? currentUsername : dto.getStart_device_code() + ":自动创建");
dto.setUpdate_by(ObjectUtil.isNotEmpty(currentUsername) ? currentUsername : dto.getStart_device_code() + ":自动创建");
dto.setUpdate_time(now);
dto.setCreate_time(now);
dto.setStart_parent_code(task.getStart_parent_code());
dto.setNext_parent_code(task.getNext_parent_code());
if (ObjectUtil.isNotEmpty(task.getTask_type())) {
dto.setInstruction_type(task.getTask_type());
}
// if (ObjectUtil.isNotEmpty(task.getTask_type())) {
// dto.setInstruction_type(task.getTask_type());
// }
DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
Device startdevice = appService.findDeviceByCode(dto.getStart_device_code());
@@ -599,8 +604,8 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
dto.setCompound_inst_data(task.getCompound_task_data());
}
}
dto.setCreate_by(ObjectUtil.isNotEmpty(currentUsername) ? currentUsername : dto.getStart_device_code()+"手动创建");
dto.setUpdate_by(ObjectUtil.isNotEmpty(currentUsername) ? currentUsername : dto.getStart_device_code()+"手动创建");
dto.setCreate_by(ObjectUtil.isNotEmpty(currentUsername) ? currentUsername : dto.getStart_device_code() + "手动创建");
dto.setUpdate_by(ObjectUtil.isNotEmpty(currentUsername) ? currentUsername : dto.getStart_device_code() + "手动创建");
dto.setUpdate_time(now);
dto.setCreate_time(now);
dto.setStart_parent_code(task.getStart_parent_code());
@@ -1949,7 +1954,7 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
@Override
public List<Instruction> findByCodeAndExcute(String next_code) {
List<Instruction> instructionList = instructions.stream().filter(item -> item.getNext_device_code().equals(next_code) ).collect(Collectors.toList());
List<Instruction> instructionList = instructions.stream().filter(item -> item.getNext_device_code().equals(next_code)).collect(Collectors.toList());
return instructionList;
}

9
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/domain/Task.java
View File

@@ -243,6 +243,15 @@ public class Task extends CommonModel<Task> implements Serializable {
private Integer agv_action_type;
/**
* 任务类型
* 9 子卷下线行架任务
* 12 木箱入库行架任务
* 13 装箱入库行架任务
* 14 退货入库行架任务
* 15 RGV输送任务
*/
private String class_type;
public void copyFrom(Task source) {
BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));

5
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskTypeEnum.java
View File

@@ -23,12 +23,13 @@ public enum TaskTypeEnum {
Oven_Truss_Task("8", "8", "烘箱行架任务"),
Inner_Truss_Task("9", "9", "内包间行架任务"),
Inner_Truss_Task("9", "9", "子卷下线行架任务"),
Stacker_Task("11", "11", "堆垛机任务"),
Box_Storage("12", "12", "木箱入库行架任务"),
Box_Package("13", "13", "装箱入库行架任务"),
Return_Good("14", "14", "退货入库任务");
Return_Good("14", "14", "退货入库行架任务"),
Rgv_Conveyor_Task("15", "15", "RGV输送任务");
/**

10
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskDto.java
View File

@@ -355,4 +355,14 @@ public class TaskDto implements Serializable {
* agv二次分配类型（1、普通任务 2、取货二次分配 3、防货二次分配 4、取放货二次分配）
*/
private Integer agv_action_type;
/**
* 任务类型
* 9 子卷下线行架任务
* 12 木箱入库行架任务
* 13 装箱入库行架任务
* 14 退货入库行架任务
* 15 RGV输送任务
*/
private String class_type;
}

2
acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal.properties
View File

@@ -67,6 +67,8 @@ universal_actionMessage2=\u5141\u8BB8\u53D6\u653E
universal_actionMessage3=\u5141\u8BB8\u79BB\u5F00
universal_actionMessage4=\u8BF7\u6C42\u52A8\u4F5C\u5DF2\u590D\u4F4D
universal_actionMessage5=\u8BF7\u6C42\u52A8\u4F5C\u672A\u590D\u4F4D
universal_actionMessage6=\u5141\u8BB8\u53D6
universal_actionMessage7=\u5141\u8BB8\u653E
universal_directives=\u6307\u4EE4

2
acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_en_US.properties
View File

@@ -64,6 +64,8 @@ universal_actionMessage2=Pick-and-place is allowed
universal_actionMessage3=Permission to leave
universal_actionMessage4=The request action has been reset
universal_actionMessage5=The request action is not reset
universal_actionMessage6=\u5141\u8BB8\u53D6
universal_actionMessage7=\u5141\u8BB8\u653E
universal_notCreateInstMessage7=ray type is empty!
universal_notCreateInstMessage8=The barcode is blank\uFF01
universal_directives=Directives

2
acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_in_ID.properties
View File

@@ -64,6 +64,8 @@ universal_actionMessage2=Pick-and-place diperbolehkan
universal_actionMessage3=Izin untuk pergi
universal_actionMessage4=Tindakan permintaan telah disetel ulang
universal_actionMessage5=Tindakan permintaan tidak disetel ulang
universal_actionMessage6=\u5141\u8BB8\u53D6
universal_actionMessage7=\u5141\u8BB8\u653E
universal_notCreateInstMessage7=ponypianmereka yang kosong!
universal_notCreateInstMessage8=Kode batang kosong!
universal_directives=Arahan

2
acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_zh_CN.properties
View File

@@ -48,6 +48,8 @@ universal_actionMessage2=\u5141\u8BB8\u53D6\u653E
universal_actionMessage3=\u5141\u8BB8\u79BB\u5F00
universal_actionMessage4=\u8BF7\u6C42\u52A8\u4F5C\u5DF2\u590D\u4F4D
universal_actionMessage5=\u8BF7\u6C42\u52A8\u4F5C\u672A\u590D\u4F4D
universal_actionMessage6=\u5141\u8BB8\u53D6
universal_actionMessage7=\u5141\u8BB8\u653E
universal_feedMessage7=move\u4E0D\u4E3A\u6709\u8D27\u72B6\u6001
universal_feedMessage8=\u4EFB\u52A1\u53F7\u4E3A0
universal_feedMessage9=\u52A8\u4F5C\u4FE1\u53F7\u4E0D\u662F\u4EFB\u52A1\u5B8C\u6210

5
acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue
View File

@@ -278,8 +278,10 @@
<el-table-column prop="task_code" :label="$t('task.txt_box.Task_code')" :min-width="flexWidth('task_code',crud.data,$t('task.txt_box.Task_code'))" />
<el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" />
<el-table-column prop="task_type" :label="$t('task.txt_box.Task_type')" width="100px">
debugger
<template slot-scope="scope">
{{ dict.label.task_type[scope.row.task_type] }}
<span v-if="scope.row.class_type!=null && scope.row.class_type.length===2 ">{{ dict.label.task_type[scope.row.class_type] }}</span>
<span v-else>{{ dict.label.task_type[scope.row.task_type] }}</span>
</template>
</el-table-column>
<el-table-column prop="task_status" :label="$t('task.txt_box.Task_status')">
@@ -327,6 +329,7 @@ const defaultForm = {
vehicle_code: null,
vehicle_type: null,
task_type: null,
class_type: null,
task_status: null,
priority: 0,
start_point_code: null,

4
acs2/nladmin-ui/src/views/acs/task/index.vue
View File

@@ -528,7 +528,8 @@
/>
<el-table-column prop="task_type" :label="$t('task.txt_box.Task_type')" width="100px">
<template slot-scope="scope">
{{ dict.label.task_type[scope.row.task_type] }}
<span v-if="scope.row.class_type!=null && scope.row.class_type.length===2">{{ dict.label.task_type[scope.row.class_type] }}</span>
<span v-else>{{ dict.label.task_type[scope.row.task_type] }}</span>
</template>
</el-table-column>
<el-table-column prop="agv_action_type" :label="$t('task.txt_box.Action_type')"
@@ -707,6 +708,7 @@ export default {
{ key: '取放货二次分配', value: 4 }
],
task_type: [],
class_type: [],
fromYList: [],
fromZList: [],
toYList: [],