add: 新增任务管理
This commit is contained in:
@@ -45,9 +45,19 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
|
||||
@Override
|
||||
public IPage<SchBasePoint> queryAll(Map whereJson, PageQuery page){
|
||||
String blurry = ObjectUtil.isNotEmpty(whereJson.get("blurry")) ? whereJson.get("blurry").toString() : null;
|
||||
String workshop_code = ObjectUtil.isNotEmpty(whereJson.get("workshop_code")) ? whereJson.get("workshop_code").toString() : null;
|
||||
String region_code = ObjectUtil.isNotEmpty(whereJson.get("region_code")) ? whereJson.get("region_code").toString() : null;
|
||||
String point_type = ObjectUtil.isNotEmpty(whereJson.get("point_type")) ? whereJson.get("point_type").toString() : null;
|
||||
String point_status = ObjectUtil.isNotEmpty(whereJson.get("point_status")) ? whereJson.get("point_status").toString() : null;
|
||||
Boolean is_used = ObjectUtil.isNotEmpty(whereJson.get("is_used")) ? Boolean.valueOf(whereJson.get("is_used").toString()) : null;
|
||||
LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
|
||||
lam.like(ObjectUtil.isNotEmpty(blurry), SchBasePoint::getPoint_code, blurry)
|
||||
.or(ObjectUtil.isNotEmpty(blurry), lam1 -> lam1.like(SchBasePoint::getPoint_name, blurry));
|
||||
.or(ObjectUtil.isNotEmpty(blurry), lam1 -> lam1.like(SchBasePoint::getPoint_name, blurry))
|
||||
.eq(ObjectUtil.isNotEmpty(workshop_code), SchBasePoint::getWorkshop_code, workshop_code)
|
||||
.eq(ObjectUtil.isNotEmpty(region_code), SchBasePoint::getRegion_code, region_code)
|
||||
.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);
|
||||
IPage<SchBasePoint> pages = new Page<>(page.getPage() + 1, page.getSize());
|
||||
pointMapper.selectPage(pages, lam);
|
||||
// 可以存放的载具类型
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
package org.nl.wms.sch.task.controller;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.nl.common.base.TableDataInfo;
|
||||
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.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
/**
|
||||
* @author lyd
|
||||
* @date 2023-05-15
|
||||
**/
|
||||
@Slf4j
|
||||
@RestController
|
||||
@Api(tags = "任务管理管理")
|
||||
@RequestMapping("/api/schBaseTask")
|
||||
public class SchBaseTaskController {
|
||||
|
||||
@Autowired
|
||||
private ISchBaseTaskService schBaseTaskService;
|
||||
|
||||
@GetMapping
|
||||
@Log("查询任务管理")
|
||||
@ApiOperation("查询任务管理")
|
||||
//@SaCheckPermission("@el.check('schBaseTask:list')")
|
||||
public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
|
||||
return new ResponseEntity<>(TableDataInfo.build(schBaseTaskService.queryAll(whereJson,page)),HttpStatus.OK);
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
@Log("新增任务管理")
|
||||
@ApiOperation("新增任务管理")
|
||||
//@SaCheckPermission("@el.check('schBaseTask:add')")
|
||||
public ResponseEntity<Object> create(@Validated @RequestBody SchBaseTask entity){
|
||||
schBaseTaskService.create(entity);
|
||||
return new ResponseEntity<>(HttpStatus.CREATED);
|
||||
}
|
||||
|
||||
@PutMapping
|
||||
@Log("修改任务管理")
|
||||
@ApiOperation("修改任务管理")
|
||||
//@SaCheckPermission("@el.check('schBaseTask:edit')")
|
||||
public ResponseEntity<Object> update(@Validated @RequestBody SchBaseTask entity){
|
||||
schBaseTaskService.update(entity);
|
||||
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
|
||||
}
|
||||
|
||||
@Log("删除任务管理")
|
||||
@ApiOperation("删除任务管理")
|
||||
//@SaCheckPermission("@el.check('schBaseTask:del')")
|
||||
@DeleteMapping
|
||||
public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
|
||||
schBaseTaskService.deleteAll(ids);
|
||||
return new ResponseEntity<>(HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
package org.nl.wms.sch.task.controller;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.nl.common.base.TableDataInfo;
|
||||
import org.nl.common.domain.query.PageQuery;
|
||||
import org.nl.common.logging.annotation.Log;
|
||||
import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
|
||||
import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
/**
|
||||
* @author lyd
|
||||
* @date 2023-05-15
|
||||
**/
|
||||
@Slf4j
|
||||
@RestController
|
||||
@Api(tags = "任务配置管理")
|
||||
@RequestMapping("/api/schBaseTaskconfig")
|
||||
public class SchBaseTaskconfigController {
|
||||
|
||||
@Autowired
|
||||
private ISchBaseTaskconfigService schBaseTaskconfigService;
|
||||
|
||||
@GetMapping
|
||||
@Log("查询任务配置")
|
||||
@ApiOperation("查询任务配置")
|
||||
//@SaCheckPermission("@el.check('schBaseTaskconfig:list')")
|
||||
public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
|
||||
return new ResponseEntity<>(TableDataInfo.build(schBaseTaskconfigService.queryAll(whereJson,page)),HttpStatus.OK);
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
@Log("新增任务配置")
|
||||
@ApiOperation("新增任务配置")
|
||||
//@SaCheckPermission("@el.check('schBaseTaskconfig:add')")
|
||||
public ResponseEntity<Object> create(@Validated @RequestBody SchBaseTaskconfig entity){
|
||||
schBaseTaskconfigService.create(entity);
|
||||
return new ResponseEntity<>(HttpStatus.CREATED);
|
||||
}
|
||||
|
||||
@PutMapping
|
||||
@Log("修改任务配置")
|
||||
@ApiOperation("修改任务配置")
|
||||
//@SaCheckPermission("@el.check('schBaseTaskconfig:edit')")
|
||||
public ResponseEntity<Object> update(@Validated @RequestBody SchBaseTaskconfig entity){
|
||||
schBaseTaskconfigService.update(entity);
|
||||
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
|
||||
}
|
||||
|
||||
@Log("删除任务配置")
|
||||
@ApiOperation("删除任务配置")
|
||||
//@SaCheckPermission("@el.check('schBaseTaskconfig:del')")
|
||||
@DeleteMapping
|
||||
public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
|
||||
schBaseTaskconfigService.deleteAll(ids);
|
||||
return new ResponseEntity<>(HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
package org.nl.wms.sch.task.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import org.nl.common.domain.query.PageQuery;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import org.nl.wms.sch.task.service.dao.SchBaseTask;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* @description 服务接口
|
||||
* @author lyd
|
||||
* @date 2023-05-15
|
||||
**/
|
||||
public interface ISchBaseTaskService extends IService<SchBaseTask> {
|
||||
|
||||
/**
|
||||
* 查询数据分页
|
||||
* @param whereJson 条件
|
||||
* @param pageable 分页参数
|
||||
* @return IPage<SchBaseTask>
|
||||
*/
|
||||
IPage<SchBaseTask> queryAll(Map whereJson, PageQuery pageable);
|
||||
|
||||
/**
|
||||
* 创建
|
||||
* @param entity /
|
||||
*/
|
||||
void create(SchBaseTask entity);
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
* @param entity /
|
||||
*/
|
||||
void update(SchBaseTask entity);
|
||||
|
||||
/**
|
||||
* 多选删除
|
||||
* @param ids /
|
||||
*/
|
||||
void deleteAll(Set<String> ids);
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
package org.nl.wms.sch.task.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import org.nl.common.domain.query.PageQuery;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* @description 服务接口
|
||||
* @author lyd
|
||||
* @date 2023-05-15
|
||||
**/
|
||||
public interface ISchBaseTaskconfigService extends IService<SchBaseTaskconfig> {
|
||||
|
||||
/**
|
||||
* 查询数据分页
|
||||
* @param whereJson 条件
|
||||
* @param pageable 分页参数
|
||||
* @return IPage<SchBaseTaskconfig>
|
||||
*/
|
||||
IPage<SchBaseTaskconfig> queryAll(Map whereJson, PageQuery pageable);
|
||||
|
||||
/**
|
||||
* 创建
|
||||
* @param entity /
|
||||
*/
|
||||
void create(SchBaseTaskconfig entity);
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
* @param entity /
|
||||
*/
|
||||
void update(SchBaseTaskconfig entity);
|
||||
|
||||
/**
|
||||
* 多选删除
|
||||
* @param ids /
|
||||
*/
|
||||
void deleteAll(Set<String> ids);
|
||||
}
|
||||
@@ -0,0 +1,125 @@
|
||||
package org.nl.wms.sch.task.service.dao;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @description /
|
||||
* @author lyd
|
||||
* @date 2023-05-15
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@TableName("sch_base_task")
|
||||
public class SchBaseTask implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value = "task_code", type = IdType.NONE)
|
||||
@ApiModelProperty(value = "任务编码")
|
||||
private String task_code;
|
||||
|
||||
@ApiModelProperty(value = "任务分类")
|
||||
private String task_class_id;
|
||||
|
||||
@ApiModelProperty(value = "任务状态")
|
||||
private String task_status;
|
||||
|
||||
@ApiModelProperty(value = "配置编码")
|
||||
private String config_code;
|
||||
|
||||
@ApiModelProperty(value = "点位1")
|
||||
private String point_code1;
|
||||
|
||||
@ApiModelProperty(value = "点位2")
|
||||
private String point_code2;
|
||||
|
||||
@ApiModelProperty(value = "点位3")
|
||||
private String point_code3;
|
||||
|
||||
@ApiModelProperty(value = "点位4")
|
||||
private String point_code4;
|
||||
|
||||
@ApiModelProperty(value = "载具类型")
|
||||
private String vehicle_type;
|
||||
|
||||
@ApiModelProperty(value = "载具数量")
|
||||
private BigDecimal vehicle_qty;
|
||||
|
||||
@ApiModelProperty(value = "载具编码")
|
||||
private String vehicle_code;
|
||||
|
||||
@ApiModelProperty(value = "优先级")
|
||||
private String priority;
|
||||
|
||||
@ApiModelProperty(value = "处理类")
|
||||
private String handle_class;
|
||||
|
||||
@ApiModelProperty(value = "处理状态")
|
||||
private String handle_status;
|
||||
|
||||
@ApiModelProperty(value = "车号")
|
||||
private String car_no;
|
||||
|
||||
@ApiModelProperty(value = "是否自动下发")
|
||||
private Boolean is_auto_issue;
|
||||
|
||||
@ApiModelProperty(value = "任务组标识")
|
||||
private Long task_group_id;
|
||||
|
||||
@ApiModelProperty(value = "任务组顺序号")
|
||||
private BigDecimal task_group_seq;
|
||||
|
||||
@ApiModelProperty(value = "任务完成类型")
|
||||
private String finished_type;
|
||||
|
||||
@ApiModelProperty(value = "生成方式")
|
||||
private String create_mode;
|
||||
|
||||
@ApiModelProperty(value = "链路标识")
|
||||
private String acs_trace_id;
|
||||
|
||||
@ApiModelProperty(value = "生成任务的请求参数")
|
||||
private String request_param;
|
||||
|
||||
@ApiModelProperty(value = "下发任务的请求参数")
|
||||
private String response_param;
|
||||
|
||||
@ApiModelProperty(value = "车间编码")
|
||||
private String workshop_code;
|
||||
|
||||
@ApiModelProperty(value = "额外组盘信息")
|
||||
private String ext_group_data;
|
||||
|
||||
@ApiModelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
@ApiModelProperty(value = "是否删除")
|
||||
private Boolean is_delete;
|
||||
|
||||
@ApiModelProperty(value = "创建人")
|
||||
private String create_id;
|
||||
|
||||
@ApiModelProperty(value = "创建人")
|
||||
private String create_name;
|
||||
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
private String create_time;
|
||||
|
||||
@ApiModelProperty(value = "修改人")
|
||||
private String update_id;
|
||||
|
||||
@ApiModelProperty(value = "修改人")
|
||||
private String update_name;
|
||||
|
||||
@ApiModelProperty(value = "修改时间")
|
||||
private String update_time;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,137 @@
|
||||
package org.nl.wms.sch.task.service.dao;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @description /
|
||||
* @author lyd
|
||||
* @date 2023-05-15
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@TableName("sch_base_taskconfig")
|
||||
public class SchBaseTaskconfig implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value = "config_code", type = IdType.NONE)
|
||||
@ApiModelProperty(value = "配置编码")
|
||||
private String config_code;
|
||||
|
||||
@ApiModelProperty(value = "配置名称")
|
||||
private String config_name;
|
||||
|
||||
@ApiModelProperty(value = "任务取放类型")
|
||||
private String task_qf_type;
|
||||
|
||||
@ApiModelProperty(value = "acs任务类型")
|
||||
private String acs_task_type;
|
||||
|
||||
@ApiModelProperty(value = "任务名字")
|
||||
private String task_name;
|
||||
|
||||
@ApiModelProperty(value = "任务类型")
|
||||
private String task_type;
|
||||
|
||||
@ApiModelProperty(value = "优先级")
|
||||
private String priority;
|
||||
|
||||
@ApiModelProperty(value = "允许最大任务生成数")
|
||||
private BigDecimal task_create_num;
|
||||
|
||||
@ApiModelProperty(value = "允许最大任务下发数")
|
||||
private BigDecimal task_issue_num;
|
||||
|
||||
@ApiModelProperty(value = "是否自动下发")
|
||||
private Boolean is_auto_issue;
|
||||
|
||||
@ApiModelProperty(value = "起点区域配置")
|
||||
private String start_region_str;
|
||||
|
||||
@ApiModelProperty(value = "终点区域配置")
|
||||
private String next_region_str;
|
||||
|
||||
@ApiModelProperty(value = "起点点位前缀")
|
||||
private String start_point_pre;
|
||||
|
||||
@ApiModelProperty(value = "终点点位前缀")
|
||||
private String next_region_pre;
|
||||
|
||||
@ApiModelProperty(value = "是否校验工单")
|
||||
private Boolean is_check_workorder;
|
||||
|
||||
@ApiModelProperty(value = "是否判断起点锁定")
|
||||
private Boolean is_check_start_lock;
|
||||
|
||||
@ApiModelProperty(value = "是否立即创建")
|
||||
private Boolean is_immediate_create;
|
||||
|
||||
@ApiModelProperty(value = "是否判断终点锁定")
|
||||
private Boolean is_check_next_lock;
|
||||
|
||||
@ApiModelProperty(value = "是否起点自动")
|
||||
private Boolean is_start_auto;
|
||||
|
||||
@ApiModelProperty(value = "是否终点自动")
|
||||
private Boolean is_next_auto;
|
||||
|
||||
@ApiModelProperty(value = "是否锁定起点")
|
||||
private Boolean is_lock_start;
|
||||
|
||||
@ApiModelProperty(value = "是否锁定终点")
|
||||
private Boolean is_lock_next;
|
||||
|
||||
@ApiModelProperty(value = "生成任务的请求参数")
|
||||
private String request_param;
|
||||
|
||||
@ApiModelProperty(value = "下发任务的请求参数")
|
||||
private String response_param;
|
||||
|
||||
@ApiModelProperty(value = "是否按组控制下发顺序")
|
||||
private Boolean is_group_congrol_issue_seq;
|
||||
|
||||
@ApiModelProperty(value = "任务未完成通知时间数")
|
||||
private BigDecimal unfinish_notify_time;
|
||||
|
||||
@ApiModelProperty(value = "sql配置")
|
||||
private String sql_param;
|
||||
|
||||
@ApiModelProperty(value = "车间编码")
|
||||
private String workshop_code;
|
||||
|
||||
@ApiModelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
@ApiModelProperty(value = "是否启用")
|
||||
private Boolean is_used;
|
||||
|
||||
@ApiModelProperty(value = "是否删除")
|
||||
private Boolean is_delete;
|
||||
|
||||
@ApiModelProperty(value = "创建人")
|
||||
private String create_id;
|
||||
|
||||
@ApiModelProperty(value = "创建人")
|
||||
private String create_name;
|
||||
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
private String create_time;
|
||||
|
||||
@ApiModelProperty(value = "修改人")
|
||||
private String update_id;
|
||||
|
||||
@ApiModelProperty(value = "修改人")
|
||||
private String update_name;
|
||||
|
||||
@ApiModelProperty(value = "修改时间")
|
||||
private String update_time;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.nl.wms.sch.task.service.dao.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.nl.wms.sch.task.service.dao.SchBaseTask;
|
||||
|
||||
/**
|
||||
* @author lyd
|
||||
* @date 2023-05-15
|
||||
**/
|
||||
public interface SchBaseTaskMapper extends BaseMapper<SchBaseTask> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!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">
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.nl.wms.sch.task.service.dao.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
|
||||
|
||||
/**
|
||||
* @author lyd
|
||||
* @date 2023-05-15
|
||||
**/
|
||||
public interface SchBaseTaskconfigMapper extends BaseMapper<SchBaseTaskconfig> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!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.SchBaseTaskconfigMapper">
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,113 @@
|
||||
package org.nl.wms.sch.task.service.dto;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import lombok.Data;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @description /
|
||||
* @author lyd
|
||||
* @date 2023-05-15
|
||||
**/
|
||||
@Data
|
||||
public class SchBaseTaskDto implements Serializable {
|
||||
|
||||
/** 任务编码 */
|
||||
private String task_code;
|
||||
|
||||
/** 任务分类 */
|
||||
private String task_class_id;
|
||||
|
||||
/** 任务状态 */
|
||||
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;
|
||||
|
||||
/** 载具类型 */
|
||||
private String vehicle_type;
|
||||
|
||||
/** 载具数量 */
|
||||
private BigDecimal vehicle_qty;
|
||||
|
||||
/** 载具编码 */
|
||||
private String vehicle_code;
|
||||
|
||||
/** 优先级 */
|
||||
private String priority;
|
||||
|
||||
/** 处理类 */
|
||||
private String handle_class;
|
||||
|
||||
/** 处理状态 */
|
||||
private String handle_status;
|
||||
|
||||
/** 车号 */
|
||||
private String car_no;
|
||||
|
||||
/** 是否自动下发 */
|
||||
private Boolean is_auto_issue;
|
||||
|
||||
/** 任务组标识 */
|
||||
private Long task_group_id;
|
||||
|
||||
/** 任务组顺序号 */
|
||||
private BigDecimal task_group_seq;
|
||||
|
||||
/** 任务完成类型 */
|
||||
private String finished_type;
|
||||
|
||||
/** 生成方式 */
|
||||
private String create_mode;
|
||||
|
||||
/** 链路标识 */
|
||||
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;
|
||||
|
||||
/** 修改人 */
|
||||
private String update_id;
|
||||
|
||||
/** 修改人 */
|
||||
private String update_name;
|
||||
|
||||
/** 修改时间 */
|
||||
private String update_time;
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.nl.wms.sch.task.service.dto;
|
||||
|
||||
import org.nl.common.domain.query.BaseQuery;
|
||||
import org.nl.wms.sch.task.service.dao.SchBaseTask;
|
||||
|
||||
/**
|
||||
* @author lyd
|
||||
* @date 2023-05-15
|
||||
**/
|
||||
public class SchBaseTaskQuery extends BaseQuery<SchBaseTask> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,125 @@
|
||||
package org.nl.wms.sch.task.service.dto;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import lombok.Data;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @description /
|
||||
* @author lyd
|
||||
* @date 2023-05-15
|
||||
**/
|
||||
@Data
|
||||
public class SchBaseTaskconfigDto implements Serializable {
|
||||
|
||||
/** 配置编码 */
|
||||
private String config_code;
|
||||
|
||||
/** 配置名称 */
|
||||
private String config_name;
|
||||
|
||||
/** 任务取放类型 */
|
||||
private String task_qf_type;
|
||||
|
||||
/** acs任务类型 */
|
||||
private String acs_task_type;
|
||||
|
||||
/** 任务名字 */
|
||||
private String task_name;
|
||||
|
||||
/** 任务类型 */
|
||||
private String task_type;
|
||||
|
||||
/** 优先级 */
|
||||
private String priority;
|
||||
|
||||
/** 允许最大任务生成数 */
|
||||
private BigDecimal task_create_num;
|
||||
|
||||
/** 允许最大任务下发数 */
|
||||
private BigDecimal task_issue_num;
|
||||
|
||||
/** 是否自动下发 */
|
||||
private Boolean is_auto_issue;
|
||||
|
||||
/** 起点区域配置 */
|
||||
private String start_region_str;
|
||||
|
||||
/** 终点区域配置 */
|
||||
private String next_region_str;
|
||||
|
||||
/** 起点点位前缀 */
|
||||
private String start_point_pre;
|
||||
|
||||
/** 终点点位前缀 */
|
||||
private String next_region_pre;
|
||||
|
||||
/** 是否校验工单 */
|
||||
private Boolean is_check_workorder;
|
||||
|
||||
/** 是否判断起点锁定 */
|
||||
private Boolean is_check_start_lock;
|
||||
|
||||
/** 是否立即创建 */
|
||||
private Boolean is_immediate_create;
|
||||
|
||||
/** 是否判断终点锁定 */
|
||||
private Boolean is_check_next_lock;
|
||||
|
||||
/** 是否起点自动 */
|
||||
private Boolean is_start_auto;
|
||||
|
||||
/** 是否终点自动 */
|
||||
private Boolean is_next_auto;
|
||||
|
||||
/** 是否锁定起点 */
|
||||
private Boolean is_lock_start;
|
||||
|
||||
/** 是否锁定终点 */
|
||||
private Boolean is_lock_next;
|
||||
|
||||
/** 生成任务的请求参数 */
|
||||
private String request_param;
|
||||
|
||||
/** 下发任务的请求参数 */
|
||||
private String response_param;
|
||||
|
||||
/** 是否按组控制下发顺序 */
|
||||
private Boolean is_group_congrol_issue_seq;
|
||||
|
||||
/** 任务未完成通知时间数 */
|
||||
private BigDecimal unfinish_notify_time;
|
||||
|
||||
/** sql配置 */
|
||||
private String sql_param;
|
||||
|
||||
/** 车间编码 */
|
||||
private String workshop_code;
|
||||
|
||||
/** 备注 */
|
||||
private String remark;
|
||||
|
||||
/** 是否启用 */
|
||||
private Boolean is_used;
|
||||
|
||||
/** 是否删除 */
|
||||
private Boolean is_delete;
|
||||
|
||||
/** 创建人 */
|
||||
private String create_id;
|
||||
|
||||
/** 创建人 */
|
||||
private String create_name;
|
||||
|
||||
/** 创建时间 */
|
||||
private String create_time;
|
||||
|
||||
/** 修改人 */
|
||||
private String update_id;
|
||||
|
||||
/** 修改人 */
|
||||
private String update_name;
|
||||
|
||||
/** 修改时间 */
|
||||
private String update_time;
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.nl.wms.sch.task.service.dto;
|
||||
|
||||
import org.nl.common.domain.query.BaseQuery;
|
||||
import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
|
||||
|
||||
/**
|
||||
* @author lyd
|
||||
* @date 2023-05-15
|
||||
**/
|
||||
public class SchBaseTaskconfigQuery extends BaseQuery<SchBaseTaskconfig> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,80 @@
|
||||
package org.nl.wms.sch.task.service.impl;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.nl.common.domain.query.PageQuery;
|
||||
import org.nl.common.exception.BadRequestException;
|
||||
import org.nl.common.utils.SecurityUtils;
|
||||
import org.nl.wms.sch.task.service.ISchBaseTaskService;
|
||||
import org.nl.wms.sch.task.service.dao.mapper.SchBaseTaskMapper;
|
||||
import org.nl.wms.sch.task.service.dao.SchBaseTask;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* @description 服务实现
|
||||
* @author lyd
|
||||
* @date 2023-05-15
|
||||
**/
|
||||
@Slf4j
|
||||
@Service
|
||||
public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBaseTask> implements ISchBaseTaskService {
|
||||
|
||||
@Autowired
|
||||
private SchBaseTaskMapper schBaseTaskMapper;
|
||||
|
||||
@Override
|
||||
public IPage<SchBaseTask> queryAll(Map whereJson, PageQuery page){
|
||||
LambdaQueryWrapper<SchBaseTask> lam = new LambdaQueryWrapper<>();
|
||||
IPage<SchBaseTask> pages = new Page<>(page.getPage() + 1, page.getSize());
|
||||
schBaseTaskMapper.selectPage(pages, lam);
|
||||
return pages;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void create(SchBaseTask entity) {
|
||||
String currentUserId = SecurityUtils.getCurrentUserId();
|
||||
String nickName = SecurityUtils.getCurrentNickName();
|
||||
String now = DateUtil.now();
|
||||
|
||||
entity.setTask_code(IdUtil.getSnowflake(1, 1).nextIdStr());
|
||||
entity.setCreate_id(currentUserId);
|
||||
entity.setCreate_name(nickName);
|
||||
entity.setCreate_time(now);
|
||||
entity.setUpdate_id(currentUserId);
|
||||
entity.setUpdate_name(nickName);
|
||||
entity.setUpdate_time(now);
|
||||
schBaseTaskMapper.insert(entity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void update(SchBaseTask entity) {
|
||||
SchBaseTask dto = schBaseTaskMapper.selectById(entity.getTask_code());
|
||||
if (dto == null) throw new BadRequestException("被删除或无权限,操作失败!");
|
||||
|
||||
String currentUserId = SecurityUtils.getCurrentUserId();
|
||||
String nickName = SecurityUtils.getCurrentNickName();
|
||||
String now = DateUtil.now();
|
||||
entity.setUpdate_id(currentUserId);
|
||||
entity.setUpdate_name(nickName);
|
||||
entity.setUpdate_time(now);
|
||||
|
||||
schBaseTaskMapper.updateById(entity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteAll(Set<String> ids) {
|
||||
// 真删除
|
||||
schBaseTaskMapper.deleteBatchIds(ids);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,80 @@
|
||||
package org.nl.wms.sch.task.service.impl;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.nl.common.domain.query.PageQuery;
|
||||
import org.nl.common.exception.BadRequestException;
|
||||
import org.nl.common.utils.SecurityUtils;
|
||||
import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
|
||||
import org.nl.wms.sch.task.service.dao.mapper.SchBaseTaskconfigMapper;
|
||||
import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* @description 服务实现
|
||||
* @author lyd
|
||||
* @date 2023-05-15
|
||||
**/
|
||||
@Slf4j
|
||||
@Service
|
||||
public class SchBaseTaskconfigServiceImpl extends ServiceImpl<SchBaseTaskconfigMapper, SchBaseTaskconfig> implements ISchBaseTaskconfigService {
|
||||
|
||||
@Autowired
|
||||
private SchBaseTaskconfigMapper schBaseTaskconfigMapper;
|
||||
|
||||
@Override
|
||||
public IPage<SchBaseTaskconfig> queryAll(Map whereJson, PageQuery page){
|
||||
LambdaQueryWrapper<SchBaseTaskconfig> lam = new LambdaQueryWrapper<>();
|
||||
IPage<SchBaseTaskconfig> pages = new Page<>(page.getPage() + 1, page.getSize());
|
||||
schBaseTaskconfigMapper.selectPage(pages, lam);
|
||||
return pages;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void create(SchBaseTaskconfig entity) {
|
||||
String currentUserId = SecurityUtils.getCurrentUserId();
|
||||
String nickName = SecurityUtils.getCurrentNickName();
|
||||
String now = DateUtil.now();
|
||||
|
||||
entity.setConfig_code(IdUtil.getSnowflake(1, 1).nextIdStr());
|
||||
entity.setCreate_id(currentUserId);
|
||||
entity.setCreate_name(nickName);
|
||||
entity.setCreate_time(now);
|
||||
entity.setUpdate_id(currentUserId);
|
||||
entity.setUpdate_name(nickName);
|
||||
entity.setUpdate_time(now);
|
||||
schBaseTaskconfigMapper.insert(entity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void update(SchBaseTaskconfig entity) {
|
||||
SchBaseTaskconfig dto = schBaseTaskconfigMapper.selectById(entity.getConfig_code());
|
||||
if (dto == null) throw new BadRequestException("被删除或无权限,操作失败!");
|
||||
|
||||
String currentUserId = SecurityUtils.getCurrentUserId();
|
||||
String nickName = SecurityUtils.getCurrentNickName();
|
||||
String now = DateUtil.now();
|
||||
entity.setUpdate_id(currentUserId);
|
||||
entity.setUpdate_name(nickName);
|
||||
entity.setUpdate_time(now);
|
||||
|
||||
schBaseTaskconfigMapper.updateById(entity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteAll(Set<String> ids) {
|
||||
// 真删除
|
||||
schBaseTaskconfigMapper.deleteBatchIds(ids);
|
||||
}
|
||||
|
||||
}
|
||||
240
nladmin-ui/src/views/wms/sch/task/config/index.vue
Normal file
240
nladmin-ui/src/views/wms/sch/task/config/index.vue
Normal file
@@ -0,0 +1,240 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<!--工具栏-->
|
||||
<div class="head-container">
|
||||
<!--如果想在工具栏加入更多按钮,可以使用插槽方式, 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="500px">
|
||||
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
|
||||
<el-form-item label="配置编码">
|
||||
<el-input v-model="form.config_code" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="配置名称">
|
||||
<el-input v-model="form.config_name" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="任务取放类型">
|
||||
<el-input v-model="form.task_qf_type" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="acs任务类型">
|
||||
<el-input v-model="form.acs_task_type" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="任务名字">
|
||||
<el-input v-model="form.task_name" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="任务类型">
|
||||
<el-input v-model="form.task_type" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="优先级">
|
||||
<el-input v-model="form.priority" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="允许最大任务生成数">
|
||||
<el-input v-model="form.task_create_num" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="允许最大任务下发数">
|
||||
<el-input v-model="form.task_issue_num" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否自动下发">
|
||||
<el-input v-model="form.is_auto_issue" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="起点区域配置">
|
||||
<el-input v-model="form.start_region_str" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="终点区域配置">
|
||||
<el-input v-model="form.next_region_str" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="起点点位前缀">
|
||||
<el-input v-model="form.start_point_pre" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="终点点位前缀">
|
||||
<el-input v-model="form.next_region_pre" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否校验工单">
|
||||
<el-input v-model="form.is_check_workorder" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否判断起点锁定">
|
||||
<el-input v-model="form.is_check_start_lock" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否立即创建">
|
||||
<el-input v-model="form.is_immediate_create" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否判断终点锁定">
|
||||
<el-input v-model="form.is_check_next_lock" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否起点自动">
|
||||
<el-input v-model="form.is_start_auto" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否终点自动">
|
||||
<el-input v-model="form.is_next_auto" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否锁定起点">
|
||||
<el-input v-model="form.is_lock_start" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否锁定终点">
|
||||
<el-input v-model="form.is_lock_next" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="生成任务的请求参数">
|
||||
<el-input v-model="form.request_param" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="下发任务的请求参数">
|
||||
<el-input v-model="form.response_param" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否按组控制下发顺序">
|
||||
<el-input v-model="form.is_group_congrol_issue_seq" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="任务未完成通知时间数">
|
||||
<el-input v-model="form.unfinish_notify_time" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="sql配置">
|
||||
<el-input v-model="form.sql_param" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="车间编码">
|
||||
<el-input v-model="form.workshop_code" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备注">
|
||||
<el-input v-model="form.remark" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否启用">
|
||||
<el-input v-model="form.is_used" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否删除">
|
||||
<el-input v-model="form.is_delete" style="width: 370px;" />
|
||||
</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>
|
||||
</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="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,'任务取放类型')"/>
|
||||
<el-table-column prop="acs_task_type" label="acs任务类型" :min-width="flexWidth('acs_task_type',crud.data,'acs任务类型')"/>
|
||||
<el-table-column prop="task_name" label="任务名字" :min-width="flexWidth('task_name',crud.data,'任务名字')"/>
|
||||
<el-table-column prop="task_type" label="任务类型" :min-width="flexWidth('task_type',crud.data,'任务类型')"/>
|
||||
<el-table-column prop="priority" label="优先级" :min-width="flexWidth('priority',crud.data,'优先级')"/>
|
||||
<el-table-column prop="task_create_num" label="允许最大任务生成数" :min-width="flexWidth('task_create_num',crud.data,'允许最大任务生成数')"/>
|
||||
<el-table-column prop="task_issue_num" label="允许最大任务下发数" :min-width="flexWidth('task_issue_num',crud.data,'允许最大任务下发数')"/>
|
||||
<el-table-column prop="is_auto_issue" label="是否自动下发" :min-width="flexWidth('is_auto_issue',crud.data,'是否自动下发')"/>
|
||||
<el-table-column prop="start_region_str" label="起点区域配置" :min-width="flexWidth('start_region_str',crud.data,'起点区域配置')"/>
|
||||
<el-table-column prop="next_region_str" label="终点区域配置" :min-width="flexWidth('next_region_str',crud.data,'终点区域配置')"/>
|
||||
<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 prop="is_check_workorder" label="是否校验工单" :min-width="flexWidth('is_check_workorder',crud.data,'是否校验工单')"/>
|
||||
<el-table-column prop="is_check_start_lock" label="是否判断起点锁定" :min-width="flexWidth('is_check_start_lock',crud.data,'是否判断起点锁定')"/>
|
||||
<el-table-column prop="is_immediate_create" label="是否立即创建" :min-width="flexWidth('is_immediate_create',crud.data,'是否立即创建')"/>
|
||||
<el-table-column prop="is_check_next_lock" label="是否判断终点锁定" :min-width="flexWidth('is_check_next_lock',crud.data,'是否判断终点锁定')"/>
|
||||
<el-table-column prop="is_start_auto" label="是否起点自动" :min-width="flexWidth('is_start_auto',crud.data,'是否起点自动')"/>
|
||||
<el-table-column prop="is_next_auto" label="是否终点自动" :min-width="flexWidth('is_next_auto',crud.data,'是否终点自动')"/>
|
||||
<el-table-column prop="is_lock_start" label="是否锁定起点" :min-width="flexWidth('is_lock_start',crud.data,'是否锁定起点')"/>
|
||||
<el-table-column prop="is_lock_next" label="是否锁定终点" :min-width="flexWidth('is_lock_next',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="is_group_congrol_issue_seq" label="是否按组控制下发顺序" :min-width="flexWidth('is_group_congrol_issue_seq',crud.data,'是否按组控制下发顺序')"/>
|
||||
<el-table-column prop="unfinish_notify_time" label="任务未完成通知时间数" :min-width="flexWidth('unfinish_notify_time',crud.data,'任务未完成通知时间数')"/>
|
||||
<el-table-column 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="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')"/>
|
||||
<el-table-column prop="is_delete" label="是否删除" :min-width="flexWidth('is_delete',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">
|
||||
<template slot-scope="scope">
|
||||
<udOperation
|
||||
:data="scope.row"
|
||||
:permission="permission"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import crudSchBaseTaskconfig from './schBaseTaskconfig'
|
||||
import CRUD, {crud, form, header, presenter} from '@crud/crud'
|
||||
import rrOperation from '@crud/RR.operation.vue'
|
||||
import crudOperation from '@crud/CRUD.operation.vue'
|
||||
import udOperation from '@crud/UD.operation.vue'
|
||||
import pagination from '@crud/Pagination.vue'
|
||||
|
||||
const defaultForm = {
|
||||
config_code: null,
|
||||
config_name: null,
|
||||
task_qf_type: null,
|
||||
acs_task_type: null,
|
||||
task_name: null,
|
||||
task_type: null,
|
||||
priority: null,
|
||||
task_create_num: null,
|
||||
task_issue_num: null,
|
||||
is_auto_issue: null,
|
||||
start_region_str: null,
|
||||
next_region_str: null,
|
||||
start_point_pre: null,
|
||||
next_region_pre: null,
|
||||
is_check_workorder: null,
|
||||
is_check_start_lock: null,
|
||||
is_immediate_create: null,
|
||||
is_check_next_lock: null,
|
||||
is_start_auto: null,
|
||||
is_next_auto: null,
|
||||
is_lock_start: null,
|
||||
is_lock_next: null,
|
||||
request_param: null,
|
||||
response_param: null,
|
||||
is_group_congrol_issue_seq: null,
|
||||
unfinish_notify_time: null,
|
||||
sql_param: null,
|
||||
workshop_code: null,
|
||||
remark: null,
|
||||
is_used: null,
|
||||
is_delete: null,
|
||||
create_id: null,
|
||||
create_name: null,
|
||||
create_time: null,
|
||||
update_id: null,
|
||||
update_name: null,
|
||||
update_time: null
|
||||
}
|
||||
export default {
|
||||
name: 'TaskConfig',
|
||||
components: { pagination, crudOperation, rrOperation, udOperation },
|
||||
mixins: [presenter(), header(), form(defaultForm), crud()],
|
||||
cruds() {
|
||||
return CRUD({
|
||||
title: '任务配置',
|
||||
url: 'api/schBaseTaskconfig',
|
||||
idField: 'config_code',
|
||||
sort: 'config_code,desc',
|
||||
crudMethod: { ...crudSchBaseTaskconfig }
|
||||
})
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
permission: {
|
||||
},
|
||||
rules: {
|
||||
} }
|
||||
},
|
||||
methods: {
|
||||
// 钩子:在获取表格数据之前执行,false 则代表不获取数据
|
||||
[CRUD.HOOK.beforeRefresh]() {
|
||||
return true
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
@@ -0,0 +1,27 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
export function add(data) {
|
||||
return request({
|
||||
url: 'api/schBaseTaskconfig',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function del(ids) {
|
||||
return request({
|
||||
url: 'api/schBaseTaskconfig/',
|
||||
method: 'delete',
|
||||
data: ids
|
||||
})
|
||||
}
|
||||
|
||||
export function edit(data) {
|
||||
return request({
|
||||
url: 'api/schBaseTaskconfig',
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export default { add, edit, del }
|
||||
216
nladmin-ui/src/views/wms/sch/task/index.vue
Normal file
216
nladmin-ui/src/views/wms/sch/task/index.vue
Normal file
@@ -0,0 +1,216 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<!--工具栏-->
|
||||
<div class="head-container">
|
||||
<!--如果想在工具栏加入更多按钮,可以使用插槽方式, 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="500px">
|
||||
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
|
||||
<el-form-item label="任务编码">
|
||||
<el-input v-model="form.task_code" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="任务分类">
|
||||
<el-input v-model="form.task_class_id" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="任务状态">
|
||||
<el-input v-model="form.task_status" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="配置编码">
|
||||
<el-input v-model="form.config_code" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="点位1">
|
||||
<el-input v-model="form.point_code1" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="点位2">
|
||||
<el-input v-model="form.point_code2" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="点位3">
|
||||
<el-input v-model="form.point_code3" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="点位4">
|
||||
<el-input v-model="form.point_code4" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="载具类型">
|
||||
<el-input v-model="form.vehicle_type" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="载具数量">
|
||||
<el-input v-model="form.vehicle_qty" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="载具编码">
|
||||
<el-input v-model="form.vehicle_code" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="优先级">
|
||||
<el-input v-model="form.priority" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="处理类">
|
||||
<el-input v-model="form.handle_class" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="处理状态">
|
||||
<el-input v-model="form.handle_status" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="车号">
|
||||
<el-input v-model="form.car_no" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否自动下发">
|
||||
<el-input v-model="form.is_auto_issue" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="任务组标识">
|
||||
<el-input v-model="form.task_group_id" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="任务组顺序号">
|
||||
<el-input v-model="form.task_group_seq" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="任务完成类型">
|
||||
<el-input v-model="form.finished_type" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="生成方式">
|
||||
<el-input v-model="form.create_mode" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="链路标识">
|
||||
<el-input v-model="form.acs_trace_id" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="生成任务的请求参数">
|
||||
<el-input v-model="form.request_param" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="下发任务的请求参数">
|
||||
<el-input v-model="form.response_param" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="车间编码">
|
||||
<el-input v-model="form.workshop_code" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="额外组盘信息">
|
||||
<el-input v-model="form.ext_group_data" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备注">
|
||||
<el-input v-model="form.remark" style="width: 370px;" />
|
||||
</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>
|
||||
</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="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="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="点位2" :min-width="flexWidth('point_code2',crud.data,'点位2')"/>
|
||||
<el-table-column prop="point_code3" label="点位3" :min-width="flexWidth('point_code3',crud.data,'点位3')"/>
|
||||
<el-table-column prop="point_code4" label="点位4" :min-width="flexWidth('point_code4',crud.data,'点位4')"/>
|
||||
<el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型')"/>
|
||||
<el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')"/>
|
||||
<el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')"/>
|
||||
<el-table-column prop="priority" label="优先级" :min-width="flexWidth('priority',crud.data,'优先级')"/>
|
||||
<el-table-column prop="handle_class" label="处理类" :min-width="flexWidth('handle_class',crud.data,'处理类')"/>
|
||||
<el-table-column 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="is_auto_issue" label="是否自动下发" :min-width="flexWidth('is_auto_issue',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="create_mode" label="生成方式" :min-width="flexWidth('create_mode',crud.data,'生成方式')"/>
|
||||
<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="remark" label="备注" :min-width="flexWidth('remark',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">
|
||||
<template slot-scope="scope">
|
||||
<udOperation
|
||||
:data="scope.row"
|
||||
:permission="permission"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import crudSchBaseTask from './schBaseTask'
|
||||
import CRUD, {crud, form, header, presenter} from '@crud/crud'
|
||||
import rrOperation from '@crud/RR.operation'
|
||||
import crudOperation from '@crud/CRUD.operation'
|
||||
import udOperation from '@crud/UD.operation'
|
||||
import pagination from '@crud/Pagination'
|
||||
|
||||
const defaultForm = {
|
||||
task_code: null,
|
||||
task_class_id: null,
|
||||
task_status: null,
|
||||
config_code: null,
|
||||
point_code1: null,
|
||||
point_code2: null,
|
||||
point_code3: null,
|
||||
point_code4: null,
|
||||
vehicle_type: null,
|
||||
vehicle_qty: null,
|
||||
vehicle_code: null,
|
||||
priority: null,
|
||||
handle_class: null,
|
||||
handle_status: null,
|
||||
car_no: null,
|
||||
is_auto_issue: null,
|
||||
task_group_id: null,
|
||||
task_group_seq: null,
|
||||
finished_type: null,
|
||||
create_mode: null,
|
||||
acs_trace_id: null,
|
||||
request_param: null,
|
||||
response_param: null,
|
||||
workshop_code: null,
|
||||
ext_group_data: null,
|
||||
remark: null,
|
||||
is_delete: null,
|
||||
create_id: null,
|
||||
create_name: null,
|
||||
create_time: null,
|
||||
update_id: null,
|
||||
update_name: null,
|
||||
update_time: null
|
||||
}
|
||||
export default {
|
||||
name: 'Task',
|
||||
components: { pagination, crudOperation, rrOperation, udOperation },
|
||||
mixins: [presenter(), header(), form(defaultForm), crud()],
|
||||
cruds() {
|
||||
return CRUD({
|
||||
title: '任务管理',
|
||||
url: 'api/schBaseTask',
|
||||
idField: 'task_code',
|
||||
sort: 'task_code,desc',
|
||||
crudMethod: { ...crudSchBaseTask }
|
||||
})
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
permission: {
|
||||
},
|
||||
rules: {
|
||||
} }
|
||||
},
|
||||
methods: {
|
||||
// 钩子:在获取表格数据之前执行,false 则代表不获取数据
|
||||
[CRUD.HOOK.beforeRefresh]() {
|
||||
return true
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
27
nladmin-ui/src/views/wms/sch/task/schBaseTask.js
Normal file
27
nladmin-ui/src/views/wms/sch/task/schBaseTask.js
Normal file
@@ -0,0 +1,27 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
export function add(data) {
|
||||
return request({
|
||||
url: 'api/schBaseTask',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function del(ids) {
|
||||
return request({
|
||||
url: 'api/schBaseTask/',
|
||||
method: 'delete',
|
||||
data: ids
|
||||
})
|
||||
}
|
||||
|
||||
export function edit(data) {
|
||||
return request({
|
||||
url: 'api/schBaseTask',
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export default { add, edit, del }
|
||||
Reference in New Issue
Block a user