缓存区修改
This commit is contained in:
parent
2f6da2b491
commit
d3eac2db10
@ -61,4 +61,22 @@ public class WarehouseParam extends BaseParam {
|
||||
*/
|
||||
@ApiModelProperty(value = "描述",required = true, example = "1")
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* 英文名称
|
||||
*/
|
||||
@ApiModelProperty(value = "英文名称",required = false, example = "1")
|
||||
private String englishName;
|
||||
|
||||
/**
|
||||
* 别名
|
||||
*/
|
||||
@ApiModelProperty(value = "英文名称",required = false, example = "1")
|
||||
private String aliasName;
|
||||
|
||||
/**
|
||||
* 库位数量
|
||||
*/
|
||||
@ApiModelProperty(value = "英文名称",required = true, example = "1")
|
||||
private Integer number;
|
||||
}
|
||||
|
||||
@ -57,4 +57,21 @@ public class WarehouseVo extends BaseVo implements PageVo.ConvertVo{
|
||||
*/
|
||||
@ApiModelProperty(value = "描述信息", example = "1")
|
||||
private String description;
|
||||
/**
|
||||
* 英文名称
|
||||
*/
|
||||
@ApiModelProperty(value = "英文名称",example = "1")
|
||||
private String englishName;
|
||||
|
||||
/**
|
||||
* 别名
|
||||
*/
|
||||
@ApiModelProperty(value = "英文名称",example = "1")
|
||||
private String aliasName;
|
||||
|
||||
/**
|
||||
* 库位数量
|
||||
*/
|
||||
@ApiModelProperty(value = "英文名称",example = "1")
|
||||
private Integer number;
|
||||
}
|
||||
|
||||
@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
|
||||
* </p>
|
||||
*
|
||||
* @author mt
|
||||
* @since 2021-11-18
|
||||
* @since 2021-12-10
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ -71,7 +71,7 @@ public class Warehouse extends Model<Warehouse> {
|
||||
private String version;
|
||||
|
||||
/**
|
||||
* 状态 0初始化
|
||||
* 状态 0初始化，1已占用
|
||||
*/
|
||||
@TableField("status")
|
||||
private Integer status;
|
||||
@ -118,6 +118,24 @@ public class Warehouse extends Model<Warehouse> {
|
||||
@TableField("note")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 英文名称
|
||||
*/
|
||||
@TableField("english_name")
|
||||
private String englishName;
|
||||
|
||||
/**
|
||||
* 别名
|
||||
*/
|
||||
@TableField("alias_name")
|
||||
private String aliasName;
|
||||
|
||||
/**
|
||||
* 库位数量
|
||||
*/
|
||||
@TableField("number")
|
||||
private Integer number;
|
||||
|
||||
|
||||
public static final String ID = "id";
|
||||
|
||||
@ -149,6 +167,12 @@ public class Warehouse extends Model<Warehouse> {
|
||||
|
||||
public static final String NOTE = "note";
|
||||
|
||||
public static final String ENGLISH_NAME = "english_name";
|
||||
|
||||
public static final String ALIAS_NAME = "alias_name";
|
||||
|
||||
public static final String NUMBER = "number";
|
||||
|
||||
@Override
|
||||
protected Serializable pkVal() {
|
||||
return this.id;
|
||||
|
||||
@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
* </p>
|
||||
*
|
||||
* @author mt
|
||||
* @since 2021-11-18
|
||||
* @since 2021-12-10
|
||||
*/
|
||||
public interface WarehouseMapper extends BaseMapper<Warehouse> {
|
||||
|
||||
|
||||
@ -19,11 +19,14 @@
|
||||
<result column="spec" property="spec" />
|
||||
<result column="description" property="description" />
|
||||
<result column="note" property="note" />
|
||||
<result column="english_name" property="englishName" />
|
||||
<result column="alias_name" property="aliasName" />
|
||||
<result column="number" property="number" />
|
||||
</resultMap>
|
||||
|
||||
<!-- 通用查询结果列 -->
|
||||
<sql id="Base_Column_List">
|
||||
id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, code, factory_id, warehouse_name, spec, description, note
|
||||
id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, code, factory_id, warehouse_name, spec, description, note, english_name, alias_name, number
|
||||
</sql>
|
||||
|
||||
</mapper>
|
||||
|
||||
@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
||||
* </p>
|
||||
*
|
||||
* @author mt
|
||||
* @since 2021-11-18
|
||||
* @since 2021-12-10
|
||||
*/
|
||||
public interface WarehouseServiceBiz extends IService<Warehouse> {
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
|
||||
* </p>
|
||||
*
|
||||
* @author mt
|
||||
* @since 2021-11-18
|
||||
* @since 2021-12-10
|
||||
*/
|
||||
@Service
|
||||
public class WarehouseServiceBizImpl extends ServiceImpl<WarehouseMapper, Warehouse> implements WarehouseServiceBiz {
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
package com.mt.wms.empty.task;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Author: liguanghao
|
||||
* @Date: 2021/12/1 16:56
|
||||
* @Version 1.0
|
||||
*/
|
||||
public class TaskDistanceUtils {
|
||||
/**
|
||||
*计算各个空闲小车执行此任务的路径长度，传入任务起终点，返回一个小车ID
|
||||
*/
|
||||
public static Long chooseVehicle(String startPoint,String endPoint){
|
||||
//计算任务起点到终点的距离
|
||||
|
||||
//计算空闲小车当前位置到起点的距离
|
||||
|
||||
//计算得出总距离最短的小车
|
||||
|
||||
return null;
|
||||
}
|
||||
/**
|
||||
* 计算正在执行任务的小车本次任务的剩余路径经过的点位集合
|
||||
*/
|
||||
public static List getPointList(){
|
||||
//获取小车当前位置
|
||||
|
||||
//计算小车当前位置到任务起点-任务起点到任务终点的路径点集合
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package com.mt.wms.empty.task;
|
||||
|
||||
/**
|
||||
* @Author: liguanghao
|
||||
* @Date: 2021/12/1 16:38
|
||||
* @Version 1.0
|
||||
*/
|
||||
//计算车辆路径是否冲突的方法，若只有一辆车空闲，计算是否冲突，
|
||||
// 若两辆车都空闲且路径冲突，离起点近的那辆车计算避让出起点的距离，离终点近的那辆车计算出避让出终点的距离，取小
|
||||
public class VehicleCollisionUtils {
|
||||
//获取当前车辆执行任务的路径，与其他正在执行任务的车辆路径对比
|
||||
//根据点坐标的最大最小值确定任务需要经过的点的集合，再根据车辆自身大小加上安全距离包含的点位
|
||||
//比较两个集合是否有相同元素
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user