Merge remote-tracking branch 'origin/dev' into dev
汪云昊
5 years ago
commit
517eef8e66
@ -0,0 +1,23 @@
|
||||
package cn.estsh.i3plus.pojo.model.wms;
|
||||
|
||||
import cn.estsh.i3plus.pojo.model.wms.engine.domain.WmsThreeDimenLocateModel;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description 3D仓库-库位优化模型
|
||||
* @Reference
|
||||
* @Author dragon
|
||||
* @CreateDate 2020/6/1 14:22
|
||||
* @Modify
|
||||
*/
|
||||
@Data
|
||||
public class WmsLocateListModel implements Serializable {
|
||||
private static final long serialVersionUID = -2672721389336190491L;
|
||||
|
||||
List<WmsThreeDimenLocateModel> unsolvedLocates;
|
||||
|
||||
String organizeCode;
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
package cn.estsh.i3plus.pojo.model.wms.engine.domain;
|
||||
|
||||
|
||||
import java.util.Comparator;
|
||||
|
||||
public class LocateStrengthComparator implements Comparator<WmsThreeDimenLocateModel> {
|
||||
@Override
|
||||
public int compare(WmsThreeDimenLocateModel o1, WmsThreeDimenLocateModel o2) {
|
||||
return o1.getFrequency() - o2.getFrequency();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
package cn.estsh.i3plus.pojo.model.wms.engine.domain;
|
||||
|
||||
|
||||
import java.util.Comparator;
|
||||
|
||||
public class LocationStrengthComparator implements Comparator<Integer> {
|
||||
@Override
|
||||
public int compare(Integer seq1, Integer seq2) {
|
||||
return seq1 - seq2;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,103 @@
|
||||
package cn.estsh.i3plus.pojo.wms.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Index;
|
||||
import javax.persistence.Table;
|
||||
|
||||
|
||||
/**
|
||||
* @Description : 北京海纳川任务明细
|
||||
* @Reference :
|
||||
* @Author : puxiao.liao
|
||||
* @CreateDate : 2018-11-17 14:50
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@Table(name = "WMS_AUTO_FORK_CALL_BACK_DETAILS", indexes = {
|
||||
@Index(columnList = "TASK_CODE")
|
||||
})
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api(value = "无人叉车任务明细", description = "喜德无人叉车任务明细")
|
||||
public class WmsAutoForkCallBackDetails extends BaseBean {
|
||||
private static final long serialVersionUID = -8103992000562208799L;
|
||||
|
||||
@Column(name = "REQ_CODE")
|
||||
@ApiParam(value = "请求编号")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String reqCode;
|
||||
|
||||
|
||||
@Column(name = "REQ_TIME")
|
||||
@ApiParam(value = "请求时间")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String reqTime;
|
||||
|
||||
@Column(name = "CLIENT_CODE")
|
||||
@ApiParam(value = "客服端编号")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String clientCode;
|
||||
|
||||
@Column(name = "TOKEN_CODE")
|
||||
@ApiParam(value = "令牌号")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String tokenCode;
|
||||
|
||||
@Column(name = "INTERFACE_NAME")
|
||||
@ApiParam(value = "接口名称")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String interfaceName;
|
||||
|
||||
@Column(name = "METHOD")
|
||||
@ApiParam(value = "方法名称")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String method;
|
||||
|
||||
@Column(name = "TASK_CODE")
|
||||
@ApiParam(value = "任务单号")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String taskCode;
|
||||
|
||||
@Column(name = "WB_CODE")
|
||||
@ApiParam(value = "工作为")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String wbCode;
|
||||
|
||||
@Column(name = "POD_CODE")
|
||||
@ApiParam(value = "货架编号")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String podCode;
|
||||
|
||||
@Column(name = "CURRENT_POSITION_CODE")
|
||||
@ApiParam(value = "子任务的位置编号")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String currentPositionCode;
|
||||
|
||||
@Column(name = "ROBOT_CODE")
|
||||
@ApiParam(value = "执行任务的VGA编号")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String robotCode;
|
||||
|
||||
//10=新建,20=已处理,30=处理出错
|
||||
@Column(name = "STATUS", nullable = false)
|
||||
@ApiParam("处理标准")
|
||||
public Integer status;
|
||||
|
||||
@Column(name = "REMARK", nullable = false)
|
||||
@ApiParam("备注")
|
||||
public String remark;
|
||||
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
package cn.estsh.i3plus.pojo.wms.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsAutoForkCallBackDetails;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
|
||||
/**
|
||||
* @Description :北京海纳川回调任务明细
|
||||
* @Reference :
|
||||
* @Author : puxiao.lioa
|
||||
* @CreateDate : 2018-11-13 10:19
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface WmsAutoForkCallBackDetailsRepository extends BaseRepository<WmsAutoForkCallBackDetails, Long> {
|
||||
}
|
||||
Loading…
Reference in New Issue