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

feat: 任务配置前端国际化

Browse Source 
任务调度管理前端国际化
点位表字段与功能修改近似于兰州海亮项目
点位表前端国际化,任务配置功能整改
This commit is contained in:
liyongde
2024-04-11 11:16:35 +08:00
parent 68ad6128ea
commit 1c267f4521
35 changed files with 1392 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java
View File

@@ -141,8 +141,8 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl<SchBaseV
@Override
public SchBaseVehiclematerialgroup getOneByVehicleCode(String vehicleCode, String value) {
List<String> list = new ArrayList<>();
list.add(GeneralDefinition.STEEL_TRAY);
list.add(GeneralDefinition.MATERIAL_CUP);
// list.add(GeneralDefinition.STEEL_TRAY);
// list.add(GeneralDefinition.MATERIAL_CUP);
LambdaQueryWrapper<SchBaseVehiclematerialgroup> lambda = new QueryWrapper<SchBaseVehiclematerialgroup>().lambda();
lambda.eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode)
.eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status, value)

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java
View File

@@ -28,14 +28,12 @@ public class SchBasePointController {
@GetMapping
@Log("查询点位管理")
public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
return new ResponseEntity<>(TableDataInfo.build(schBasePointService.queryAll(whereJson,page)),HttpStatus.OK);
}
@PostMapping
@Log("新增点位管理")
public ResponseEntity<Object> create(@Validated @RequestBody SchBasePoint entity){
schBasePointService.create(entity);
return new ResponseEntity<>(HttpStatus.CREATED);
@@ -46,14 +44,12 @@ public class SchBasePointController {
@PutMapping
@Log("修改点位管理")
public ResponseEntity<Object> update(@Validated @RequestBody SchBasePoint entity){
schBasePointService.update(entity);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@Log("删除点位管理")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
schBasePointService.deleteAll(ids);
@@ -62,7 +58,6 @@ public class SchBasePointController {
@Log("启动与禁用")
@PostMapping("/changeUsed")
public ResponseEntity<Object> changeUsedOn(@RequestBody JSONObject jsonObject) {
schBasePointService.changeUsed(jsonObject);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -70,14 +65,12 @@ public class SchBasePointController {
@PostMapping("/getPointList")
@Log("获取区域下拉框")
public ResponseEntity<Object> getPointList(@RequestBody(required = false) SchBasePoint region){
return new ResponseEntity<>(schBasePointService.getPointList(region),HttpStatus.OK);
}
@Log("锁定与解锁")
@PostMapping("/changeLock")
public ResponseEntity<Object> changeLock(@RequestBody JSONObject points) {
schBasePointService.changeLock(points);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);

65
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java
View File

@@ -23,92 +23,92 @@ public class SchBasePoint implements Serializable {
private static final long serialVersionUID = 1L;
/** 点位编码 */
@TableId(value = "point_code", type = IdType.NONE)
private String point_code;
/** 点位名称 */
private String point_name;
/** 区域编码 */
private String region_code;
/** 区域名称 */
private String region_name;
/** 点位类型 */
private String point_type;
/** 点位状态 */
private String point_status;
/** 可以存放物料类型 */
private String can_material_type;
/** 可以存放载具类型 */
private String can_vehicle_type;
/** 载具最大数量 */
private Integer vehicle_max_qty;
/** 载具类型 */
private String vehicle_type;
/** 载具编码 */
private String vehicle_code;
/** 载具数量 */
private Integer vehicle_qty;
/** 块 */
private Integer block_num;
/** 排 */
private Integer row_num;
/** 列 */
private Integer col_num;
/** 层 */
private Integer layer_num;
/** 入库顺序 */
private Integer in_order_seq;
/** 出库顺序 */
private Integer out_order_seq;
/** 入空顺序 */
private Integer in_empty_seq;
/** 出空顺序 */
private Integer out_empty_seq;
/** 父点位 */
private String parent_point_code;
/** 外部编码 */
private String ext_point_code;
/** 进行中的任务编码 */
private String ing_task_code;
/** 是否工单 */
private Boolean is_has_workder;
/** 车间编码 */
private String workshop_code;
/** 是否自动 */
private Boolean is_auto;
/** 备注 */
private String remark;
/** 是否使用 */
private Boolean is_used;
/** 创建人 */
private String create_id;
@@ -125,6 +125,13 @@ public class SchBasePoint implements Serializable {
private String update_time;
private String source_id;
/** 物料编码 */
private String material_code;
/** 位置 */
private String point_location;
/** 锁定类型 */
private String lock_type;
@TableField(exist = false)

9
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
View File

@@ -60,8 +60,8 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
? whereJson.get("point_status").toString() : null;
Boolean is_used = ObjectUtil.isNotEmpty(whereJson.get("is_used"))
? Boolean.valueOf(whereJson.get("is_used").toString()) : null;
Boolean lock_type = ObjectUtil.isNotEmpty(whereJson.get("lock_type"))
? Boolean.valueOf(whereJson.get("lock_type").toString()) : false;
String lock_type = ObjectUtil.isNotEmpty(whereJson.get("lock_type"))
? String.valueOf(whereJson.get("lock_type").toString()) : null;
Boolean parent_point = ObjectUtil.isNotEmpty(whereJson.get("parent_point"))
? Boolean.valueOf(whereJson.get("parent_point").toString()) : false;
LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
@@ -72,10 +72,7 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
.eq(ObjectUtil.isNotEmpty(point_type), SchBasePoint::getPoint_type, point_type)
.eq(ObjectUtil.isNotEmpty(point_status), SchBasePoint::getPoint_status, point_status)
.eq(ObjectUtil.isNotEmpty(is_used), SchBasePoint::getIs_used, is_used)
.and(!lock_type, slam -> slam.isNull(SchBasePoint::getIng_task_code).or()
.eq(SchBasePoint::getIng_task_code, ""))
.and(lock_type, slam -> slam.isNotNull(SchBasePoint::getIng_task_code)
.ne(SchBasePoint::getIng_task_code, ""))
.eq(ObjectUtil.isNotEmpty(lock_type), SchBasePoint::getLock_type, lock_type)
.orderByAsc(SchBasePoint::getRegion_code)
.orderByAsc(SchBasePoint::getPoint_code)
.orderByAsc(SchBasePoint::getPoint_type)

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java
View File

@@ -9,6 +9,7 @@ import org.nl.common.domain.query.PageQuery;
import org.nl.common.logging.annotation.Log;
import org.nl.wms.sch.task.service.ISchBaseTaskService;
import org.nl.wms.sch.task.service.dao.SchBaseTask;
import org.nl.wms.sch.task.service.dto.SchBaseTaskQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -32,7 +33,7 @@ public class SchBaseTaskController {
@GetMapping
@Log("查询任务管理")
public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
public ResponseEntity<Object> query(SchBaseTaskQuery whereJson, PageQuery page){
return new ResponseEntity<>(TableDataInfo.build(schBaseTaskService.queryAll(whereJson,page)),HttpStatus.OK);
}

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java
View File

@@ -7,6 +7,7 @@ import org.nl.common.domain.query.PageQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.ext.acs.service.dto.to.BaseRequest;
import org.nl.wms.sch.task.service.dao.SchBaseTask;
import org.nl.wms.sch.task.service.dto.SchBaseTaskQuery;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import java.util.List;
@@ -27,7 +28,7 @@ public interface ISchBaseTaskService extends IService<SchBaseTask> {
* @param pageable 分页参数
* @return IPage<SchBaseTask>
*/
IPage<SchBaseTask> queryAll(Map whereJson, PageQuery pageable);
IPage<SchBaseTask> queryAll(SchBaseTaskQuery whereJson, PageQuery pageable);
/**

85
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java
View File

@@ -26,112 +26,121 @@ public class SchBaseTask implements Serializable {
@TableId(value = "task_id", type = IdType.NONE)
private String task_id;
/** 任务编码 */
private String task_code;
/** 任务类型 */
private String task_type;
/** 任务状态 */
private String task_status;
/** 配置编码 */
private String config_code;
/** 点位1 */
private String point_code1;
/** 点位2 */
private String point_code2;
/** 点位3 */
private String point_code3;
/** 点位4 */
private String point_code4;
/** 组盘id */
private String group_id;
/** 载具类型 */
private String vehicle_type;
/** 载具数量 */
private Integer vehicle_qty;
/** 载具编码 */
private String vehicle_code;
/** 载具编码2 */
private String vehicle_code2;
/** - */
private String handle_status;
/** 车号 */
private String car_no;
/** 任务组id */
private Long task_group_id;
/** 任务组序号 */
private BigDecimal task_group_seq;
/** 完成类型 */
private String finished_type;
/** 创建模式 */
private String create_mode;
/** acs链路id */
private String acs_trace_id;
/** 请求参数 */
private String request_param;
/** 反馈参数 */
private String response_param;
/** 生成区域 */
private String workshop_code;
/** 外部数据 */
private String ext_group_data;
/** 备注 */
private String remark;
/** 是否删除 */
private Boolean is_delete;
/** 创建人 */
private String create_id;
/** 创建人 */
private String create_name;
/** 创建时间 */
private String create_time;
/** 更新id */
private String update_id;
/** 更新人 */
private String update_name;
/** 更新时间 */
private String update_time;
/** 处理类 */
private String handle_class;
private String acs_task_type;
private String priority;
private String product_area;
/** 是否下发 */
private String is_send;
/** 配置表 -> 优先级 */
@TableField(exist = false)
private String priority;
/** 配置表 -> acs任务类型 */
@TableField(exist = false)
private String acs_task_type;
/** 配置表 -> agv系统 */
@TableField(exist = false)
private String agv_system_type;
/** 额外参数 */
@TableField(exist = false)
private String dtl_type;

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTaskconfig.java
View File

@@ -42,6 +42,7 @@ public class SchBaseTaskconfig implements Serializable {
private String acs_task_type;
private String agv_system_type;
private String task_name;

5
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.java
View File

@@ -1,7 +1,11 @@
package org.nl.wms.sch.task.service.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.nl.wms.sch.task.service.dao.SchBaseTask;
import org.nl.wms.sch.task.service.dto.SchBaseTaskQuery;
import java.util.List;
/**
* @author lyd
@@ -9,4 +13,5 @@ import org.nl.wms.sch.task.service.dao.SchBaseTask;
**/
public interface SchBaseTaskMapper extends BaseMapper<SchBaseTask> {
IPage<SchBaseTask> selectPageLeftJoin(IPage<SchBaseTask> pages, SchBaseTaskQuery whereJson, List<String> collect);
}

43
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml
View File

@@ -2,4 +2,47 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.sch.task.service.dao.mapper.SchBaseTaskMapper">
<select id="selectPageLeftJoin" resultType="org.nl.wms.sch.task.service.dao.SchBaseTask">
SELECT
t.*,
tc.config_name,
tc.task_name,
tc.priority,
tc.acs_task_type,
tc.agv_system_type
FROM
`sch_base_task` t
LEFT JOIN sch_base_taskconfig tc ON tc.config_code = t.config_code
<where>
<if test="whereJson.task_code != null">
AND t.task_code = #{whereJson.task_code}
</if>
<if test="whereJson.config_code != null">
AND t.config_code = #{whereJson.config_code}
</if>
<if test="whereJson.point_code != null">
AND (t.point_code1 LIKE '%${whereJson.point_code}%'
OR t.point_code2 LIKE '%${whereJson.point_code}%')
</if>
<if test="whereJson.unFinished != null">
AND t.task_status <![CDATA[<=]]> #{whereJson.unFinished}
</if>
<if test="whereJson.vehicle_code != null">
AND t.vehicle_code = #{whereJson.vehicle_code}
</if>
<if test="whereJson.end_time != null">
AND t.create_time <![CDATA[<=]]> #{whereJson.end_time}
</if>
<if test="whereJson.begin_time != null">
AND t.create_time <![CDATA[>=]]> #{whereJson.begin_time}
</if>
<if test="collect != null and collect != ''">
AND t.task_status IN
<foreach collection="collect" item="code" separator="," open="(" close=")">
#{code}
</foreach>
</if>
</where>
ORDER BY t.create_time DESC
</select>
</mapper>

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskconfigMapper.xml
View File

@@ -15,7 +15,7 @@
AND sc.config_name LIKE '%${config.blurry}%'
</if>
<if test="config.workshop_code != null">
AND sc.workshop_code = config.workshop_code
AND sc.workshop_code = #{config.workshop_code}
</if>
</select>
</mapper>

15
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dto/SchBaseTaskQuery.java
View File

@@ -1,12 +1,25 @@
package org.nl.wms.sch.task.service.dto;
import lombok.Data;
import org.nl.common.domain.query.BaseQuery;
import org.nl.wms.sch.task.service.dao.SchBaseTask;
import java.io.Serializable;
/**
* @author lyd
* @date 2023-05-15
**/
public class SchBaseTaskQuery extends BaseQuery<SchBaseTask> {
@Data
public class SchBaseTaskQuery implements Serializable {
private String task_code;
private String vehicle_code;
private String point_code;
private String begin_time;
private String end_time;
private String more_task_status;
private String unFinished;
private String config_code;
}

66
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
View File

@@ -20,6 +20,7 @@ import org.nl.wms.sch.task.service.ISchBaseTaskService;
import org.nl.wms.sch.task.service.dao.SchBaseTask;
import org.nl.wms.sch.task.service.dao.mapper.SchBaseTaskMapper;
import org.nl.wms.sch.task.service.dao.mapper.SchBaseTaskconfigMapper;
import org.nl.wms.sch.task.service.dto.SchBaseTaskQuery;
import org.nl.wms.sch.task_manage.AbstractTask;
import org.nl.wms.sch.task_manage.task.TaskFactory;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
@@ -50,40 +51,51 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
private TaskFactory taskFactory;
@Override
public IPage<SchBaseTask> queryAll(Map whereJson, PageQuery page) {
String task_code = ObjectUtil.isNotEmpty(whereJson.get("task_code"))
? whereJson.get("task_code").toString() : null;
String vehicle_code = ObjectUtil.isNotEmpty(whereJson.get("vehicle_code"))
? whereJson.get("vehicle_code").toString() : null;
String point_code = ObjectUtil.isNotEmpty(whereJson.get("point_code"))
? whereJson.get("point_code").toString() : null;
String begin_time = ObjectUtil.isNotEmpty(whereJson.get("begin_time"))
? whereJson.get("begin_time").toString() : null;
String end_time = ObjectUtil.isNotEmpty(whereJson.get("end_time"))
? whereJson.get("end_time").toString() : null;
String more_task_status = ObjectUtil.isNotEmpty(whereJson.get("more_task_status"))
? whereJson.get("more_task_status").toString() : null;
List<String> collect = ObjectUtil.isNotEmpty(more_task_status)
? Arrays.stream(more_task_status.split(",")).collect(Collectors.toList()) : null;
String unFinished = null;
public IPage<SchBaseTask> queryAll(SchBaseTaskQuery whereJson, PageQuery page) {
List<String> collect = ObjectUtil.isNotEmpty(whereJson.getMore_task_status())
? Arrays.stream(whereJson.getMore_task_status().split(",")).collect(Collectors.toList()) : null;
if (collect != null) {
if (collect.contains(TaskStatus.UNFINISHED.getCode())) {
collect = null;
unFinished = TaskStatus.EXECUTING.getCode();
whereJson.setUnFinished(TaskStatus.EXECUTING.getCode());
}
}
LambdaQueryWrapper<SchBaseTask> lam = new LambdaQueryWrapper<>();
lam.eq(ObjectUtil.isNotEmpty(task_code), SchBaseTask::getTask_code, task_code)
.eq(ObjectUtil.isNotEmpty(vehicle_code), SchBaseTask::getVehicle_code, vehicle_code)
.eq(ObjectUtil.isNotEmpty(point_code), SchBaseTask::getPoint_code1, point_code)
.ge(ObjectUtil.isNotEmpty(begin_time), SchBaseTask::getCreate_time, begin_time)
.le(ObjectUtil.isNotEmpty(end_time), SchBaseTask::getCreate_time, end_time)
.in(ObjectUtil.isNotEmpty(collect), SchBaseTask::getTask_status, collect)
.le(ObjectUtil.isNotEmpty(unFinished), SchBaseTask::getTask_status, unFinished)
.orderByDesc(SchBaseTask::getUpdate_time);
IPage<SchBaseTask> pages = new Page<>(page.getPage() + 1, page.getSize());
schBaseTaskMapper.selectPage(pages, lam);
pages = schBaseTaskMapper.selectPageLeftJoin(pages, whereJson, collect);
return pages;
// String task_code = ObjectUtil.isNotEmpty(whereJson.get("task_code"))
// ? whereJson.get("task_code").toString() : null;
// String vehicle_code = ObjectUtil.isNotEmpty(whereJson.get("vehicle_code"))
// ? whereJson.get("vehicle_code").toString() : null;
// String point_code = ObjectUtil.isNotEmpty(whereJson.get("point_code"))
// ? whereJson.get("point_code").toString() : null;
// String begin_time = ObjectUtil.isNotEmpty(whereJson.get("begin_time"))
// ? whereJson.get("begin_time").toString() : null;
// String end_time = ObjectUtil.isNotEmpty(whereJson.get("end_time"))
// ? whereJson.get("end_time").toString() : null;
// String more_task_status = ObjectUtil.isNotEmpty(whereJson.get("more_task_status"))
// ? whereJson.get("more_task_status").toString() : null;
// List<String> collect = ObjectUtil.isNotEmpty(more_task_status)
// ? Arrays.stream(more_task_status.split(",")).collect(Collectors.toList()) : null;
// String unFinished = null;
// if (collect != null) {
// if (collect.contains(TaskStatus.UNFINISHED.getCode())) {
// collect = null;
// unFinished = TaskStatus.EXECUTING.getCode();
// }
// }
// LambdaQueryWrapper<SchBaseTask> lam = new LambdaQueryWrapper<>();
// lam.eq(ObjectUtil.isNotEmpty(task_code), SchBaseTask::getTask_code, task_code)
// .eq(ObjectUtil.isNotEmpty(vehicle_code), SchBaseTask::getVehicle_code, vehicle_code)
// .eq(ObjectUtil.isNotEmpty(point_code), SchBaseTask::getPoint_code1, point_code)
// .ge(ObjectUtil.isNotEmpty(begin_time), SchBaseTask::getCreate_time, begin_time)
// .le(ObjectUtil.isNotEmpty(end_time), SchBaseTask::getCreate_time, end_time)
// .in(ObjectUtil.isNotEmpty(collect), SchBaseTask::getTask_status, collect)
// .le(ObjectUtil.isNotEmpty(unFinished), SchBaseTask::getTask_status, unFinished)
// .orderByDesc(SchBaseTask::getUpdate_time);
// IPage<SchBaseTask> pages = new Page<>(page.getPage() + 1, page.getSize());
// schBaseTaskMapper.selectPage(pages, lam);
// return pages;
}

45
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
View File

@@ -144,6 +144,8 @@ public abstract class AbstractTask {
.eq(SchBaseTaskconfig::getConfig_code, config_code));
taskDto.setPriority(taskConfig.getPriority());
taskDto.setTask_type(taskConfig.getAcs_task_type());
taskDto.setProduct_area(taskConfig.getWorkshop_code());
taskDto.setAgv_system_type(taskConfig.getAgv_system_type());
taskDto.setRoute_plan_code(taskConfig.getRoute_plan_code());
return taskDto;
}
@@ -214,15 +216,6 @@ public abstract class AbstractTask {
}
/**
* 首先组盘在下发任务
*
* @param param 具体参数
*/
public String setGroupPlate(JSONObject param) {
return "";
}
/**
* 下发前的处理，可以根据任务类进行给acs任务类更新数据
* @param task LMS任务
@@ -259,22 +252,31 @@ public abstract class AbstractTask {
// 申请任务
SchBaseTask task = new SchBaseTask();
// 请求点
String apply_point_code = param.getString("device_code");
String applyPointCode = param.getString("device_code");
String requestNo = param.getString("requestNo");
String config_code = param.getString("config_code");
String configCode = param.getString("config_code");
// 1、校验数据
SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
.eq(SchBaseTaskconfig::getConfig_code, config_code));
Assert.notNull(taskConfig, "找不到配置文件，请确认[" + config_code + "]配置是否存在！");
.eq(SchBaseTaskconfig::getConfig_code, configCode));
Assert.notNull(taskConfig, "找不到配置文件，请确认[" + configCode + "]配置是否存在！");
// 最大任务数
Integer tcmn = taskConfig.getTask_create_max_num();
// 获取执行中的任务
List<SchBaseTask> unFinishTasksByTaskConfig = taskService.findUnFinishTasksByTaskConfig(
taskConfig.getConfig_code(), apply_point_code, taskConfig.getTask_direction());
// 获取执行中的任务（由配置文件设置，一般是最大值）
List<SchBaseTask> unFinishTasksByTaskConfig = taskService.findUnFinishTasksByTaskConfig(
taskConfig.getConfig_code(), taskConfig.getTask_direction());
Assert.isFalse(unFinishTasksByTaskConfig.size() >= tcmn,
apply_point_code + "该点位申请的任务未完成数已超过上限，无法申请任务");
applyPointCode + "该点位申请的任务未完成数已超过上限，无法申请任务");
// 校验同个点位,同种任务是否多次请求创建任务（固定只能1个任务）
List<SchBaseTask> applyPointTask = taskService.findUnFinishTasksByTaskConfig(
taskConfig.getConfig_code(), applyPointCode, taskConfig.getTask_direction());
if (applyPointTask.size() == 1) {
throw new BadRequestException("点位[ " + applyPointCode + "] 已经创建过任务");
}
String vehicleType = param.getString("vehicle_type");
String vehicleCode = TaskUtils.defaultVehicleCode(param.getString("vehicle_code"));
AbstractTask bean = SpringContextHolder.getBean(this.getClass());
@@ -283,31 +285,30 @@ public abstract class AbstractTask {
task.setAcs_trace_id(requestNo);
task.setTask_id(IdUtil.getSnowflake(1, 1).nextIdStr());
task.setTask_code(IdUtil.getSnowflake(1, 1).nextIdStr());
task.setConfig_code(config_code);
task.setConfig_code(configCode);
// todo
task.setCreate_mode(ObjectUtil.isNotEmpty(param.getString("create_mode"))
? param.getString("create_mode") : GeneralDefinition.ACS_CREATION);
task.setVehicle_code(vehicleCode);
task.setVehicle_qty(param.getInteger("vehicle_qty"));
task.setVehicle_type(vehicleType);
task.setTask_status(TaskStatus.APPLY.getCode());
task.setProduct_area(param.getString("product_area"));
// 设置起/终点
task.setPoint_code1(param.getString("point_code1"));
task.setPoint_code2(param.getString("point_code2"));
task.setPoint_code3(param.getString("point_code3"));
task.setPoint_code4(param.getString("point_code4"));
// 将所有参数存到表中，后续需要可以提取
task.setRequest_param(JSONObject.toJSONString(param));
// 设置创建人信息
TaskUtils.setCreateByAcsOrPda(task, param);
// 3、判断是否直接找点下发
// 立即创建吧组盘放到具体位置，免得重复创建
if (taskConfig.getIs_immediate_create()) {
bean.createCompletion(task);
} else {
// 不需要立即创建
// 设置组盘 - 需要的话由子类自行实现
// todo: 如果不需要这种场景，可以换成其他使用场景，目的是由策略角色去完善对此字段赋值
task.setGroup_id(bean.setGroupPlate(param));
// 创建一条单点任务。
taskService.save(task);
bean.create();

28
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/GeneralDefinition.java
View File

@@ -8,19 +8,11 @@ package org.nl.wms.sch.task_manage;
public class GeneralDefinition {
/** 未知 */
public static final String UNKNOWN = "-";
// 统一编码定义
/** 窑自动任务开启 */
public static final String AUTO_KILN_CALL = "auto_kiln_call";
// 是否
/**是/正确/可用... */
public static final String YES = "1";
/** 否/错误/不可用... */
public static final String NO = "0";
// 载具类型
/** 料盅 */
public static final String MATERIAL_CUP = "LZ";
/** 钢托盘 */
public static final String STEEL_TRAY = "GTP";
// 账号定义
/** acs系统 */
public static final String ACS_ID = "2";
@@ -30,16 +22,6 @@ public class GeneralDefinition {
public static final String MES_ID = "3";
/** mes系统 */
public static final String MES_NAME = "MES系统";
// 点位类型
/** 设备位 */
public static final String DEVICE_POINT = "1";
/** 对接位 */
public static final String DOCKING_POINT = "2";
// 出入口
/**入口**/
public static final String ENTRANCE = "1";
/**出口**/
public static final String EXIT = "2";
// 任务生产方式
/**自动创建**/
public static final String AUTO_CREATION = "1";
@@ -54,16 +36,6 @@ public class GeneralDefinition {
public static final String MES_LMS = "3";
/**LMS->MES**/
public static final String LMS_MES = "4";
// 区域定义
/** 料盅睏料线区域 */
public static final String LZKLX = "LZKLX";
/** 干燥窑区域 */
public static final String GZY = "GZY";
// 特殊: 1-缓存输送线入口，2-缓存输送线出口，3-上输送线，4-下输送线
/** 上输送线 */
public static final String UPPER_CONVEYOR_LINE = "3";
/** 下输送线 */
public static final String LOWER_CONVEYOR_LINE = "4";
// 参数名称
/** 是否连接 */
public static final String IS_CONNECT_ACS = "is_connect_acs";

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/CallEmpReelTask.java
View File

@@ -18,7 +18,6 @@ import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.storage_manage.ios.enums.IOSEnum;
import org.nl.wms.util.TaskUtils;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
@@ -48,13 +47,11 @@ public class CallEmpReelTask extends AbstractTask {
public void deliveryBeforeProcessing(SchBaseTask task, AcsTaskDto acsTaskDto) {
acsTaskDto.setDtl_type(task.getDtl_type());
acsTaskDto.setTruss_type(PackageInfoIvtEnum.TRUSS_TYPE.code("点对点任务"));
acsTaskDto.setAgv_system_type(PackageInfoIvtEnum.AGV_SYSTEM_TYPE.code("1楼叉车系统"));
acsTaskDto.setParams(JSON.parseObject(task.getRequest_param(),
new TypeReference<Map<String, String>>() {}));
}
@Override
@Transactional(rollbackFor = Exception.class)
public void create() throws BadRequestException {
}
@@ -115,11 +112,9 @@ public class CallEmpReelTask extends AbstractTask {
task.setTask_code(IdUtil.getSnowflake(1,1).nextIdStr());
task.setHandle_class(THIS_CLASS);
task.setIs_send(isSend ? "1" : "0");
task.setAcs_task_type(StrUtil.isEmpty(task.getAcs_task_type())
? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : (task.getAcs_task_type()));
task.setTask_status(StrUtil.isEmpty(task.getTask_status())
? TaskStatus.START_AND_POINT.getCode() : task.getTask_status());
task.setProduct_area(StrUtil.isEmpty(task.getProduct_area()) ? "A1" : task.getProduct_area());
task.setWorkshop_code(StrUtil.isEmpty(task.getWorkshop_code()) ? "A1" : task.getWorkshop_code());
TaskUtils.setCreateByDefault(task);
taskService.save(task);
//如果目标点位没有空位先创建不下发

8
lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
View File

@@ -49,7 +49,13 @@ https://juejin.cn/post/6844903775631572999
</encoder>
</appender>
<appender name="luceneAppender" class="org.nl.config.lucene.LuceneAppender" />
<appender name="luceneAppender" class="org.nl.config.lucene.LuceneAppender" >
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>INFO</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<appender name="asyncLuceneAppender" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="luceneAppender" />
<!-- 设置队列大小 -->

10
lms/nladmin-ui/src/i18n/langs/chinese.js
View File

@@ -18,6 +18,10 @@ import online from './online/zh'
import classification from './baseclass/zh'
import role from './role/zh'
import corn from './scheduling/corn/zh'
import taskConfig from './task/config/zh'
import task from './task/zh'
import point from './point/zh'
import region from './region/zh'
export default {
...zhLocale,
@@ -39,5 +43,9 @@ export default {
...online,
...classification,
...role,
...corn
...corn,
...taskConfig,
...task,
...point,
...region
}

10
lms/nladmin-ui/src/i18n/langs/english.js
View File

@@ -18,6 +18,10 @@ import online from './online/en'
import classification from './baseclass/en'
import role from './role/en'
import corn from './scheduling/corn/en'
import taskConfig from './task/config/en'
import task from './task/en'
import point from './point/en'
import region from './region/en'
export default {
...enLocale,
@@ -39,5 +43,9 @@ export default {
...online,
...classification,
...role,
...corn
...corn,
...taskConfig,
...task,
...point,
...region
}

10
lms/nladmin-ui/src/i18n/langs/indonesian.js
View File

@@ -18,6 +18,10 @@ import online from './online/in'
import classification from './baseclass/in'
import role from './role/in'
import corn from './scheduling/corn/in'
import taskConfig from './task/config/in'
import task from './task/in'
import point from './point/in'
import region from './region/in'
export default {
...idLocale,
@@ -39,5 +43,9 @@ export default {
...online,
...classification,
...role,
...corn
...corn,
...taskConfig,
...task,
...point,
...region
}

68
lms/nladmin-ui/src/i18n/langs/point/en.js Normal file
View File

@@ -0,0 +1,68 @@
export default {
'Point': {
'table': {
'workshop_code': 'WorkShop Code',
'point_code': 'Point Code',
'point_name': 'Point Name',
'region_code': 'Region Code',
'region_name': 'Region Name',
'point_type': 'Point Type',
'point_status': 'Point Status',
'vehicle_type': 'Vehicle Type',
'vehicle_code': 'Vehicle Code',
'vehicle_qty': 'Vehicle Quantity',
'lock_type': 'Lock Type',
'parent_point_code': 'Parent Point Code',
'ing_task_code': 'Ing Task Code',
'is_has_workder': 'Workder',
'is_auto': 'Auto',
'is_used': 'Enable',
'remark': 'Remark',
'create_name': 'Create Name',
'create_time': 'Create Time',
'update_name': 'Update Name',
'update_time': 'Update Time'
},
'dialog': {
'workshop_code': '所属车间',
'point_code': '点位编码',
'point_name': '点位名称',
'region_code': '区域编码',
'region_name': '区域名称',
'point_type': '点位类型',
'point_status': '点位状态',
'vehicle_type': '载具类型',
'vehicle_code': '载具编码',
'vehicle_qty': '载具数量',
'lock_type': '锁定类型',
'parent_point_code': '父点位编码',
'ing_task_code': '在执行的任务标识',
'is_has_workder': '是否有工单',
'is_auto': '是否自动',
'is_used': '是否启用',
'remark': '备注',
'create_name': '创建人',
'create_time': '创建时间',
'update_name': '修改人',
'update_time': '修改时间'
},
'search': {
'workshop_code': 'workshop code',
'blurry': 'fuzzy search',
'p1': 'coded name',
'region_code': 'region code',
'point_type': 'point type',
'point_status': 'point status',
'lock_type': 'lock type',
'is_used': 'enable',
'disable': 'Disable',
'enable': 'Enable'
},
'rules': {
'r1': 'Point codes cannot be empty',
'r2': 'The point name cannot be empty',
'r3': 'The point type cannot be empty',
'r4': 'The area type cannot be empty'
}
}
}

45
lms/nladmin-ui/src/i18n/langs/point/in.js Normal file
View File

@@ -0,0 +1,45 @@
export default {
'Point': {
'table': {
'workshop_code': 'Kode Workshop',
'point_code': 'Kode Titik',
'point_name': 'Nama Titik',
'region_code': 'Kode Wilayah',
'region_name': 'Nama Wilayah',
'point_type': 'Jenis Titik',
'point_status': 'Status Titik',
'vehicle_type': 'Jenis Kendaraan',
'vehicle_code': 'Kode Kendaraan',
'vehicle_qty': 'Jumlah Kendaraan',
'lock_type': 'Jenis Kunci',
'parent_point_code': 'Kode Titik Induk',
'ing_task_code': 'Ing Kode Tugas',
'is_has_workder': 'Pekerja',
'is_auto': 'Otomatis',
'is_used': 'Memungkinkan',
'remark': 'Komentar',
'create_name': 'Buat Nama',
'create_time': 'Buat Waktu',
'update_name': 'Perbarui Nama',
'update_time': 'Waktu Pembaruan'
},
'search': {
'workshop_code': 'kode workshop',
'blurry': 'pencarian kabur',
'p1': 'nama berkode',
'region_code': 'kode wilayah',
'point_type': 'tipe titik',
'point_status': 'status poin',
'lock_type': 'jenis kunci',
'is_used': 'memungkinkan',
'disable': 'Cacat',
'enable': 'Memungkinkan'
},
'rules': {
'r1': 'Kode poin tidak boleh kosong',
'r2': 'Nama titik tidak boleh kosong',
'r3': 'Jenis titik tidak boleh kosong',
'r4': 'Tipe area tidak boleh kosong'
}
}
}

61
lms/nladmin-ui/src/i18n/langs/point/zh.js Normal file
View File

@@ -0,0 +1,61 @@
export default {
'Point': {
'table': {
'workshop_code': '所属车间',
'point_code': '点位编码',
'point_name': '点位名称',
'region_code': '区域编码',
'region_name': '区域名称',
'point_type': '点位类型',
'point_status': '点位状态',
'vehicle_type': '载具类型',
'vehicle_code': '载具编码',
'vehicle_qty': '载具数量',
'lock_type': '锁定类型',
'parent_point_code': '父点位编码',
'ing_task_code': '在执行的任务标识',
'is_has_workder': '是否有工单',
'is_auto': '是否自动',
'is_used': '是否启用',
'remark': '备注',
'create_name': '创建人',
'create_time': '创建时间',
'update_name': '修改人',
'update_time': '修改时间'
},
'dialog': {
'workshop_code': '所属车间',
'point_code': '点位编码',
'point_name': '点位名称',
'region_code': '所属区域',
'point_type': '点位类型',
'point_status': '点位状态',
'vehicle_type': '载具类型',
'vehicle_code': '载具编码',
'vehicle_qty': '载具数量',
'can_vehicle_type': '可放载具类型',
'parent_point_code': '父点位编码',
'is_has_workder': '是否有工单',
'is_auto': '是否自动',
'remark': '备注'
},
'search': {
'workshop_code': '所属车间',
'blurry': '模糊搜索',
'p1': '编码名称',
'region_code': '区域类型',
'point_type': '点位类型',
'point_status': '点位状态',
'lock_type': '锁定类型',
'is_used': '是否启用',
'disable': '禁用',
'enable': '启用'
},
'rules': {
'r1': '点位编码不能为空',
'r2': '点位名称不能为空',
'r3': '点位类型不能为空',
'r4': '区域类型不能为空'
}
}
}

13
lms/nladmin-ui/src/i18n/langs/region/en.js Normal file
View File

@@ -0,0 +1,13 @@
export default {
'Region': {
'table': {
'code': 'code',
'name': 'name',
'values': 'value',
'description': 'remark'
},
'rules': {
'NotNull': 'Cannot be empty'
}
}
}

13
lms/nladmin-ui/src/i18n/langs/region/in.js Normal file
View File

@@ -0,0 +1,13 @@
export default {
'Region': {
'table': {
'code': 'kode',
'name': 'nama',
'values': 'nilai',
'description': 'Catatan'
},
'rules': {
'NotNull': 'Tidak dapat kosong'
}
}
}

13
lms/nladmin-ui/src/i18n/langs/region/zh.js Normal file
View File

@@ -0,0 +1,13 @@
export default {
'Region': {
'table': {
'code': '编码',
'name': '名称',
'values': '值',
'description': '备注'
},
'rules': {
'NotNull': '不能为空'
}
}
}

55
lms/nladmin-ui/src/i18n/langs/task/config/en.js Normal file
View File

@@ -0,0 +1,55 @@
export default {
'TaskConfig': {
'table': {
'code': 'Config Code',
'name': 'Config Name',
'acs_task_type': 'ACS Task Type',
'agv_system_type': 'AGV System Type',
'task_name': 'Task Name',
'task_type_name': 'Task Type Name',
'priority': 'Priority',
'task_create_max_num': 'MaxTaskGenCount',
'task_issue_max_num': 'MaxTaskIssueCount',
'is_immediate_create': 'Immediate Create',
'is_auto_issue': 'Auto Issue',
'start_point_pre': 'Start Pre',
'next_region_pre': 'End Pre',
'workshop_code': 'Product Area',
'remark': 'Remark',
'create_name': 'Create Name',
'create_time': 'Create Time',
'update_name': 'Update Name',
'update_time': 'Update Time'
},
'dialog': {
'workshop_code': 'workshop code',
'code': 'config code',
'name': 'config name',
'acs_task_type': 'ACS task type',
'agv_system_type': 'AGV system type',
'task_name': 'task name',
'task_type_name': 'task type name',
'priority': 'priority',
'task_create_max_num': 'maxTaskGenCount',
'task_issue_max_num': 'maxTaskIssueCount',
'is_immediate_create': 'immediate create',
'is_auto_issue': 'auto issue',
'start_point_pre': 'start pre',
'next_region_pre': 'end pre',
'remark': 'remark'
},
'placeholder': {
'search': 'Please enter a configuration name',
'blurry': 'fuzzy search'
},
'rules': {
'r1': 'Please enter the ACS type',
'r2': 'Please enter the maximum number of task generation',
'r3': 'Enter the maximum number of tasks to be delivered'
},
'tooltips': {
't1': 'Used when creating a task',
't2': 'Number of tasks that can be triggered by the same configuration'
}
}
}

55
lms/nladmin-ui/src/i18n/langs/task/config/in.js Normal file
View File

@@ -0,0 +1,55 @@
export default {
'TaskConfig': {
'table': {
'code': 'Kode Konfigurasi',
'name': 'Nama Konfigurasi',
'acs_task_type': 'ACS Jenis Tugas',
'agv_system_type': 'AGV Tipe sistem',
'task_name': 'Nama tugas',
'task_type_name': 'Nama Jenis Tugas',
'priority': 'Prioritas',
'task_create_max_num': 'MaxTaskGenCount',
'task_issue_max_num': 'MaxTaskIssueCount',
'is_immediate_create': 'Segera Buat',
'is_auto_issue': 'Masalah Otomatis',
'start_point_pre': 'Awalan Titik Awal',
'next_region_pre': 'Awalan Akhir',
'workshop_code': 'Area Produk',
'remark': 'Komentar',
'create_name': 'Buat Nama',
'create_time': 'Ciptakan Waktu',
'update_name': 'Perbarui Nama',
'update_time': 'Perbarui Waktu'
},
'dialog': {
'workshop_code': 'kode workshop',
'code': 'kode konfigurasi',
'name': 'nama konfigurasi',
'acs_task_type': 'ACS jenis tugas',
'agv_system_type': 'AGV tipe sistem',
'task_name': 'nama tugas',
'task_type_name': 'nama jenis tugas',
'priority': 'prioritas',
'task_create_max_num': 'maxTaskGenCount',
'task_issue_max_num': 'maxTaskIssueCount',
'is_immediate_create': 'segera buat',
'is_auto_issue': 'masalah otomatis',
'start_point_pre': 'awalan titik awal',
'next_region_pre': 'awalan akhir',
'remark': 'komentar'
},
'placeholder': {
'search': 'Silakan masukkan nama konfigurasi',
'blurry': 'pencarian fuzzy'
},
'rules': {
'r1': 'Silakan masukkan jenis ACS',
'r2': 'Silakan masukkan jumlah maksimum pembuatan tugas',
'r3': 'Masukkan jumlah maksimum tugas yang akan diserahkan'
},
'tooltips': {
't1': 'Digunakan saat membuat tugas',
't2': 'Jumlah tugas yang dapat dipicu oleh konfigurasi yang sama'
}
}
}

55
lms/nladmin-ui/src/i18n/langs/task/config/zh.js Normal file
View File

@@ -0,0 +1,55 @@
export default {
'TaskConfig': {
'table': {
'code': '配置编码',
'name': '配置名称',
'acs_task_type': 'ACS任务类型',
'agv_system_type': 'AGV系统类型',
'task_name': '任务名字',
'task_type_name': '任务类型',
'priority': '优先级',
'task_create_max_num': '任务生成数上限',
'task_issue_max_num': '任务下发数上限',
'is_immediate_create': '是否立即创建',
'is_auto_issue': '是否自动下发',
'start_point_pre': '起点前缀',
'next_region_pre': '终点前缀',
'workshop_code': '车间编码',
'remark': '备注',
'create_name': '创建人',
'create_time': '创建时间',
'update_name': '修改人',
'update_time': '修改时间'
},
'dialog': {
'workshop_code': '所属区域',
'code': '配置编码',
'name': '配置名称',
'acs_task_type': 'ACS任务类型',
'agv_system_type': 'AGV系统类型',
'task_name': '任务名字',
'task_type_name': '任务类型',
'priority': '优先级',
'task_create_max_num': '任务生成数上限',
'task_issue_max_num': '任务下发数上限',
'is_immediate_create': '是否立即创建',
'is_auto_issue': '是否自动下发',
'start_point_pre': '起点前缀',
'next_region_pre': '终点前缀',
'remark': '备注'
},
'placeholder': {
'search': '请输入配置名称',
'blurry': '模糊搜索'
},
'rules': {
'r1': '请输入acs类型',
'r2': '请输入最大任务生成数',
'r3': '请输入最大任务下发数',
},
'tooltips': {
't1': '创建任务时使用',
't2': '同个配置同时能触发的任务数量'
}
}
}

50
lms/nladmin-ui/src/i18n/langs/task/en.js Normal file
View File

@@ -0,0 +1,50 @@
export default {
'Task': {
'search': {
'task_code': 'task code',
'vehicle_code': 'vehicle code',
'point_code': 'point code',
'createTime': 'create time',
'createTime_': 'to',
'createTime_1': 'start date',
'createTime_2': 'end date',
'task_status': 'task status',
'p1': 'Please enter task code',
'p2': 'Please enter vehicle code',
'p3': 'Start/End'
},
'table': {
'code': 'Task Code',
'vehicle_code': 'Vehicle Code',
'vehicle_code2': 'Vehicle Code2',
'task_status': 'Task Status',
'remark': 'Remark',
'config_code': 'Config Code',
'point_code1': 'Start Point1',
'point_code2': 'End Point1',
'point_code3': 'Start Point2',
'point_code4': 'End Point2',
'vehicle_type': 'Vehicle Type',
'vehicle_qty': 'Vehicle Quantity',
'priority': 'Priority',
'acs_task_type': 'ACS Task Type',
'agv_system_type': 'AGV System Type',
'handle_class': 'Handle Class',
'finished_type': 'Finished Type',
'create_mode': 'Create Mode',
'acs_trace_id': 'Acs Trace Id',
'request_param': 'Request Param',
'response_param': 'Response Param',
'workshop_code': 'Workshop Code',
'create_name': 'Create Name',
'create_time': 'Create Time',
'update_name': 'Update Name',
'update_time': 'Update Time',
'complete': 'Complete',
'uncompleted': 'uncompleted'
},
'rules': {
'NotNull': 'Cannot be empty'
}
}
}

50
lms/nladmin-ui/src/i18n/langs/task/in.js Normal file
View File

@@ -0,0 +1,50 @@
export default {
'Task': {
'search': {
'task_code': 'kode tugas',
'vehicle_code': 'kode kendaraan',
'point_code': 'kode titik',
'createTime': 'buat waktu',
'createTime_': 'ke',
'createTime_1': 'tanggal mulai',
'createTime_2': 'tanggal akhir',
'task_status': 'status tugas',
'p1': 'Silakan masukkan kode tugas',
'p2': 'Silakan masukkan kode kendaraan',
'p3': 'Awal/Akhir'
},
'table': {
'code': 'Kode Tugas',
'vehicle_code': 'Kode Kendaraan',
'vehicle_code2': 'Kode Kendaraan2',
'task_status': 'Status Tugas',
'remark': 'Komentar',
'config_code': 'Kode Konfigurasi',
'point_code1': 'Titik Awal1',
'point_code2': 'Titik Akhir2',
'point_code3': 'Titik Awal2',
'point_code4': 'Titik Akhir2',
'vehicle_type': 'Jenis Kendaraan',
'vehicle_qty': 'Jumlah Kendaraan',
'priority': 'Prioritas',
'acs_task_type': 'Jenis Tugas ACS',
'agv_system_type': 'Jenis Sistem AGV',
'handle_class': 'Menangani Kelas',
'finished_type': 'Jenis Selesai',
'create_mode': 'Buat Mode',
'acs_trace_id': 'Id Jejak Acs',
'request_param': 'Param Permintaan',
'response_param': 'Param Respon',
'workshop_code': 'Kode Bengkel',
'create_name': 'Buat Nama',
'create_time': 'Buat Waktu',
'update_name': 'Perbarui Nama',
'update_time': 'Waktu Pembaruan',
'complete': 'Menyelesaikan',
'uncompleted': 'belum selesai'
},
'rules': {
'NotNull': 'Tidak dapat kosong'
}
}
}

50
lms/nladmin-ui/src/i18n/langs/task/zh.js Normal file
View File

@@ -0,0 +1,50 @@
export default {
'Task': {
'search': {
'task_code': '任务号',
'vehicle_code': '载具号',
'point_code': '点位编码',
'createTime': '创建时间',
'createTime_': '至',
'createTime_1': '开始日期',
'createTime_2': '结束日期',
'task_status': '任务状态',
'p1': '请输入任务号',
'p2': '请输入载具号',
'p3': '起点/终点'
},
'table': {
'code': '任务编码',
'vehicle_code': '载具编码1',
'vehicle_code2': '载具编码2',
'task_status': '任务状态',
'remark': '提示信息',
'config_code': '配置编码',
'point_code1': '起点1',
'point_code2': '终点1',
'point_code3': '起点2',
'point_code4': '终点2',
'vehicle_type': '载具类型',
'vehicle_qty': '载具数量',
'priority': '优先级',
'acs_task_type': 'ACS任务类型',
'agv_system_type': 'AGV系统类型',
'handle_class': '处理类',
'finished_type': '任务完成类型',
'create_mode': '生成方式',
'acs_trace_id': '链路标识',
'request_param': '生成任务的请求参数',
'response_param': '下发任务的请求参数',
'workshop_code': '车间编码',
'create_name': '创建人',
'create_time': '创建时间',
'update_name': '修改人',
'update_time': '修改时间',
'complete': '完成',
'uncompleted': '未完成'
},
'rules': {
'NotNull': '不能为空'
}
}
}

239
lms/nladmin-ui/src/views/wms/sch/point/index.vue
View File

@@ -7,15 +7,15 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="90px"
:label-width="computedSearchLabelWidth"
label-suffix=":"
>
<el-form-item label="所属车间">
<el-form-item :label="$t('Point.search.workshop_code')">
<el-select
v-model="query.workshop_code"
clearable
size="mini"
placeholder="所属车间"
:placeholder="$t('Point.search.workshop_code')"
class="filter-item"
>
<el-option
@@ -25,24 +25,24 @@
/>
</el-select>
</el-form-item>
<el-form-item label="模糊搜索">
<el-form-item :label="$t('Point.search.blurry')">
<el-input
v-model="query.blurry"
clearable
size="mini"
placeholder="编码名称"
:placeholder="$t('Point.search.p1')"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="区域类型">
<el-form-item :label="$t('Point.search.region_code')">
<el-select
v-model="query.region_code"
@clear="handleClear"
clearable
filterable
size="mini"
placeholder="区域类型"
:placeholder="$t('Point.search.region_code')"
class="filter-item"
@clear="handleClear"
@change="getPointStatusAndTypeList(query.region_code, 1)"
>
<el-option
@@ -52,12 +52,12 @@
/>
</el-select>
</el-form-item>
<el-form-item label="点位类型">
<el-form-item :label="$t('Point.search.point_type')">
<el-select
v-model="query.point_type"
clearable
size="mini"
placeholder="点位类型"
:placeholder="$t('Point.search.point_type')"
class="filter-item"
@change="hand"
>
@@ -68,13 +68,13 @@
/>
</el-select>
</el-form-item>
<el-form-item label="点位状态">
<el-form-item :label="$t('Point.search.point_status')">
<el-select
v-model="query.point_status"
clearable
filterable
size="mini"
placeholder="点位状态"
:placeholder="$t('Point.search.point_status')"
class="filter-item"
@change="hand"
>
@@ -85,17 +85,24 @@
/>
</el-select>
</el-form-item>
<el-form-item label="锁定类型">
<el-switch
<el-form-item :label="$t('Point.search.lock_type')">
<el-select
v-model="query.lock_type"
:active-value="true"
:inactive-value="false"
active-color="#409EFF"
inactive-color="#C0CCDA"
clearable
filterable
size="mini"
:placeholder="$t('Point.search.lock_type')"
class="filter-item"
@change="hand"
/>
>
<el-option
v-for="item in dict.d_lock_type"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="是否启用">
<el-form-item :label="$t('Point.search.is_used')">
<el-switch
v-model="query.is_used"
active-value="true"
@@ -109,7 +116,7 @@
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" >
<crudOperation :permission="permission">
<el-button
v-if="crud.query.is_used == 'false'"
slot="right"
@@ -120,7 +127,7 @@
:disabled="crud.selections.length === 0"
@click="changeUsed(crud.selections, true)"
>
启用
{{ $t('Point.search.enable') }}
</el-button>
<el-button
v-if="crud.query.is_used == 'true'"
@@ -132,10 +139,10 @@
:disabled="crud.selections.length === 0"
@click="changeUsed(crud.selections, false)"
>
禁用
{{ $t('Point.search.disable') }}
</el-button>
<el-button
v-if="!crud.query.lock_type"
v-if="false"
slot="right"
class="filter-item"
size="mini"
@@ -147,7 +154,7 @@
锁定
</el-button>
<el-button
v-if="crud.query.lock_type"
v-if="false"
slot="right"
class="filter-item"
size="mini"
@@ -230,7 +237,7 @@
</el-select>
</el-form-item>
<el-form-item label="父类编码" prop="vehicle_code">
<el-input v-model="form.parent_point_code" clearable style="width: 370px;" @focus="getParentPoint"/>
<el-input v-model="form.parent_point_code" clearable style="width: 370px;" @focus="getParentPoint" />
</el-form-item>
<el-form-item v-if="form.point_status !== '1'" label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
@@ -241,8 +248,8 @@
v-for="item in dict.vehicle_type"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="可放载具类型" prop="can_vehicle_types">
@@ -251,12 +258,12 @@
v-for="item in dict.vehicle_type"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="载具数量" prop="vehicle_qty">
<el-input-number style="width: 370px;" :controls="false" class="clear-number-input" v-model="form.vehicle_qty" :min="0" :precision="0" :max="99999" label="载具数量" size="mini" />
<el-input-number v-model="form.vehicle_qty" style="width: 370px;" :controls="false" class="clear-number-input" :min="0" :precision="0" :max="99999" label="载具数量" size="mini" />
</el-form-item>
<el-form-item label="是否有工单">
<el-radio v-for="item in dict.TrueOrFalse" :key="item.id" v-model="form.is_has_workder" :label="item.value">{{ item.label }}</el-radio>
@@ -276,50 +283,131 @@
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
<el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
<el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
<el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')" />
<el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
<el-table-column prop="point_type_name" label="点位类型" :min-width="flexWidth('point_type_name',crud.data,'点位类型')"/>
<el-table-column prop="point_status_name" label="点位状态" :min-width="flexWidth('point_status_name',crud.data,'点位类型')"/>
<!-- <el-table-column prop="point_type" label="点位类型" :min-width="flexWidth('point_type',crud.data,'点位类型')" />-->
<!-- <el-table-column prop="point_status" label="点位状态" :min-width="flexWidth('point_status',crud.data,'点位状态')" />-->
<el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型', 30)">
<el-table-column
prop="workshop_code"
:label="$t('Point.table.workshop_code')"
:min-width="flexWidth('workshop_code',crud.data,$t('Point.table.workshop_code'))"
/>
<el-table-column
prop="point_code"
:label="$t('Point.table.point_code')"
:min-width="flexWidth('point_code',crud.data,$t('Point.table.point_code'))"
/>
<el-table-column
prop="point_name"
:label="$t('Point.table.point_name')"
:min-width="flexWidth('point_name',crud.data,$t('Point.table.point_name'))"
/>
<el-table-column
prop="region_code"
:label="$t('Point.table.region_code')"
:min-width="flexWidth('region_code',crud.data,$t('Point.table.region_code'))"
/>
<el-table-column
prop="region_name"
:label="$t('Point.table.region_name')"
:min-width="flexWidth('region_name',crud.data, $t('Point.table.region_name'))"
/>
<el-table-column
prop="point_type_name"
:label="$t('Point.table.point_type')"
:min-width="flexWidth('point_type_name',crud.data,$t('Point.table.point_type'))"
/>
<el-table-column
prop="point_status_name"
:label="$t('Point.table.point_status')"
:min-width="flexWidth('point_status_name',crud.data,$t('Point.table.point_status'))"
/>
<el-table-column
prop="vehicle_type"
:label="$t('Point.table.vehicle_type')"
:min-width="flexWidth('vehicle_type',crud.data,$t('Point.table.vehicle_type'), 30)"
>
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
<el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')" />
<el-table-column label="是否锁定" :min-width="flexWidth('vehicle_qty',crud.data,'是否锁定')">
<el-table-column
prop="vehicle_code"
:label="$t('Point.table.vehicle_code')"
:min-width="flexWidth('vehicle_code',crud.data,$t('Point.table.vehicle_code'))"
/>
<el-table-column
prop="vehicle_qty"
:label="$t('Point.table.vehicle_qty')"
:min-width="flexWidth('vehicle_qty',crud.data,$t('Point.table.vehicle_qty'))"
/>
<el-table-column
:label="$t('Point.table.lock_type')"
:min-width="flexWidth('lock_type',crud.data,$t('Point.table.lock_type'))"
>
<template slot-scope="scope">
{{scope.row.ing_task_code?'是':'否'}}
{{ dict.label.d_lock_type[scope.row.lock_type] }}
</template>
</el-table-column>
<el-table-column prop="parent_point_code" label="父点位编码" :min-width="flexWidth('parent_point_code',crud.data,'父点位编码')"/>
<el-table-column prop="ing_task_code" label="在执行的任务标识" :min-width="flexWidth('ing_task_code',crud.data,'在执行的任务标识')" />
<el-table-column prop="is_has_workder" label="是否有工单" :min-width="flexWidth('is_has_workder',crud.data,'是否有工单')">
<el-table-column
prop="parent_point_code"
:label="$t('Point.table.parent_point_code')"
:min-width="flexWidth('parent_point_code',crud.data,$t('Point.table.parent_point_code'))"
/>
<el-table-column
prop="ing_task_code"
:label="$t('Point.table.ing_task_code')"
:min-width="flexWidth('ing_task_code',crud.data,$t('Point.table.ing_task_code'))"
/>
<el-table-column
prop="is_has_workder"
:label="$t('Point.table.is_has_workder')"
:min-width="flexWidth('is_has_workder',crud.data,$t('Point.table.is_has_workder'))"
>
<template slot-scope="scope">
{{scope.row.is_has_workder?'是':'否'}}
{{ scope.row.is_has_workder ? $t('common.Yes') : $t('common.No') }}
</template>
</el-table-column>
<el-table-column prop="is_auto" label="是否自动" :min-width="flexWidth('is_auto',crud.data,'是否自动')">
<el-table-column
prop="is_auto"
:label="$t('Point.table.is_auto')"
:min-width="flexWidth('is_auto',crud.data,$t('Point.table.is_auto'))"
>
<template slot-scope="scope">
{{scope.row.is_auto?'是':'否'}}
{{ scope.row.is_auto ? $t('common.Yes') : $t('common.No') }}
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')">
<el-table-column
prop="remark"
:label="$t('Point.table.remark')"
:min-width="flexWidth('remark',crud.data,$t('Point.table.remark'))"
/>
<el-table-column
prop="is_used"
:label="$t('Point.table.is_used')"
:min-width="flexWidth('is_used',crud.data,$t('Point.table.is_used'))"
>
<template slot-scope="scope">
{{scope.row.is_used?'是':'否'}}
{{ scope.row.is_used ? $t('common.Yes') : $t('common.No') }}
</template>
</el-table-column>
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<el-table-column v-permission="[]" label="操作" width="200px" align="center" fixed="right">
<el-table-column
prop="create_name"
:label="$t('Point.table.create_name')"
:min-width="flexWidth('create_name',crud.data,$t('Point.table.create_name'))"
/>
<el-table-column
prop="create_time"
:label="$t('Point.table.create_time')"
:min-width="flexWidth('create_time',crud.data,$t('Point.table.create_time'))"
/>
<el-table-column
prop="update_name"
:label="$t('Point.table.update_name')"
:min-width="flexWidth('update_name',crud.data,$t('Point.table.update_name'))"
/>
<el-table-column
prop="update_time"
:label="$t('Point.table.update_time')"
:min-width="flexWidth('update_time',crud.data,$t('Point.table.update_time'))"
/>
<el-table-column v-permission="[]" :label="$t('common.Operate')" width="180px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
style="display: inline"
@@ -327,7 +415,7 @@
:permission="permission"
/>
<el-button
v-if="showButton(scope.row.point_status)"
v-if="false"
size="mini"
type="text"
icon="el-icon-view"
@@ -341,8 +429,8 @@
<!--分页组件-->
<pagination />
</div>
<ViewDialog ref="viewDialog"/>
<PointDialog :dialog-show.sync="pointDialog" :is-single="false" @tableChanged="tableChanged"/>
<ViewDialog ref="viewDialog" />
<PointDialog :dialog-show.sync="pointDialog" :is-single="false" @tableChanged="tableChanged" />
</div>
</template>
@@ -357,6 +445,7 @@ import pagination from '@crud/Pagination'
import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop'
import ViewDialog from '@/views/wms/sch/point/ViewDialog.vue'
import PointDialog from '@/views/wms/sch/point/PointDialog.vue'
import i18n from "@/i18n";
const defaultForm = {
point_code: null,
@@ -391,7 +480,7 @@ const defaultForm = {
}
export default {
name: 'SchBasePoint',
dicts: ['vehicle_type', 'TrueOrFalse'],
dicts: ['vehicle_type', 'TrueOrFalse', 'd_lock_type'],
components: { PointDialog, ViewDialog, pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
@@ -409,8 +498,7 @@ export default {
reset: true
},
query: {
is_used: 'true',
lock_type: false
is_used: 'true'
}
})
},
@@ -419,16 +507,16 @@ export default {
permission: {},
rules: {
point_code: [
{ required: true, message: '点位编码不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('Point.rules.r1'), trigger: 'blur' }
],
point_name: [
{ required: true, message: '点位名称不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('Point.rules.r2'), trigger: 'blur' }
],
point_type: [
{ required: true, message: '点位类型不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('Point.rules.r3'), trigger: 'blur' }
],
region_code: [
{ required: true, message: '区域类型不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('Point.rules.r4'), trigger: 'blur' }
]
},
workShopList: [],
@@ -440,6 +528,15 @@ export default {
pointDialog: false
}
},
computed: {
computedSearchLabelWidth() {
const item = localStorage.getItem('lang')
if (item === 'zh') {
return `90px`
}
return `150px`
},
},
created() {
this.getWorkShopList()
this.getRegionList()
@@ -503,7 +600,7 @@ export default {
param.data = data
param.used = flag
crudSchBasePoint.changeUsed(param).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.notify(i18n.t('common.Operation_success'), CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
},
@@ -535,7 +632,7 @@ export default {
param.data = data
param.lock_type = this.crud.query.lock_type
crudSchBasePoint.changeLock(param).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.notify(i18n.t('common.Operation_success'), CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
}

394
lms/nladmin-ui/src/views/wms/sch/task/config/index.vue
View File

@@ -5,17 +5,15 @@
<div v-if="crud.props.searchToggle">
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="90px"
label-suffix=":"
>
<el-form-item label="所属车间">
<el-form-item :label="$t('TaskConfig.dialog.workshop_code')">
<el-select
v-model="query.workshop_code"
clearable
size="mini"
placeholder="所属车间"
:placeholder="$t('TaskConfig.dialog.workshop_code')"
class="filter-item"
>
<el-option
@@ -25,12 +23,12 @@
/>
</el-select>
</el-form-item>
<el-form-item label="模糊搜索">
<el-form-item :label="$t('TaskConfig.placeholder.blurry')">
<el-input
v-model="query.blurry"
clearable
size="mini"
placeholder="编码名称"
:placeholder="$t('TaskConfig.placeholder.search')"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
@@ -40,12 +38,27 @@
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="820px">
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="135px" label-suffix=":">
<el-form-item label="所属区域">
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
:width="computedLabelWidth"
>
<el-form
ref="form"
style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
:inline="true"
:model="form"
:rules="rules"
size="mini"
:label-width="computedFormLabelWidth"
label-suffix=":"
>
<el-form-item :label="$t('TaskConfig.dialog.workshop_code')">
<el-select
v-model="form.workshop_code"
placeholder="请选择"
:placeholder="$t('common.Please_select')"
style="width: 240px;"
>
<el-option
@@ -55,31 +68,17 @@
/>
</el-select>
</el-form-item>
<el-form-item label="配置编码" prop="config_code">
<el-form-item :label="$t('TaskConfig.dialog.code')" prop="config_code">
<el-input v-model="form.config_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="配置名称">
<el-form-item :label="$t('TaskConfig.dialog.name')">
<el-input v-model="form.config_name" style="width: 240px;" />
</el-form-item>
<el-form-item v-if="false" label="任务取放类型">
<el-select
v-model="form.task_qf_type"
size="mini"
placeholder="任务取放类型"
style="width: 240px;"
>
<el-option
v-for="item in dict.task_qf_type"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="ACS任务类型" prop="acs_task_type">
<el-form-item :label="$t('TaskConfig.dialog.acs_task_type')" prop="acs_task_type">
<el-select
v-model="form.acs_task_type"
size="mini"
placeholder="ACS任务类型"
:placeholder="$t('TaskConfig.dialog.acs_task_type')"
style="width: 240px;"
>
<el-option
@@ -89,19 +88,33 @@
/>
</el-select>
</el-form-item>
<el-form-item label="任务名字">
<el-form-item :label="$t('TaskConfig.dialog.agv_system_type')" prop="agv_system_type">
<el-select
v-model="form.agv_system_type"
size="mini"
:placeholder="$t('TaskConfig.dialog.agv_system_type')"
style="width: 240px;"
>
<el-option
v-for="item in dict.AGV_SYSTEM_TYPE"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('TaskConfig.dialog.task_name')">
<el-input v-model="form.task_name" style="width: 240px;" />
</el-form-item>
<el-form-item label="任务类型">
<el-form-item :label="$t('TaskConfig.dialog.task_type_name')">
<treeselect
v-model="form.task_type_id"
:load-options="loadTaskType"
:options="taskTypes"
style="width: 240px;"
placeholder="请选择任务类型"
:placeholder="$t('TaskConfig.dialog.task_type_name')"
/>
</el-form-item>
<el-form-item label="优先级" pro="priority">
<el-form-item :label="$t('TaskConfig.dialog.priority')" pro="priority">
<el-input-number
v-model.number="form.priority"
:min="1"
@@ -109,19 +122,19 @@
style="width: 240px;"
/>
</el-form-item>
<el-form-item label="是否立即创建">
<el-form-item :label="$t('TaskConfig.dialog.is_immediate_create')">
<el-radio-group v-model="form.is_immediate_create" style="width: 240px">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
<el-radio :label="true">{{ $t('common.Yes') }}</el-radio>
<el-radio :label="false">{{ $t('common.No') }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否自动下发">
<el-form-item :label="$t('TaskConfig.dialog.is_auto_issue')">
<el-radio-group v-model="form.is_auto_issue" style="width: 240px">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
<el-radio :label="true">{{ $t('common.Yes') }}</el-radio>
<el-radio :label="false">{{ $t('common.No') }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="任务生成数上限" prop="task_create_max_num">
<el-form-item :label="$t('TaskConfig.dialog.task_create_max_num')" prop="task_create_max_num">
<el-input-number
v-model.number="form.task_create_max_num"
:min="1"
@@ -129,7 +142,7 @@
style="width: 240px;"
/>
</el-form-item>
<el-form-item label="任务下发数上限" prop="task_issue_max_num">
<el-form-item :label="$t('TaskConfig.dialog.task_issue_max_num')" prop="task_issue_max_num">
<el-input-number
v-model.number="form.task_issue_max_num"
:min="1"
@@ -137,145 +150,152 @@
style="width: 240px;"
/>
</el-form-item>
<el-form-item label="起点前缀">
<el-form-item :label="$t('TaskConfig.dialog.start_point_pre')">
<el-input v-model="form.start_point_pre" style="width: 240px;" />
</el-form-item>
<el-form-item label="终点前缀">
<el-form-item :label="$t('TaskConfig.dialog.next_region_pre')">
<el-input v-model="form.next_region_pre" style="width: 240px;" />
</el-form-item>
<el-form-item v-if="false" label="任务方向" prop="task_direction">
<el-select
v-model="form.task_direction"
size="mini"
placeholder="任务方向"
style="width: 240px;"
>
<el-option
v-for="item in dict.task_direction"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item v-if="false" label="是否按组控制下发顺序">
<el-radio-group v-model="form.is_group_congrol_issue_seq" style="width: 240px">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="false" label="sql配置">
<el-input v-model="form.sql_param" style="width: 240px;" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
<el-input v-model.trim="form.remark" style="width: 480px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
<el-form-item :label="$t('TaskConfig.dialog.remark')" prop="remark">
<el-input
v-model.trim="form.remark"
style="width: 480px;"
rows="2"
type="textarea"
:disabled="crud.status.view > 0"
/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
<el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
size="mini"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="config_code" label="配置编码" :min-width="flexWidth('config_code',crud.data,'配置编码')" />
<el-table-column prop="config_name" label="配置名称" :min-width="flexWidth('config_name',crud.data,'配置名称')" />
<el-table-column prop="task_qf_type" label="任务取放类型" :min-width="flexWidth('task_qf_type',crud.data,'任务取放类型')">
<template slot-scope="scope">
{{ dict.label.task_qf_type[scope.row.task_qf_type] }}
</template>
</el-table-column>
<el-table-column prop="acs_task_type" label="acs任务类型" :min-width="flexWidth('acs_task_type',crud.data,'acs任务类型')">
<el-table-column
prop="config_code"
:render-header="renderHeader"
:label="$t('TaskConfig.table.code')"
:min-width="flexWidth('config_code',crud.data,$t('TaskConfig.table.code'))"
/>
<el-table-column
prop="config_name"
:label="$t('TaskConfig.table.name')"
:min-width="flexWidth('config_name',crud.data,$t('TaskConfig.table.name'))"
/>
<el-table-column
prop="acs_task_type"
:label="$t('TaskConfig.table.acs_task_type')"
:min-width="flexWidth('acs_task_type',crud.data, $t('TaskConfig.table.acs_task_type'), 20)"
>
<template slot-scope="scope">
{{ dict.label.acs_task_type[scope.row.acs_task_type] }}
</template>
</el-table-column>
<el-table-column prop="task_name" label="任务名字" :min-width="flexWidth('task_name',crud.data,'任务名字')" />
<el-table-column prop="task_type_name" label="任务类型" :min-width="flexWidth('task_type_name',crud.data,'任务类型')" />
<el-table-column prop="priority" label="优先级" :min-width="flexWidth('priority',crud.data,'优先级')" />
<el-table-column prop="task_create_max_num" label="任务生成数上限" :min-width="flexWidth('task_create_max_num',crud.data,'任务生成数上限')" />
<el-table-column prop="task_issue_max_num" label="任务下发数上限" :min-width="flexWidth('task_issue_max_num',crud.data,'任务下发数上限')" />
<el-table-column prop="is_immediate_create" label="是否立即创建" :min-width="flexWidth('is_immediate_create',crud.data,'是否立即创建')">
<el-table-column
prop="agv_system_type"
:label="$t('TaskConfig.table.agv_system_type')"
:min-width="flexWidth('agv_system_type',crud.data,$t('TaskConfig.table.agv_system_type'), 20)"
>
<template slot-scope="scope">
{{ scope.row.is_immediate_create ? '是' : '否' }}
{{ dict.label.AGV_SYSTEM_TYPE[scope.row.agv_system_type] }}
</template>
</el-table-column>
<el-table-column prop="is_auto_issue" label="是否自动下发" :min-width="flexWidth('is_auto_issue',crud.data,'是否自动下发')">
<el-table-column
prop="task_name"
:label="$t('TaskConfig.table.task_name')"
:min-width="flexWidth('task_name',crud.data,$t('TaskConfig.table.task_name'))"
/>
<el-table-column
prop="task_type_name"
:label="$t('TaskConfig.table.task_type_name')"
:min-width="flexWidth('task_type_name',crud.data,$t('TaskConfig.table.task_type_name'))"
/>
<el-table-column
prop="priority"
:label="$t('TaskConfig.table.priority')"
:min-width="flexWidth('priority',crud.data,$t('TaskConfig.table.priority'))"
/>
<el-table-column
prop="task_create_max_num"
:label="$t('TaskConfig.table.task_create_max_num')"
:render-header="renderHeader"
:min-width="flexWidth('task_create_max_num',crud.data,$t('TaskConfig.table.task_create_max_num'))"
/>
<el-table-column
prop="task_issue_max_num"
:label="$t('TaskConfig.table.task_issue_max_num')"
:min-width="flexWidth('task_issue_max_num',crud.data,$t('TaskConfig.table.task_issue_max_num'))"
/>
<el-table-column
prop="is_immediate_create"
:label="$t('TaskConfig.table.is_immediate_create')"
:min-width="flexWidth('is_immediate_create',crud.data,$t('TaskConfig.table.is_immediate_create'))"
>
<template slot-scope="scope">
{{ scope.row.is_auto_issue?'是':'否' }}
{{ scope.row.is_immediate_create ? $t('common.Yes') : $t('common.No') }}
</template>
</el-table-column>
<el-table-column v-if="false" prop="start_region_str" label="起点区域" :min-width="flexWidth('start_region_str',crud.data,'起点区域')">
<el-table-column
prop="is_auto_issue"
:label="$t('TaskConfig.table.is_auto_issue')"
:min-width="flexWidth('is_auto_issue',crud.data,$t('TaskConfig.table.is_auto_issue'))"
>
<template slot-scope="scope">
{{ getRegionNames(scope.row.start_region_str) }}
{{ scope.row.is_auto_issue ? $t('common.Yes') : $t('common.No') }}
</template>
</el-table-column>
<el-table-column v-if="false" prop="next_region_str" label="终点区域" :min-width="flexWidth('next_region_str',crud.data,'终点区域')">
<template slot-scope="scope">
{{ getRegionNames(scope.row.next_region_str) }}
</template>
</el-table-column>
<el-table-column prop="start_point_pre" label="起点前缀" :min-width="flexWidth('start_point_pre',crud.data,'起点前缀')" />
<el-table-column prop="next_region_pre" label="终点前缀" :min-width="flexWidth('next_region_pre',crud.data,'终点前缀')" />
<el-table-column v-if="false" prop="route_plan_code" label="路由编码" :min-width="flexWidth('route_plan_code',crud.data,'终点前缀')" />
<el-table-column v-if="false" prop="task_direction" label="任务方向" :min-width="flexWidth('task_direction',crud.data,'终点前缀')">
<template slot-scope="scope">
{{ dict.label.task_direction[scope.row.task_direction] }}
</template>
</el-table-column>
<el-table-column v-if="false" prop="is_check_workorder" label="是否校验工单" :min-width="flexWidth('is_check_workorder',crud.data,'是否校验工单')">
<template slot-scope="scope">
{{ scope.row.is_check_workorder?'是':'否' }}
</template>
</el-table-column>
<el-table-column v-if="false" prop="is_check_start_lock" label="是否判断起点锁" :min-width="flexWidth('is_check_start_lock',crud.data,'是否判断起点锁')">
<template slot-scope="scope">
{{ scope.row.is_check_start_lock?'是':'否' }}
</template>
</el-table-column>
<el-table-column v-if="false" prop="is_check_next_lock" label="是否判断终点锁" :min-width="flexWidth('is_check_next_lock',crud.data,'是否判断终点锁')">
<template slot-scope="scope">
{{ scope.row.is_check_next_lock?'是':'否' }}
</template>
</el-table-column>
<el-table-column v-if="false" prop="is_start_auto" label="是否起点自动" :min-width="flexWidth('is_start_auto',crud.data,'是否起点自动')">
<template slot-scope="scope">
{{ scope.row.is_start_auto?'是':'否' }}
</template>
</el-table-column>
<el-table-column v-if="false" prop="is_next_auto" label="是否终点自动" :min-width="flexWidth('is_next_auto',crud.data,'是否终点自动')">
<template slot-scope="scope">
{{ scope.row.is_next_auto?'是':'否' }}
</template>
</el-table-column>
<el-table-column v-if="false" prop="is_lock_start" label="是否锁定起点" :min-width="flexWidth('is_lock_start',crud.data,'是否锁定起点')">
<template slot-scope="scope">
{{ scope.row.is_lock_start?'是':'否' }}
</template>
</el-table-column>
<el-table-column v-if="false" prop="is_lock_next" label="是否锁定终点" :min-width="flexWidth('is_lock_next',crud.data,'是否锁定终点')">
<template slot-scope="scope">
{{ scope.row.is_lock_next?'是':'否' }}
</template>
</el-table-column>
<el-table-column v-if="false" prop="request_param" label="生成任务的请求参数" :min-width="flexWidth('request_param',crud.data,'生成任务的请求参数')" />
<el-table-column v-if="false" prop="response_param" label="下发任务的请求参数" :min-width="flexWidth('response_param',crud.data,'下发任务的请求参数')" />
<el-table-column v-if="false" prop="is_group_congrol_issue_seq" label="是否按组控制下发顺序" :min-width="flexWidth('is_group_congrol_issue_seq',crud.data,'是否按组控制下发顺序')">
<template slot-scope="scope">
{{ scope.row.is_group_congrol_issue_seq?'是':'否' }}
</template>
</el-table-column>
<el-table-column prop="unfinish_notify_time" label="未完成通知时间" :min-width="flexWidth('unfinish_notify_time',crud.data,'未完成通知时间')" />
<el-table-column v-if="false" prop="sql_param" label="sql配置" :min-width="flexWidth('sql_param',crud.data,'sql配置')" />
<el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column
prop="start_point_pre"
:label="$t('TaskConfig.table.start_point_pre')"
:min-width="flexWidth('start_point_pre',crud.data,$t('TaskConfig.table.start_point_pre'))"
/>
<el-table-column
prop="next_region_pre"
:label="$t('TaskConfig.table.next_region_pre')"
:min-width="flexWidth('next_region_pre',crud.data,$t('TaskConfig.table.next_region_pre'))"
/>
<el-table-column
prop="workshop_code"
:label="$t('TaskConfig.table.workshop_code')"
:min-width="flexWidth('workshop_code',crud.data,$t('TaskConfig.table.workshop_code'))"
/>
<el-table-column
prop="remark"
:label="$t('TaskConfig.table.remark')"
:min-width="flexWidth('remark',crud.data,$t('TaskConfig.table.remark'))"
/>
<!-- <el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')"/>-->
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<el-table-column
prop="create_name"
:label="$t('TaskConfig.table.create_name')"
:min-width="flexWidth('create_name',crud.data, $t('TaskConfig.table.create_name'))"
/>
<el-table-column
prop="create_time"
:label="$t('TaskConfig.table.create_time')"
:min-width="flexWidth('create_time',crud.data, $t('TaskConfig.table.create_time'))"
/>
<el-table-column
prop="update_name"
:label="$t('TaskConfig.table.update_name')"
:min-width="flexWidth('update_name',crud.data, $t('TaskConfig.table.update_name'))"
/>
<el-table-column
prop="update_time"
:label="$t('TaskConfig.table.update_time')"
:min-width="flexWidth('update_time',crud.data, $t('TaskConfig.table.update_time'))"
/>
<el-table-column v-permission="[]" :label="$t('common.Operate')" width="160px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
@@ -302,6 +322,7 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop'
import crudSchBaseRegion from '@/views/wms/sch/region/schBaseRegion'
import crudClassstandard from '@/views/wms/basedata/master/classification/mdBaseClassstandard'
import i18n from '@/i18n'
const defaultForm = {
config_id: null,
@@ -309,12 +330,13 @@ const defaultForm = {
config_name: null,
task_qf_type: null,
acs_task_type: null,
agv_system_type: null,
task_name: null,
task_type: null,
task_type_id: null,
priority: null,
task_create_max_num: null,
task_issue_max_num: null,
task_create_max_num: 999,
task_issue_max_num: 999,
is_auto_issue: true,
start_region_str: null,
next_region_str: null,
@@ -344,7 +366,7 @@ const defaultForm = {
}
export default {
name: 'TaskConfig',
dicts: ['task_qf_type', 'acs_task_type', 'task_direction', 'task_type'],
dicts: ['task_qf_type', 'acs_task_type', 'task_direction', 'task_type', 'AGV_SYSTEM_TYPE'],
components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
@@ -365,46 +387,44 @@ export default {
},
data() {
return {
permission: {
},
permission: {},
rules: {
config_code: [
{ required: true, message: '请输入配置编码', trigger: 'blur' }
{ required: true, message: i18n.t('TaskConfig.placeholder.search'), trigger: 'blur' }
],
acs_task_type: [
{ required: true, message: '请输入acs类型', trigger: 'blur' }
{ required: true, message: i18n.t('TaskConfig.rules.r1'), trigger: 'blur' }
],
task_create_max_num: [
{ required: true, message: '请输入最大任务生成数', trigger: 'blur' }
{ required: true, message: i18n.t('TaskConfig.rules.r2'), trigger: 'blur' }
],
task_issue_max_num: [
{ required: true, message: '请输入最大任务下发数', trigger: 'blur' }
],
unfinish_notify_time: [
{ required: true, message: '请输入任务未完成通知时间数', trigger: 'blur' }
{ required: true, message: i18n.t('TaskConfig.rules.r3'), trigger: 'blur' }
]
},
workShopList: [],
regionList: [],
taskTypes: []
taskTypes: [],
tooltips: {
config_code: i18n.t('TaskConfig.tooltips.t1'),
task_create_max_num: i18n.t('TaskConfig.tooltips.t2')
}
}
},
computed: {
getRegionNames() {
return (nextRegionStr) => {
if (!nextRegionStr) {
return '-'
}
const regionCodes = nextRegionStr.split(',').map(code => code.trim())
const regionNames = regionCodes
.map(code => {
const region = this.regionList.find(item => item.region_code === code)
return region ? region.region_name : ''
})
.filter(name => name !== '')
return regionNames.join('、')
computedLabelWidth() {
const item = localStorage.getItem('lang')
if (item === 'zh') {
return `820px`
}
return `900px`
},
computedFormLabelWidth() {
const item = localStorage.getItem('lang')
if (item === 'zh') {
return `135px`
}
return `170px`
}
},
created() {
@@ -477,6 +497,18 @@ export default {
data.children = null // 重点代码
}
})
},
renderHeader(h, { column }) {
const tooltipContent = this.tooltips[column.property] || '默认的提示信息'
return h('el-tooltip', {
props: {
effect: 'dark',
content: tooltipContent,
placement: 'top'
}
}, [
h('span', column.label)
])
}
}
}

293
lms/nladmin-ui/src/views/wms/sch/task/index.vue
View File

@@ -7,55 +7,52 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="任务号">
<label slot="label">任&nbsp;&nbsp;务&nbsp;号:</label>
<el-form-item :label="$t('Task.search.task_code')">
<el-input
v-model="query.task_code"
clearable
style="width: 180px"
placeholder="任务号"
:placeholder="$t('Task.search.p1')"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="载具号">
<label slot="label">载&nbsp;&nbsp;具&nbsp;号:</label>
<el-form-item :label="$t('Task.search.vehicle_code')">
<el-input
v-model="query.vehicle_code"
clearable
style="width: 180px"
placeholder="载具号"
:placeholder="$t('Task.search.p2')"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="点位编码">
<el-form-item :label="$t('Task.search.point_code')">
<el-input
v-model="query.point_code"
clearable
style="width: 180px"
placeholder="起点"
:placeholder="$t('Task.search.p3')"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="创建时间">
<el-form-item :label="$t('Task.search.createTime')">
<el-date-picker
v-model="query.createTime"
type="datetimerange"
value-format="yyyy-MM-dd HH:mm:ss"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="crud.toQuery">
</el-date-picker>
:range-separator="$t('Task.search.createTime_')"
:start-placeholder="$t('Task.search.createTime_1')"
:end-placeholder="$t('Task.search.createTime_2')"
@change="crud.toQuery"
/>
</el-form-item>
<el-form-item label="任务状态">
<el-form-item :label="$t('Task.search.task_status')">
<el-select
v-model="query.task_status"
multiple
style="width: 360px"
placeholder="任务状态"
:placeholder="$t('Task.search.task_status')"
class="filter-item"
clearable
@change="handTaskStatus"
@@ -74,8 +71,23 @@
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px">
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="115px" label-suffix=":">
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="800px"
>
<el-form
ref="form"
style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
:inline="true"
:model="form"
:rules="rules"
size="mini"
label-width="115px"
label-suffix=":"
>
<el-form-item label="任务编码">
<el-input v-model="form.task_code" style="width: 240px;" />
</el-form-item>
@@ -109,9 +121,9 @@
<el-form-item label="载具编码">
<el-input v-model="form.vehicle_code" style="width: 240px;" />
</el-form-item>
<!-- <el-form-item label="优先级">-->
<!-- <el-input v-model="form.priority" style="width: 240px;" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="优先级">-->
<!-- <el-input v-model="form.priority" style="width: 240px;" />-->
<!-- </el-form-item>-->
<el-form-item v-if="false" label="处理类">
<el-input v-model="form.handle_class" style="width: 240px;" />
</el-form-item>
@@ -158,81 +170,224 @@
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="task_code" label="任务编码" :min-width="flexWidth('task_code',crud.data,'任务编码')" />
<el-table-column prop="vehicle_code" label="载具编码1" :min-width="flexWidth('vehicle_code',crud.data,'载具编码1')">
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
size="mini"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column
type="selection"
width="55"
/>
<el-table-column
prop="task_code"
:label="$t('Task.table.code')"
:min-width="flexWidth('task_code',crud.data,$t('Task.table.code'))"
/>
<el-table-column
prop="vehicle_code"
:label="$t('Task.table.vehicle_code')"
:min-width="flexWidth('vehicle_code',crud.data,$t('Task.table.vehicle_code'))"
>
<template slot-scope="scope">
{{ scope.row.vehicle_code ? scope.row.vehicle_code : '-' }}
</template>
</el-table-column>
<el-table-column prop="vehicle_code2" label="载具编码2" :min-width="flexWidth('vehicle_code2',crud.data,'载具编码2')">
<el-table-column
prop="vehicle_code2"
:label="$t('Task.table.vehicle_code2')"
:min-width="flexWidth('vehicle_code2',crud.data,$t('Task.table.vehicle_code2'))"
>
<template slot-scope="scope">
{{ scope.row.vehicle_code2 ? scope.row.vehicle_code2 : '-' }}
</template>
</el-table-column>
<!-- <el-table-column prop="task_class_id" label="任务分类" :min-width="flexWidth('task_class_id',crud.data,'任务分类')" />-->
<el-table-column prop="task_status" label="任务状态" :min-width="flexWidth('task_status',crud.data,'任务状态')">
<el-table-column
prop="task_status"
:label="$t('Task.table.task_status')"
:min-width="flexWidth('task_status',crud.data,$t('Task.table.task_status'))"
>
<template slot-scope="scope">
{{ getStatusName(scope.row.task_status) }}
</template>
</el-table-column>
<el-table-column prop="remark" label="提示信息" :min-width="flexWidth('remark',crud.data,'提示信息')" />
<el-table-column prop="config_code" label="配置编码" :min-width="flexWidth('config_code',crud.data,'配置编码')" />
<el-table-column prop="point_code1" label="起点1" :min-width="flexWidth('point_code1',crud.data,'点位1')" />
<el-table-column prop="point_code2" label="终点1" :min-width="flexWidth('point_code2',crud.data,'点位2')" />
<el-table-column prop="point_code3" label="起点2" :min-width="flexWidth('point_code3',crud.data,'点位3')" />
<el-table-column prop="point_code4" label="终点2" :min-width="flexWidth('point_code4',crud.data,'点位4')" />
<el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型', 20)">
<el-table-column
prop="remark"
:label="$t('Task.table.remark')"
:min-width="flexWidth('remark',crud.data,$t('Task.table.remark'))"
/>
<el-table-column
prop="config_code"
:label="$t('Task.table.config_code')"
:min-width="flexWidth('config_code',crud.data,$t('Task.table.config_code'))"
/>
<el-table-column
prop="point_code1"
:label="$t('Task.table.point_code1')"
:min-width="flexWidth('point_code1',crud.data,$t('Task.table.point_code1'))"
/>
<el-table-column
prop="point_code2"
:label="$t('Task.table.point_code2')"
:min-width="flexWidth('point_code2',crud.data,$t('Task.table.point_code2'))"
/>
<el-table-column
prop="point_code3"
:label="$t('Task.table.point_code3')"
:min-width="flexWidth('point_code3',crud.data,$t('Task.table.point_code3'))"
/>
<el-table-column
prop="point_code4"
:label="$t('Task.table.point_code4')"
:min-width="flexWidth('point_code4',crud.data,$t('Task.table.point_code4'))"
/>
<el-table-column
prop="vehicle_type"
:label="$t('Task.table.vehicle_type')"
:min-width="flexWidth('vehicle_type',crud.data,$t('Task.table.vehicle_type'), 20)"
>
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')" />
<el-table-column v-if="false" prop="priority" label="优先级" :min-width="flexWidth('priority',crud.data,'优先级')" />
<el-table-column v-if="false" prop="handle_class" label="处理类" :min-width="flexWidth('handle_class',crud.data,'处理类')" />
<el-table-column v-if="false" prop="handle_status" label="处理状态" :min-width="flexWidth('handle_status',crud.data,'处理状态')" />
<el-table-column prop="car_no" label="车号" :min-width="flexWidth('car_no',crud.data,'车号')" />
<el-table-column prop="task_group_id" label="任务组标识" :min-width="flexWidth('task_group_id',crud.data,'任务组标识')" />
<el-table-column prop="task_group_seq" label="任务组顺序号" :min-width="flexWidth('task_group_seq',crud.data,'任务组顺序号')" />
<el-table-column prop="finished_type" label="任务完成类型" :min-width="flexWidth('finished_type',crud.data,'任务完成类型')">
<el-table-column
prop="vehicle_qty"
:label="$t('Task.table.vehicle_qty')"
:min-width="flexWidth('vehicle_qty',crud.data,$t('Task.table.vehicle_qty'))"
/>
<el-table-column
prop="priority"
:label="$t('Task.table.priority')"
:min-width="flexWidth('priority',crud.data,$t('Task.table.priority'))"
/>
<el-table-column
prop="acs_task_type"
:label="$t('Task.table.acs_task_type')"
:min-width="flexWidth('acs_task_type',crud.data,$t('Task.table.acs_task_type'))"
>
<template slot-scope="scope">
{{ dict.label.finished_type[scope.row.finished_type]?dict.label.finished_type[scope.row.finished_type]:'未完成' }}
{{ dict.label.acs_task_type[scope.row.acs_task_type] }}
</template>
</el-table-column>
<el-table-column prop="create_mode" label="生成方式" :min-width="flexWidth('create_mode',crud.data,'生成方式')" >
<el-table-column
prop="agv_system_type"
:label="$t('Task.table.agv_system_type')"
:min-width="flexWidth('agv_system_type',crud.data,$t('Task.table.agv_system_type'))"
>
<template slot-scope="scope">
{{ dict.label.AGV_SYSTEM_TYPE[scope.row.agv_system_type] }}
</template>
</el-table-column>
<el-table-column
prop="handle_class"
:label="$t('Task.table.handle_class')"
:min-width="flexWidth('handle_class',crud.data,$t('Task.table.handle_class'))"
/>
<el-table-column v-if="false" prop="car_no" label="车号" :min-width="flexWidth('car_no',crud.data,'车号')" />
<el-table-column
v-if="false"
prop="task_group_id"
label="任务组标识"
:min-width="flexWidth('task_group_id',crud.data,'任务组标识')"
/>
<el-table-column
v-if="false"
prop="task_group_seq"
label="任务组顺序号"
:min-width="flexWidth('task_group_seq',crud.data,'任务组顺序号')"
/>
<el-table-column
prop="finished_type"
:label="$t('Task.table.finished_type')"
:min-width="flexWidth('finished_type',crud.data,$t('Task.table.finished_type'), 10)"
>
<template slot-scope="scope">
{{
dict.label.finished_type[scope.row.finished_type]
? dict.label.finished_type[scope.row.finished_type]
: $t('Task.table.uncompleted')
}}
</template>
</el-table-column>
<el-table-column
prop="create_mode"
:label="$t('Task.table.create_mode')"
:min-width="flexWidth('create_mode',crud.data,$t('Task.table.create_mode'))"
>
<template slot-scope="scope">
{{ dict.label.create_mode[scope.row.create_mode] }}
</template>
</el-table-column>
<el-table-column prop="acs_trace_id" label="链路标识" :min-width="flexWidth('acs_trace_id',crud.data,'链路标识')" />
<el-table-column prop="request_param" label="生成任务的请求参数" :min-width="flexWidth('request_param',crud.data,'生成任务的请求参数')" />
<el-table-column prop="response_param" label="下发任务的请求参数" :min-width="flexWidth('response_param',crud.data,'下发任务的请求参数')" />
<el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
<el-table-column prop="ext_group_data" label="额外组盘信息" :min-width="flexWidth('ext_group_data',crud.data,'额外组盘信息')" />
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<el-table-column v-permission="[]" label="操作" width="160px" align="center" fixed="right">
<el-table-column
prop="acs_trace_id"
:label="$t('Task.table.acs_trace_id')"
:min-width="flexWidth('acs_trace_id',crud.data,$t('Task.table.acs_trace_id'))"
/>
<el-table-column
prop="request_param"
:label="$t('Task.table.request_param')"
:min-width="flexWidth('request_param',crud.data,$t('Task.table.request_param'))"
/>
<el-table-column
prop="response_param"
:label="$t('Task.table.response_param')"
:min-width="flexWidth('response_param',crud.data,$t('Task.table.response_param'))"
/>
<el-table-column
prop="workshop_code"
:label="$t('Task.table.workshop_code')"
:min-width="flexWidth('workshop_code',crud.data,$t('Task.table.workshop_code'))"
/>
<el-table-column
v-if="false"
prop="ext_group_data"
label="额外组盘信息"
:min-width="flexWidth('ext_group_data',crud.data,'额外组盘信息')"
/>
<el-table-column
prop="create_name"
:label="$t('Task.table.create_name')"
:min-width="flexWidth('create_name',crud.data,$t('Task.table.create_name'))"
/>
<el-table-column
prop="create_time"
:label="$t('Task.table.create_time')"
:min-width="flexWidth('create_time',crud.data,$t('Task.table.create_time'))"
/>
<el-table-column
prop="update_name"
:label="$t('Task.table.update_name')"
:min-width="flexWidth('update_name',crud.data,$t('Task.table.update_name'))"
/>
<el-table-column
prop="update_time"
:label="$t('Task.table.update_time')"
:min-width="flexWidth('update_time',crud.data,$t('Task.table.update_time'))"
/>
<el-table-column v-permission="[]" :label="$t('common.Operate')" width="200px" align="center" fixed="right">
<template slot-scope="scope">
<!-- <el-button-->
<!-- type="text"-->
<!-- icon="el-icon-upload"-->
<!-- @click="doOperate(scope.row, 'c')"-->
<!-- >下发</el-button>-->
<!-- <el-button-->
<!-- type="text"-->
<!-- icon="el-icon-upload"-->
<!-- @click="doOperate(scope.row, 'c')"-->
<!-- >下发</el-button>-->
<el-button
type="text"
icon="el-icon-success"
@click="doOperate(scope.row, 'a')"
:disabled="scope.row.task_status==='5' || scope.row.task_status==='6'"
>完成</el-button>
@click="doOperate(scope.row, 'a')"
>{{ $t('Task.table.complete') }}
</el-button>
<el-button
type="text"
icon="el-icon-error"
@click="doOperate(scope.row, 'b')"
:disabled="scope.row.task_status==='5' || scope.row.task_status==='6'"
>取消</el-button>
@click="doOperate(scope.row, 'b')"
>{{ $t('common.Cancel') }}
</el-button>
</template>
</el-table-column>
</el-table>
@@ -282,7 +437,7 @@ const defaultForm = {
}
export default {
name: 'Task',
dicts: ['vehicle_type', 'create_mode', 'finished_type'],
dicts: ['vehicle_type', 'create_mode', 'finished_type', 'acs_task_type', 'AGV_SYSTEM_TYPE'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
@@ -303,10 +458,8 @@ export default {
},
data() {
return {
permission: {
},
rules: {
},
permission: {},
rules: {},
taskStatusList: []
}
},