Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
陈思洁
5 years ago
commit
35fdc95250
@ -0,0 +1,63 @@
|
||||
package cn.estsh.i3plus.pojo.mes.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
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.*;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: jessica.chen
|
||||
* @CreateDate:
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_BLIND_HISTORY")
|
||||
@Api("MES_盲检记录")
|
||||
public class MesBlindHistory extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = -7459452475180601499L;
|
||||
|
||||
@Column(name = "SERIAL_NUMBER")
|
||||
@ApiParam("产品条码")
|
||||
private String serialNumber;
|
||||
|
||||
@Column(name = "BLIND_OBJECT")
|
||||
@ApiParam("盲检对象")
|
||||
private String blindObject;
|
||||
|
||||
@Column(name = "BLIND_ITEM")
|
||||
@ApiParam("盲检问题")
|
||||
private String blindItem;
|
||||
|
||||
@Column(name = "SYSTEM_ANSWER")
|
||||
@ApiParam("系统答案")
|
||||
private String systemAnswer;
|
||||
|
||||
@Column(name = "CHOOSED_ANSWER")
|
||||
@ApiParam("选中答案")
|
||||
private String choosedAnswer;
|
||||
|
||||
@Column(name = "CHECKED")
|
||||
@ApiParam("是否一致")
|
||||
private Integer checked;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam("工作单元代码")
|
||||
private String workCellCode;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
}
|
||||
@ -0,0 +1,65 @@
|
||||
package cn.estsh.i3plus.pojo.mes.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
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.Table;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: jessica.chen
|
||||
* @CreateDate:
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_BLIND_RULE")
|
||||
@Api("MES_盲检规则")
|
||||
public class MesBlindRule extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = -7459452475180601498L;
|
||||
|
||||
@Column(name = "RULE_ID")
|
||||
@ApiParam("匹配规则ID")
|
||||
private String ruleId;
|
||||
|
||||
@Column(name = "CAR_TYPE")
|
||||
@ApiParam("车辆类型")
|
||||
private String carType;
|
||||
|
||||
@Column(name = "CAR_COLOR")
|
||||
@ApiParam("车辆颜色")
|
||||
private String carColor;
|
||||
|
||||
@Column(name = "PART_CODE")
|
||||
@ApiParam("零件号")
|
||||
private String partCode;
|
||||
|
||||
@Column(name = "PART_NAME")
|
||||
@ApiParam("零件名称")
|
||||
private String partName;
|
||||
|
||||
@Column(name = "CAR_CONFIG")
|
||||
@ApiParam("配置")
|
||||
private String carConfig;
|
||||
|
||||
@Column(name = "CAR_LEVEL")
|
||||
@ApiParam("等级")
|
||||
private String carLevel;
|
||||
|
||||
@Column(name = "PART_COLOR")
|
||||
@ApiParam("零件颜色")
|
||||
private String partColor;
|
||||
|
||||
}
|
||||
@ -0,0 +1,65 @@
|
||||
package cn.estsh.i3plus.pojo.mes.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
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.Table;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: jessica.chen
|
||||
* @CreateDate:
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_BLIND_TOPIC_SETTING")
|
||||
@Api("MES_盲检问题设置")
|
||||
public class MesBlindTopicSetting extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = -7459452475180601497L;
|
||||
|
||||
@Column(name = "TOPIC_ID")
|
||||
@ApiParam("序号")
|
||||
private String topicId;
|
||||
|
||||
@Column(name = "TOPIC_CODE")
|
||||
@ApiParam("题目编号")
|
||||
private String topicCode;
|
||||
|
||||
@Column(name = "TOPIC_DESC")
|
||||
@ApiParam("题目描述")
|
||||
private String topicDesc;
|
||||
|
||||
@Column(name = "TOPIC_OBJECT")
|
||||
@ApiParam("零件名称")
|
||||
private String topicObject;
|
||||
|
||||
@Column(name = "TOPIC_TYPE")
|
||||
@ApiParam("盲检类型")
|
||||
private Integer topicType;
|
||||
|
||||
@Column(name = "QTY")
|
||||
@ApiParam("答案数量")
|
||||
private Integer qty;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam("工作单元代码")
|
||||
private String workCellCode;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
}
|
||||
@ -0,0 +1,81 @@
|
||||
package cn.estsh.i3plus.pojo.mes.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
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.Table;
|
||||
import javax.persistence.Transient;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: jokelin
|
||||
* @Date: 2020/5/27 2:20 下午
|
||||
* @Modify:
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_GUN_CALIBRATION_RECORD")
|
||||
@Api("校枪记录表")
|
||||
public class MesGunCalibrationRecord extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -6166370020956801528L;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam("工作单元代码")
|
||||
private String workCellCode;
|
||||
|
||||
@Column(name = "GUN_CODE")
|
||||
@ApiParam("枪号")
|
||||
private String gunCode;
|
||||
|
||||
@Column(name = "CUN_TYPE")
|
||||
@ApiParam("扭矩枪类型")
|
||||
private String cunType;
|
||||
|
||||
@Column(name = "PSET_CODE")
|
||||
@ApiParam("PSET号")
|
||||
private String psetCode;
|
||||
|
||||
@Column(name = "EXPECT_COUNT")
|
||||
@ApiParam("设定枪数")
|
||||
private Integer expectCount;
|
||||
|
||||
@Column(name = "REAL_COUNT")
|
||||
@ApiParam("实际枪叔")
|
||||
private Integer realCount;
|
||||
|
||||
@Column(name = "CALIBRATION_STATUS")
|
||||
@ApiParam("校枪状态")
|
||||
private Integer calibrationStatus;
|
||||
|
||||
@Column(name = "START_TIME")
|
||||
@ApiParam("开始校枪时间")
|
||||
private String startTime;
|
||||
|
||||
@Column(name = "END_TIME")
|
||||
@ApiParam("结束校枪时间")
|
||||
private String endTime;
|
||||
|
||||
@Transient
|
||||
@ApiParam("校枪状态名称")
|
||||
private String calibrationStatusName;
|
||||
|
||||
@Transient
|
||||
@ApiParam("界面编号")
|
||||
private String windowNo;
|
||||
}
|
||||
@ -0,0 +1,67 @@
|
||||
package cn.estsh.i3plus.pojo.mes.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
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.Table;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/5/28 14:32
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_PRODUCE_ERROR_RECORD")
|
||||
@Api("生产异常操作记录")
|
||||
public class MesProduceErrorRecord extends BaseBean {
|
||||
private static final long serialVersionUID = 209753108845613052L;
|
||||
|
||||
@Column(name = "ERROR_TYPE")
|
||||
@ApiParam("异常类型 10:工序跳过 20:工步跳过")
|
||||
private Integer errorType;
|
||||
|
||||
@Column(name = "SERIAL_NUMBER")
|
||||
@ApiParam("过程条码")
|
||||
private String serialNumber;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "PART_NAME_RDD")
|
||||
@ApiParam("物料名称")
|
||||
private String partNameRdd;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("产线代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam("工位代码")
|
||||
private String workCellCode;
|
||||
|
||||
@Column(name = "PROCESS_CODE")
|
||||
@ApiParam("工序代码")
|
||||
private String processCode;
|
||||
|
||||
@Column(name = "STEP_CODE")
|
||||
@ApiParam("工步代码")
|
||||
private String stepCode;
|
||||
|
||||
@Column(name = "STATUS_CODE")
|
||||
@ApiParam("状态点代码")
|
||||
private String statusCode;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 盲检问题清单
|
||||
* @Reference :
|
||||
* @author: jessica.chen
|
||||
* @date: 2020/4/16 17:10
|
||||
* @Modify:
|
||||
*/
|
||||
|
||||
@Data
|
||||
@Api(value="盲检问题清单",description = "盲检问题清单")
|
||||
public class MesBlindProbleModel extends BaseBean {
|
||||
|
||||
private static final long serialVersionUID = 5790342327875844345L;
|
||||
@ApiParam(value = "零件名称")
|
||||
private String partName;
|
||||
|
||||
@ApiParam(value = "提问内容")
|
||||
private String questionContents;
|
||||
|
||||
@ApiParam(value = "答案集合")
|
||||
private List<String> answerList;
|
||||
|
||||
@ApiParam(value = "正确答案")
|
||||
private String rightKey;
|
||||
}
|
||||
@ -0,0 +1,53 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description : 盲检规则模板
|
||||
* @Reference :
|
||||
* @author: jessica.chen
|
||||
* @date: 2020/4/16 17:10
|
||||
* @Modify:
|
||||
*/
|
||||
|
||||
@Data
|
||||
@Api(value="盲检规则模板",description = "盲检规则模板")
|
||||
public class MesBlindRuleModel extends BaseBean {
|
||||
|
||||
private static final long serialVersionUID = 5790342327875844321L;
|
||||
@ApiParam(value = "车辆类型")
|
||||
@AnnoOutputColumn
|
||||
private String carType;
|
||||
|
||||
@ApiParam(value = "车辆颜色")
|
||||
@AnnoOutputColumn
|
||||
private String carColor;
|
||||
|
||||
@ApiParam(value = "零件号")
|
||||
private String partCode;
|
||||
|
||||
@ApiParam(value = "零件名称")
|
||||
@AnnoOutputColumn
|
||||
private String partName;
|
||||
|
||||
@ApiParam(value = "配置")
|
||||
@AnnoOutputColumn
|
||||
private String carConfig;
|
||||
|
||||
@ApiParam(value = "等级")
|
||||
@AnnoOutputColumn
|
||||
private String carLevel;
|
||||
|
||||
@ApiParam(value = "零件颜色")
|
||||
@AnnoOutputColumn
|
||||
private String partColor;
|
||||
|
||||
@ApiParam(value = "下标")
|
||||
@AnnoOutputColumn
|
||||
private Integer index;
|
||||
|
||||
}
|
||||
@ -0,0 +1,57 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: adair.song
|
||||
* @Date: 2020/05/22 14:24
|
||||
* @Modify:
|
||||
*/
|
||||
@Data
|
||||
public class ProductInfoManageModel {
|
||||
|
||||
@ApiParam("过程条码")
|
||||
private String serialNumber;
|
||||
|
||||
@ApiParam("VIN号")
|
||||
private String vinCode;
|
||||
|
||||
@ApiParam("车型")
|
||||
private String prodCfgTypeCode;
|
||||
|
||||
@ApiParam("等级代码")
|
||||
private String gradeCode;
|
||||
|
||||
@ApiParam("产品颜色")
|
||||
private String produceColor;
|
||||
|
||||
@ApiParam("产品位置")
|
||||
private String produceCategoryCode;
|
||||
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam("物料名称")
|
||||
private String partNameRdd;
|
||||
|
||||
@ApiParam("产品条码")
|
||||
private String productSn;
|
||||
|
||||
@ApiParam("队列明细序号")
|
||||
private Double seq;
|
||||
|
||||
@ApiParam("条码状态")
|
||||
private Integer snStatus;
|
||||
|
||||
@ApiParam("质量状态")
|
||||
private Integer qcStatus;
|
||||
|
||||
@ApiParam("下线时间")
|
||||
private String outWorkCenterTime;
|
||||
|
||||
@ApiParam("切换时间")
|
||||
private String switchTime;
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesQueueShippingDetail;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/5/26 18:59
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@Api("散件队列发运model")
|
||||
public class SpQueueShippingModel {
|
||||
|
||||
@ApiParam("队列编号")
|
||||
private String jitNo;
|
||||
|
||||
@ApiParam("vin")
|
||||
private String vin;
|
||||
|
||||
@ApiParam("车号")
|
||||
private String carNo;
|
||||
|
||||
@ApiParam("等级代码")
|
||||
private String gradeCode;
|
||||
|
||||
@ApiParam("产品颜色")
|
||||
private Double produceColor;
|
||||
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesBlindHistory;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: jessica.chen
|
||||
* @CreateDate: 2019\11\18 10:34
|
||||
* @Modify:
|
||||
**/
|
||||
public interface MesBlindHistoryRepository extends BaseRepository<MesBlindHistory, Long> {
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesBlindRule;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: jessica.chen
|
||||
* @CreateDate: 2019\11\18 10:34
|
||||
* @Modify:
|
||||
**/
|
||||
public interface MesBlindRuleRepository extends BaseRepository<MesBlindRule, Long> {
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesBlindHistory;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesBlindTopicSetting;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: jessica.chen
|
||||
* @CreateDate: 2019\11\18 10:34
|
||||
* @Modify:
|
||||
**/
|
||||
public interface MesBlindTopicSettingRepository extends BaseRepository<MesBlindTopicSetting, Long> {
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesGunCalibrationRecord;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: jokelin
|
||||
* @Date: 2020/5/27 2:39 下午
|
||||
* @Modify:
|
||||
*/
|
||||
public interface MesGunCalibrationRecordRepository extends BaseRepository<MesGunCalibrationRecord, Long> {
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesProduceErrorRecord;
|
||||
|
||||
/**
|
||||
* @Description :IF_JIT发运数据
|
||||
* @Reference :
|
||||
* @Author : qianhuasheng
|
||||
* @CreateDate : 2020-03-06 10:57 上午
|
||||
* @Modify:
|
||||
**/
|
||||
public interface MesProduceErrorRecordRepository extends BaseRepository<MesProduceErrorRecord, Long> {
|
||||
}
|
||||
@ -0,0 +1,64 @@
|
||||
package cn.estsh.i3plus.pojo.ptl.bean;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
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.Lob;
|
||||
import javax.persistence.Table;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @author wangjie
|
||||
* @date 2020/2/12 17:41
|
||||
* @desc
|
||||
*/
|
||||
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@Table(name = "PTL_ROUTE_STATUS_ERROR_RECORD")
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api("流程状态异常记录")
|
||||
public class PtlRouteStatusErrorRecord extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 4507582337334278877L;
|
||||
|
||||
@Column(name = "ROUTE_CODE")
|
||||
@ApiParam("流程代码")
|
||||
private String routeCode;
|
||||
|
||||
@Column(name = "STATUS_CODE")
|
||||
@ApiParam("状态代码")
|
||||
private String statusCode;
|
||||
|
||||
@Column(name = "TASK_NO")
|
||||
@ApiParam("主任务编号")
|
||||
private String taskNo;
|
||||
|
||||
@Column(name = "ERROR_DESC")
|
||||
@ApiParam(value = "失败描述")
|
||||
public String errorDesc;
|
||||
|
||||
@Column(name = "AREA_NO")
|
||||
@ApiParam("区域代码")
|
||||
private String areaNo;
|
||||
|
||||
@Column(name = "CACHE_FLAG")
|
||||
@ApiParam(value = "缓存标识")
|
||||
private Integer cacheFlag;
|
||||
|
||||
@Lob
|
||||
@Column(name = "CONTENT")
|
||||
@ApiParam(value = "内容")
|
||||
private String content;
|
||||
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.ptl.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteStatusErrorRecord;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface PtlRouteStatusErrorRecordRepository extends BaseRepository<PtlRouteStatusErrorRecord, Long> {
|
||||
}
|
||||
@ -0,0 +1,162 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
import javax.persistence.Version;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-05-27
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Table(name = "SWEB_DOC_MOVEMENT_DETAILS")
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api("移库单-明细")
|
||||
public class SwebDocMovementDetails extends BaseBean {
|
||||
private static final long serialVersionUID = -1232334350341792942L;
|
||||
|
||||
@ApiParam("供应商编号")
|
||||
@Column(name = "VENDOR_CODE")
|
||||
private String vendorCode;
|
||||
|
||||
@ApiParam("供应商名称")
|
||||
@Column(name = "VENDOR_NAME")
|
||||
private String vendorName;
|
||||
|
||||
@Column(name = "DEST_AREA_NO")
|
||||
@ApiParam("目的库存地代码")
|
||||
public String destAreaNo;
|
||||
|
||||
@Column(name = "DEST_WH_NO")
|
||||
@ApiParam("目标仓库代码")
|
||||
public String destWhNo;
|
||||
|
||||
@Column(name = "DEST_ZONE_NO")
|
||||
@ApiParam("目标存储区代码")
|
||||
public String destZoneNo;
|
||||
|
||||
@Column(name = "DEST_LOCATE_NO")
|
||||
@ApiParam("目标库位代码")
|
||||
public String destLocateNo;
|
||||
|
||||
@Column(name = "ORDER_NO")
|
||||
@ApiParam(value = "移库单单号")
|
||||
private String orderNo;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料编码")
|
||||
public String partNo;
|
||||
|
||||
@Column(name = "PART_NAME_RDD")
|
||||
@ApiParam("物料名称")
|
||||
public String partNameRdd;
|
||||
|
||||
@Column(name = "ITEM")
|
||||
@ApiParam("行号")
|
||||
public String item;
|
||||
|
||||
/**
|
||||
* 是否免费:0=计费,1=免费
|
||||
*/
|
||||
@Column(name = "IS_FREE")
|
||||
@ApiParam(value = "是否免费", example = "1")
|
||||
public Integer isFree;
|
||||
|
||||
/**
|
||||
* 状态:N=正常,C=行取消
|
||||
*/
|
||||
@Column(name = "ITEM_STATUS")
|
||||
@ApiParam(value = "状态", example = "1")
|
||||
private Integer itemStatus;
|
||||
|
||||
@Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam(value = "已拣货数量", example = "1")
|
||||
private Double pickQty;
|
||||
|
||||
@Column(name = "OUT_QTY", columnDefinition = "decimal(18,8)")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam(value = "已出库数量", example = "1")
|
||||
private Double outQty;
|
||||
|
||||
@Column(name = "REC_QTY", columnDefinition = "decimal(18,8)")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam(value = "已收货数量", example = "1")
|
||||
private Double recQty;
|
||||
|
||||
@Column(name = "MOVE_QTY", columnDefinition = "decimal(18,8)")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam(value = "已移库数量", example = "1")
|
||||
private Double moveQty;
|
||||
|
||||
@Column(name = "PLAN_DATE")
|
||||
@ApiParam(value = "计划日期")
|
||||
private String planDate;
|
||||
|
||||
@Column(name = "PLAN_TIME")
|
||||
@ApiParam(value = "计划时间")
|
||||
private String planTime;
|
||||
|
||||
@Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam(value = "条码打印数量", example = "1")
|
||||
private Double printQty;
|
||||
|
||||
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam(value = "需求数量", example = "0")
|
||||
public Double qty;
|
||||
|
||||
@Column(name = "REMARK")
|
||||
@ApiParam(value = "操作原因")
|
||||
private String remark;
|
||||
|
||||
@Column(name = "SRC_AREA_NO")
|
||||
@ApiParam("源库存地代码")
|
||||
public String srcAreaNo;
|
||||
|
||||
@Column(name = "SRC_WH_NO")
|
||||
@ApiParam("源仓库代码")
|
||||
public String srcWhNo;
|
||||
|
||||
@Column(name = "SRC_ZONE_NO")
|
||||
@ApiParam("源存储区代码")
|
||||
public String srcZoneNo;
|
||||
|
||||
@Column(name = "SRC_LOCATE_NO")
|
||||
@ApiParam("源库位代码")
|
||||
public String srcLocateNo;
|
||||
|
||||
@Column(name = "UNIT")
|
||||
@ApiParam("单位")
|
||||
public String unit;
|
||||
|
||||
@Version
|
||||
@Column(name = "LOCK_VERSION")
|
||||
@ApiParam(value = "乐观锁", example = "1")
|
||||
public transient Integer lockVersion;
|
||||
|
||||
@Column(name = "IS_SN")
|
||||
@ApiParam(value = "条码生成状态", example = "20")
|
||||
public Integer isSn;
|
||||
|
||||
@Column(name = "LOT_NO")
|
||||
@ApiParam("批次")
|
||||
public String lotNo;
|
||||
}
|
||||
@ -0,0 +1,149 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
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.Table;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-05-27
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Table(name = "SWEB_DOC_MOVEMENT_MASTER")
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api("移库单-主表")
|
||||
public class SwebDocMovementMaster extends BaseBean {
|
||||
|
||||
private static final long serialVersionUID = -4539662053206835169L;
|
||||
@Column(name = "ORDER_NO")
|
||||
@ApiParam(value = "移库单单号")
|
||||
private String orderNo;
|
||||
|
||||
@Column(name = "BUSI_TYPE")
|
||||
@ApiParam("业务类型")
|
||||
public String busiType;
|
||||
|
||||
@Column(name = "CAR_NO")
|
||||
@ApiParam(value = "车牌号")
|
||||
private String carNo;
|
||||
|
||||
@Column(name = "CUST_NO")
|
||||
@ApiParam(value = "客户编号")
|
||||
private String custNo;
|
||||
|
||||
@Column(name = "CUST_ORDER_NO")
|
||||
@ApiParam(value = "客户单号")
|
||||
private String custOrderNo;
|
||||
|
||||
@Column(name = "ERP_SRC_NO")
|
||||
@ApiParam(value = "ERP单号")
|
||||
private String erpSrcNo;
|
||||
|
||||
@Column(name = "IS_TASK")
|
||||
@ApiParam(value = "是否生产任务", example = "1")
|
||||
public Integer isTask;
|
||||
|
||||
@Column(name = "IS_PART")
|
||||
@ApiParam(value = "是否散件", example = "1")
|
||||
private Integer isPart;
|
||||
|
||||
/**
|
||||
* 移动类型:IN=入库,OUT=出库,MOVE=移库
|
||||
*/
|
||||
@Column(name = "MOVE_TYPE")
|
||||
@ApiParam("移动类型")
|
||||
public Integer moveType;
|
||||
|
||||
/**
|
||||
* 状态:0=新建,10=处理中
|
||||
* ,20=已完成,90=已关闭,91=已取消
|
||||
*/
|
||||
@Column(name = "ORDER_STATUS")
|
||||
@ApiParam(value = "状态", example = "1")
|
||||
public Integer orderStatus;
|
||||
|
||||
@Column(name = "PRIORITY")
|
||||
@ApiParam(value = "优先级", example = "1")
|
||||
public Integer priority;
|
||||
|
||||
/**
|
||||
* 关联单据类型:1=ASN,10=PO,20=SO
|
||||
*/
|
||||
@Column(name = "REF_TYPE")
|
||||
@ApiParam(value = "关联单据类型")
|
||||
private String refType;
|
||||
|
||||
@Column(name = "REF_NO")
|
||||
@ApiParam(value = "关联单据")
|
||||
private String refNo;
|
||||
|
||||
@ApiParam("供应商编号")
|
||||
@Column(name = "VENDOR_CODE")
|
||||
private String vendorCode;
|
||||
|
||||
@ApiParam("供应商名称")
|
||||
@Column(name = "VENDOR_NAME")
|
||||
private String vendorName;
|
||||
|
||||
@Column(name = "VERSION")
|
||||
@ApiParam(value = "版本", example = "1")
|
||||
private Integer version;
|
||||
|
||||
@Column(name = "TAG")
|
||||
@ApiParam(value = "标签")
|
||||
private String tag;
|
||||
|
||||
@Column(name = "FLAG_NO")
|
||||
@ApiParam(value = "客户发往地编号")
|
||||
private String flagNo;
|
||||
|
||||
@Column(name = "PRINT_STATUS")
|
||||
@ApiParam("打印状态")
|
||||
private Integer printStatus;
|
||||
|
||||
@Column(name = "IS_SN")
|
||||
@ApiParam("打印状态")
|
||||
private Integer isSn;
|
||||
|
||||
@Column(name = "DEST_WH_NO")
|
||||
@ApiParam("目的仓库代码")
|
||||
private String destWhNo;
|
||||
|
||||
@Column(name = "DEST_ZONE_NO")
|
||||
@ApiParam("目的存储区代码")
|
||||
private String destZoneNo;
|
||||
|
||||
@Column(name = "PLAN_DATE")
|
||||
@ApiParam("计划日期")
|
||||
private String planDate;
|
||||
|
||||
@Column(name = "PLAN_TIME")
|
||||
@ApiParam("计划时间")
|
||||
private String planTime;
|
||||
|
||||
@Column(name = "SRC_WH_NO")
|
||||
@ApiParam("源仓库代码")
|
||||
private String srcWhNo;
|
||||
|
||||
@Column(name = "SRC_ZONE_NO")
|
||||
@ApiParam("源存储区代码")
|
||||
private String srcZoneNo;
|
||||
|
||||
@Column(name = "SHIP_TIME")
|
||||
@ApiParam(value = "发运时间")
|
||||
private String shipTime;
|
||||
}
|
||||
@ -0,0 +1,99 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-05-28
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "SWEB_MOVEMENT_TO_WMS")
|
||||
@Api("库存移动单处理成功后的记录")
|
||||
public class SwebMovementToWms extends BaseBean {
|
||||
private static final long serialVersionUID = -8089219927352225317L;
|
||||
|
||||
@Column(name = "ORDER_NO")
|
||||
@ApiParam("单号")
|
||||
public String orderNo;
|
||||
|
||||
@Column(name = "ITEM")
|
||||
@ApiParam("行号")
|
||||
public String item;
|
||||
|
||||
@Column(name = "VENDOR_NO")
|
||||
@ApiParam(value = "供应商编号")
|
||||
private String vendorNo;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料编码")
|
||||
public String partNo;
|
||||
|
||||
@Column(name = "PART_NAME")
|
||||
@ApiParam("物料名称")
|
||||
private String partName;
|
||||
|
||||
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam(value = "需求数量", example = "0")
|
||||
public Double qty;
|
||||
|
||||
@Column(name = "UNIT")
|
||||
@ApiParam("单位")
|
||||
public String unit;
|
||||
|
||||
@Column(name = "SRC_WH_NO")
|
||||
@ApiParam("源仓库代码")
|
||||
public String srcWhNo;
|
||||
|
||||
@Column(name = "DEST_ZONE_NO")
|
||||
@ApiParam("目标存储区代码")
|
||||
public String destZoneNo;
|
||||
|
||||
/**
|
||||
* 移动类型:IN=入库,OUT=出库,MOVE=移库
|
||||
*/
|
||||
@Column(name = "MOVE_TYPE")
|
||||
@ApiParam("移动类型")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class, refForeignKey = "value", value = "description")
|
||||
public Integer moveType;
|
||||
/**
|
||||
* 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
|
||||
* VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料,
|
||||
* MI=移库入库,MO=移库出库,SO=发运
|
||||
*/
|
||||
@Column(name = "BUSI_TYPE")
|
||||
@ApiParam("业务类型")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
|
||||
public Integer busiType;
|
||||
|
||||
/**
|
||||
* 状态:1=创建,10=待处理,20=已处理
|
||||
*/
|
||||
@Column(name="ITEM_STATUS")
|
||||
@ApiParam(value = "状态", example = "0")
|
||||
public Integer itemStatus;
|
||||
|
||||
@Column(name = "SYNC_STATUS")
|
||||
@ApiParam("同步状态")
|
||||
private Integer syncStatus;
|
||||
}
|
||||
@ -0,0 +1,97 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-05-28
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "SWEB_PO_TO_WMS")
|
||||
@Api("库存移动单处理成功后的记录")
|
||||
public class SwebPoToWms extends BaseBean {
|
||||
|
||||
private static final long serialVersionUID = -3999194389200855165L;
|
||||
@Column(name = "ORDER_NO")
|
||||
@ApiParam("单号")
|
||||
public String orderNo;
|
||||
|
||||
@Column(name = "VERSION")
|
||||
@ApiParam("版本")
|
||||
public String version;
|
||||
|
||||
@Column(name = "ITEM")
|
||||
@ApiParam("行号")
|
||||
private Integer item;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料编码")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "PART_NAME_RDD")
|
||||
@ApiParam("物料名称")
|
||||
private String partNameRdd;
|
||||
|
||||
@Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
|
||||
@ColumnDefault("0")
|
||||
@ApiParam(value = "需求数量", example = "0")
|
||||
private Double qty;
|
||||
|
||||
@Column(name = "VENDOR_NO")
|
||||
@ApiParam("供应商")
|
||||
private String vendorNo;
|
||||
|
||||
@Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
|
||||
@ColumnDefault("0")
|
||||
@ApiParam(value = "条码打印数量", example = "0")
|
||||
private Double printQty;
|
||||
|
||||
@Column(name = "UNIT")
|
||||
@ApiParam("单位")
|
||||
private String unit;
|
||||
|
||||
@Column(name = "PLAN_DATE")
|
||||
@ApiParam("计划交货日期")
|
||||
private String planDate;
|
||||
|
||||
@Column(name = "PLAN_TIME")
|
||||
@ApiParam("计划交货时间")
|
||||
private String planTime;
|
||||
|
||||
@Column(name = "ERP_AREA_NO")
|
||||
@ApiParam("默认收货库存地")
|
||||
private String erpAreaNo;
|
||||
|
||||
@Column(name = "SNP", columnDefinition = "decimal(18,8)")
|
||||
@ApiParam("标准包装")
|
||||
private Double snp;
|
||||
|
||||
/**
|
||||
* 状态:1=创建,10=待处理,20=已处理
|
||||
*/
|
||||
@Column(name="ITEM_STATUS")
|
||||
@ApiParam(value = "状态", example = "0")
|
||||
public Integer itemStatus;
|
||||
|
||||
@Column(name = "SYNC_STATUS")
|
||||
@ApiParam("同步状态")
|
||||
private Integer syncStatus;
|
||||
}
|
||||
@ -0,0 +1,48 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
|
||||
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.Table;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-05-28
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "WMS_MOVEMENT_TO_SWEB")
|
||||
@Api("库存移动单处理成功后的记录")
|
||||
public class WmsMovementToSweb extends BaseBean {
|
||||
private static final long serialVersionUID = 49215041475324487L;
|
||||
|
||||
@Column(name = "ORDER_NO")
|
||||
@ApiParam("单号")
|
||||
public String orderNo;
|
||||
|
||||
/**
|
||||
* 状态:1=创建,10=待处理,20=已处理
|
||||
*/
|
||||
@Column(name="ITEM_STATUS")
|
||||
@ApiParam(value = "状态", example = "0")
|
||||
public Integer itemStatus;
|
||||
|
||||
@Column(name = "SYNC_STATUS")
|
||||
@ApiParam("同步状态")
|
||||
private Integer syncStatus;
|
||||
}
|
||||
@ -0,0 +1,46 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
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.Table;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-05-28
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "WMS_PO_TO_SWEB")
|
||||
@Api("库存移动单处理成功后的记录")
|
||||
public class WmsPoToSweb extends BaseBean {
|
||||
private static final long serialVersionUID = 4710841067412420270L;
|
||||
|
||||
@Column(name = "ORDER_NO")
|
||||
@ApiParam("单号")
|
||||
public String orderNo;
|
||||
|
||||
/**
|
||||
* 状态:1=创建,10=待处理,20=已处理
|
||||
*/
|
||||
@Column(name="ITEM_STATUS")
|
||||
@ApiParam(value = "状态", example = "0")
|
||||
public Integer itemStatus;
|
||||
|
||||
@Column(name = "SYNC_STATUS")
|
||||
@ApiParam("同步状态")
|
||||
private Integer syncStatus;
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.modelbean;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class SwebMovementModel {
|
||||
|
||||
@ApiParam(value = "工厂代码")
|
||||
private String organizeCode;
|
||||
|
||||
@ApiParam(value = "物料号")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam(value = "物料名称")
|
||||
private String partName;
|
||||
|
||||
@ApiParam(value = "需求数量")
|
||||
private Double qty;
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.sweb.bean.SwebDocMovementDetails;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface SwebDocMovementDetailsRepository extends BaseRepository<SwebDocMovementDetails, Long> {
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.sweb.bean.SwebDocMovementMaster;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface SwebDocMovementMasterRepository extends BaseRepository<SwebDocMovementMaster, Long> {
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.sweb.bean.SwebDocMovementSn;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface SwebDocMovementSnRepository extends BaseRepository<SwebDocMovementSn, Long> {
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.sweb.bean.SwebMovementToWms;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface SwebMovementToWmsRepository extends BaseRepository<SwebMovementToWms, Long> {
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.sweb.bean.SwebPoToWms;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface SwebPoToWmsRepository extends BaseRepository<SwebPoToWms, Long> {
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.sweb.bean.WmsMovementToSweb;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface WmsMovementToSwebRepository extends BaseRepository<WmsMovementToSweb, Long> {
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.sweb.bean.WmsPoToSweb;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface WmsPoToSwebRepository extends BaseRepository<WmsPoToSweb, Long> {
|
||||
}
|
||||
@ -0,0 +1,89 @@
|
||||
package cn.estsh.i3plus.pojo.wms.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
|
||||
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 cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
|
||||
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.Table;
|
||||
import javax.persistence.Transient;
|
||||
|
||||
/**
|
||||
* @Description : 物流费用记录
|
||||
* @Reference :
|
||||
* @Author :QianHuaSheng
|
||||
* @CreateDate : 2020-05-15 3:18 下午
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@Table(name = "WMS_LOGISTIC_EXPENSE_RECORDS")
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api(value = "物流费用记录")
|
||||
public class WmsLogisticExpenseRecords extends BaseBean {
|
||||
private static final long serialVersionUID = 6512855224667052310L;
|
||||
|
||||
@Column(name = "ORGANIZE_NAME")
|
||||
@ApiParam(value = "工厂名称")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String organizeName;
|
||||
|
||||
@Column(name = "ORDER_NO")
|
||||
@ApiParam("单据号")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String orderNo;
|
||||
|
||||
@Column(name = "SHIPPING_FLAG")
|
||||
@ApiParam(value = "发往地")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String shippingFlag;
|
||||
|
||||
@Column(name = "BUSI_TYPE")
|
||||
@ApiParam("业务类型")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
|
||||
public Integer busiType;
|
||||
|
||||
@Column(name = "TRANSPORT_TYPE")
|
||||
@ApiParam(value = "运输方式")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description")
|
||||
private Integer transportType;
|
||||
|
||||
@Column(name = "sum")
|
||||
@ApiParam(value = "总运输费用")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private Double sum;
|
||||
|
||||
@Column(name = "LOGISTICS_VENDOR_NO")
|
||||
@ApiParam(value = "物流供应商")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String logisticsVendorNo;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value = "状态", example = "1")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class)
|
||||
public Integer orderStatus;
|
||||
|
||||
public WmsLogisticExpenseRecords(WmsDocMovementMaster docMovementMaster) {
|
||||
// this.organizeName = docMovementMaster.getorganizeName;
|
||||
this.orderNo = docMovementMaster.getOrderNo();
|
||||
this.shippingFlag = docMovementMaster.getFlagNo();
|
||||
this.busiType = docMovementMaster.getBusiType();
|
||||
this.transportType = docMovementMaster.getTransportType();
|
||||
this.logisticsVendorNo = docMovementMaster.getLogisticsVendorNo();
|
||||
}
|
||||
|
||||
public WmsLogisticExpenseRecords() {
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,81 @@
|
||||
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.Table;
|
||||
|
||||
/**
|
||||
* @Description : 物流费用记录明细
|
||||
* @Reference :
|
||||
* @Author :QianHuaSheng
|
||||
* @CreateDate : 2020-05-15 3:18 下午
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@Table(name = "WMS_LOGISTIC_EXPENSE_RECORDS_DETAILS")
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api(value = "物流费用记录明细")
|
||||
public class WmsLogisticExpenseRecordsDetails extends BaseBean {
|
||||
|
||||
private static final long serialVersionUID = -6839107270239441520L;
|
||||
@Column(name = "ORGANIZE_NAME")
|
||||
@ApiParam(value = "工厂名称")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String organizeName;
|
||||
|
||||
@Column(name = "ORDER_NO")
|
||||
@ApiParam("单据号")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String orderNo;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料号")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "PART_NAME")
|
||||
@ApiParam("物料名称")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String partName;
|
||||
|
||||
@Column(name = "unit")
|
||||
@ApiParam(value = "计量单位")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
|
||||
isRequire = 2, dataSrc = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode")
|
||||
private String unit;
|
||||
|
||||
@Column(name = "QTY")
|
||||
@ApiParam(value = "数量")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private Double qty;
|
||||
|
||||
@Column(name = "COST")
|
||||
@ApiParam(value = "总运输费用")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private Double cost;
|
||||
|
||||
@Column(name = "START_TIME")
|
||||
@ApiParam(value = "开始时间")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String startTime;
|
||||
|
||||
@Column(name = "END_TIME")
|
||||
@ApiParam(value = "结束时间")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String endTime;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,126 @@
|
||||
package cn.estsh.i3plus.pojo.wms.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
|
||||
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 cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
|
||||
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.Table;
|
||||
|
||||
/**
|
||||
* @Description : 物流运费审批
|
||||
* @Reference :
|
||||
* @Author :QianHuaSheng
|
||||
* @CreateDate : 2020-05-14 11:41 上午
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "WMS_LOGISTICS_FREIGHT_APPROVAL")
|
||||
@Api("物流运费审批")
|
||||
public class WmsLogisticsFreightApproval extends BaseBean {
|
||||
private static final long serialVersionUID = -1385266737512278984L;
|
||||
|
||||
@Column(name = "ORDER_NO")
|
||||
@ApiParam("单据号")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String orderNo;
|
||||
|
||||
@Column(name = "BUSI_TYPE")
|
||||
@ApiParam("单据类型")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "OUT_MOVEMENT_BUSI_TYPE")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class)
|
||||
private Integer busiType;
|
||||
|
||||
@Column(name = "APPROVAL_STATUS")
|
||||
@ApiParam("审批状态")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "APPROVAL_STATUS")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.APPROVAL_STATUS.class)
|
||||
private Integer approvalStatus;
|
||||
|
||||
@Column(name = "SUPPLY_WAREHOUSE")
|
||||
@ApiParam("供货仓库")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String supplyWarehouse;
|
||||
|
||||
@Column(name = "DEMAND_WAREHOUSE")
|
||||
@ApiParam("需求仓库")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String demandWarehouse;
|
||||
|
||||
@Column(name = "CUST_NO")
|
||||
@ApiParam("客户代码")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String custNo;
|
||||
|
||||
@Column(name = "LOGISTICS_VENDOR_NO")
|
||||
@ApiParam("物流供应商")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String logisticsVendorNo;
|
||||
|
||||
@Column(name = "TRANSPORT_TYPE")
|
||||
@ApiParam(value = "运输类型")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class)
|
||||
private Integer transportType;
|
||||
|
||||
@Column(name = "PLACE_OF_ORIGIN_CODE")
|
||||
@ApiParam(value = "客户发出地代码")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String placeOfOriginCode;
|
||||
|
||||
@Column(name = "PLACE_OF_ORIGIN_DESC")
|
||||
@ApiParam(value = "客户发出地描述")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String placeOfOriginDesc;
|
||||
|
||||
@Column(name = "CUST_DELIVERY_CODE")
|
||||
@ApiParam(value = "客户发往地代码")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String custDeliveryCode;
|
||||
|
||||
@Column(name = "CUST_DELIVERY_DESC")
|
||||
@ApiParam(value = "客户发往地描述")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String custDeliveryDesc;
|
||||
|
||||
@Column(name = "is_urgent")
|
||||
@ApiParam(value = "是否紧急")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
|
||||
private Integer isUrgent;
|
||||
|
||||
public WmsLogisticsFreightApproval(WmsDocMovementMaster docMovementMaster) {
|
||||
this.orderNo = docMovementMaster.getOrderNo();
|
||||
this.organizeCode = docMovementMaster.getOrganizeCode();
|
||||
this.busiType = docMovementMaster.getBusiType();
|
||||
this.organizeCode = docMovementMaster.getOrganizeCode();
|
||||
this.approvalStatus = WmsEnumUtil.APPROVAL_STATUS.APPROVE_PROCESSING.getValue();
|
||||
this.supplyWarehouse = docMovementMaster.getAssignSrcWhNo();
|
||||
this.demandWarehouse = docMovementMaster.getAssignDestWhNo();
|
||||
this.custNo = docMovementMaster.getCustNo();
|
||||
this.logisticsVendorNo = docMovementMaster.getLogisticsVendorNo();
|
||||
this.transportType = docMovementMaster.getTransportType();
|
||||
this.placeOfOriginCode = docMovementMaster.getFlagNo();
|
||||
// this.placeOfOriginDesc = placeOfOriginDesc;
|
||||
this.custDeliveryCode = docMovementMaster.getAssignSrcWhNo();
|
||||
// this.custDeliveryDesc = custDeliveryDesc;
|
||||
this.isUrgent = WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
|
||||
}
|
||||
|
||||
public WmsLogisticsFreightApproval() {
|
||||
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.wms.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsLogisticExpenseRecordsDetails;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description : 物流运费记录明细
|
||||
* @Reference :
|
||||
* @Author : qianhuasheng
|
||||
* @CreateDate : 2019-06-28 15:17
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface WmsLogisticExpenseRecordsDetailsRepository extends BaseRepository<WmsLogisticExpenseRecordsDetails, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.wms.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsLogisticExpenseRecords;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description : 物流运费记录
|
||||
* @Reference :
|
||||
* @Author : qianhuasheng
|
||||
* @CreateDate : 2019-06-28 15:17
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface WmsLogisticExpenseRecordsRepository extends BaseRepository<WmsLogisticExpenseRecords, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.wms.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsLogisticsFreightApproval;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description : 物流运费审批
|
||||
* @Reference :
|
||||
* @Author : qianhuasheng
|
||||
* @CreateDate : 2020-05-14 15:17
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface WmsLogisticsFreightApprovalRepository extends BaseRepository<WmsLogisticsFreightApproval, Long> {
|
||||
}
|
||||
Loading…
Reference in New Issue