|
@@ -360,6 +360,8 @@ public class CreateMainWorkOrderJob implements JobHandler {
|
|
|
workOrder.setName(plan.getName() + " 工单");
|
|
workOrder.setName(plan.getName() + " 工单");
|
|
|
if (finalDeviceMap.containsKey(Long.valueOf(planIdDeviceIdStrS[1]))) {
|
|
if (finalDeviceMap.containsKey(Long.valueOf(planIdDeviceIdStrS[1]))) {
|
|
|
Long deptId = finalDeviceMap.get(Long.valueOf(planIdDeviceIdStrS[1])).getDeptId();
|
|
Long deptId = finalDeviceMap.get(Long.valueOf(planIdDeviceIdStrS[1])).getDeptId();
|
|
|
|
|
+ // 设备编码
|
|
|
|
|
+ String deviceCode = finalDeviceMap.get(Long.valueOf(planIdDeviceIdStrS[1])).getDeviceCode();
|
|
|
workOrder.setDeptId(deptId);
|
|
workOrder.setDeptId(deptId);
|
|
|
// 查询 deptId 对应的部门名称
|
|
// 查询 deptId 对应的部门名称
|
|
|
String deptName = StrUtil.EMPTY;
|
|
String deptName = StrUtil.EMPTY;
|
|
@@ -399,11 +401,11 @@ public class CreateMainWorkOrderJob implements JobHandler {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
String workOrderCHName = StrUtil.EMPTY;
|
|
String workOrderCHName = StrUtil.EMPTY;
|
|
|
- workOrderCHName = deptCHName + "/" + responsibleName + "/"
|
|
|
|
|
|
|
+ workOrderCHName = deptCHName + "/" + responsibleName + "/" + deviceCode + "/"
|
|
|
+ deviceCHName + "/" + currentDate + "-保养工单";
|
|
+ deviceCHName + "/" + currentDate + "-保养工单";
|
|
|
String workOrderENName = StrUtil.EMPTY;
|
|
String workOrderENName = StrUtil.EMPTY;
|
|
|
if (StrUtil.isNotBlank(deviceENName) && StrUtil.isNotBlank(deptENName)) {
|
|
if (StrUtil.isNotBlank(deviceENName) && StrUtil.isNotBlank(deptENName)) {
|
|
|
- workOrderENName = deptENName + "/" + responsibleName + "/"
|
|
|
|
|
|
|
+ workOrderENName = deptENName + "/" + responsibleName + "/" + deviceCode + "/"
|
|
|
+ deviceENName + "/" + currentDate + "-Maintenance Work Order";
|
|
+ deviceENName + "/" + currentDate + "-Maintenance Work Order";
|
|
|
}
|
|
}
|
|
|
workOrder.setName(workOrderCHName + "~~en**" + workOrderENName);
|
|
workOrder.setName(workOrderCHName + "~~en**" + workOrderENName);
|