Merge remote-tracking branch 'origin/dev' into dev
commit
e9ec4cecfe
@ -0,0 +1,22 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<artifactId>i3plus-pojo</artifactId>
|
||||
<groupId>i3plus.pojo</groupId>
|
||||
<version>1.0-DEV-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>i3plus-pojo-ics</artifactId>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>i3plus.pojo</groupId>
|
||||
<artifactId>i3plus-pojo-base</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
@ -0,0 +1,39 @@
|
||||
package cn.estsh.i3plus.pojo.ics.bean;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-04-10 16:56
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class IcsActuatorMetrics {
|
||||
|
||||
private String name;
|
||||
private List<Measurements> measurements;
|
||||
private List<AvailableTags> availableTags;
|
||||
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
public static class Measurements {
|
||||
|
||||
private String statistic;
|
||||
private Object value;
|
||||
|
||||
}
|
||||
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
public static class AvailableTags {
|
||||
|
||||
private String tag;
|
||||
private List<String> values;
|
||||
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,72 @@
|
||||
package cn.estsh.i3plus.pojo.ics.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 应用信息
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-04-09 17:55
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@ApiModel("应用信息")
|
||||
public class IcsApplication {
|
||||
|
||||
@ApiModelProperty("应用名称")
|
||||
private String appName;
|
||||
|
||||
@ApiModelProperty("实例数量")
|
||||
private Integer totalInstanceNum;
|
||||
|
||||
@ApiModelProperty("在线实例数量")
|
||||
private Integer upInstanceNum;
|
||||
|
||||
public int getUpInstanceNumVal() {
|
||||
return upInstanceNum == null ? 0 : upInstanceNum.intValue();
|
||||
}
|
||||
|
||||
|
||||
public void addUpInstanceNum() {
|
||||
if (upInstanceNum == null) {
|
||||
upInstanceNum = 0;
|
||||
}
|
||||
upInstanceNum++;
|
||||
}
|
||||
|
||||
@ApiModelProperty("下线实例数量")
|
||||
private Integer downInstanceNum;
|
||||
|
||||
public int getDownInstanceNumVal() {
|
||||
return downInstanceNum == null ? 0 : downInstanceNum.intValue();
|
||||
}
|
||||
|
||||
public void addDownInstanceNum() {
|
||||
if (downInstanceNum == null) {
|
||||
downInstanceNum = 0;
|
||||
}
|
||||
downInstanceNum++;
|
||||
}
|
||||
|
||||
@ApiModelProperty("应用状态")
|
||||
private Integer appStatus;
|
||||
|
||||
public String getAppStatusTxt(){
|
||||
return appStatus == null ?"无": CommonEnumUtil.CLOUD_APP_STATUS.valueOfDescription(appStatus);
|
||||
}
|
||||
|
||||
@ApiModelProperty("状态时间戳")
|
||||
private Long statusTimeStamp;
|
||||
|
||||
@ApiModelProperty("状态时间")
|
||||
private String statusTimeStampStr;
|
||||
|
||||
@ApiModelProperty("实例集合")
|
||||
private List<IcsInstance> icsInstanceList;
|
||||
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
package cn.estsh.i3plus.pojo.ics.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-04-09 18:02
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@ApiModel("实例信息")
|
||||
public class IcsInstance {
|
||||
|
||||
@ApiModelProperty("实例id")
|
||||
private String instanceId;
|
||||
|
||||
@ApiModelProperty("实例状态url")
|
||||
private String instanceStatusUrl;
|
||||
|
||||
@ApiModelProperty("实例状态")
|
||||
private Integer instanceStatus;
|
||||
|
||||
@ApiModelProperty("状态时间戳")
|
||||
private Long statusTimeStamp;
|
||||
|
||||
@ApiModelProperty("状态时间")
|
||||
private String statusTimeStampStr;
|
||||
|
||||
public String getInstanceStatusTxt(){
|
||||
return instanceStatus == null ?"无": CommonEnumUtil.CLOUD_APP_STATUS.valueOfDescription(instanceStatus);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,54 @@
|
||||
package cn.estsh.i3plus.pojo.ics.bean;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description : 实例明细
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-04-10 16:52
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@ApiModel("实例明细")
|
||||
public class IcsInstanceDetail {
|
||||
|
||||
@ApiModelProperty("pid")
|
||||
private String pid;
|
||||
|
||||
@ApiModelProperty("正常运行时间")
|
||||
private double uptime;
|
||||
|
||||
@ApiModelProperty("正常运行时间")
|
||||
private String uptimeStr;
|
||||
|
||||
@ApiModelProperty("进程Cpu使用情况")
|
||||
private double processCpuUsage;
|
||||
|
||||
@ApiModelProperty("系统Cpu使用情况")
|
||||
private double systemCpuUsage;
|
||||
|
||||
@ApiModelProperty("CPU数量")
|
||||
private int cpuNum;
|
||||
|
||||
@ApiModelProperty("gc计数")
|
||||
private int gcCount;
|
||||
|
||||
@ApiModelProperty("gc总花费时间")
|
||||
private double gcTotalTimeSpent;
|
||||
|
||||
@ApiModelProperty("gc花费的最长时间")
|
||||
private double gcMaxTimeSpent;
|
||||
|
||||
@ApiModelProperty("监控网址")
|
||||
private String monitorUrl;
|
||||
|
||||
@ApiModelProperty("ApiUrl")
|
||||
private String apiUrl;
|
||||
|
||||
@ApiModelProperty("服务网址")
|
||||
private String serviceUrl;
|
||||
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
package cn.estsh.i3plus.pojo.ics.bean;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description : 实例堆内存
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-04-10 16:57
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@ApiModel("实例堆内存")
|
||||
public class IcsInstanceMemoryHeap {
|
||||
|
||||
@ApiModelProperty("堆使用的内存")
|
||||
private double heapMemoryUsed;
|
||||
|
||||
@ApiModelProperty("堆内存大小")
|
||||
private double heapMemorySize;
|
||||
|
||||
@ApiModelProperty("堆内存最大")
|
||||
private double heapMemoryMax;
|
||||
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
package cn.estsh.i3plus.pojo.ics.bean;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description :实例堆非内存
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-04-10 16:57
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@ApiModel("实例堆非内存")
|
||||
public class IcsInstanceMemoryNonHeap {
|
||||
|
||||
@ApiModelProperty("非堆内存元空间")
|
||||
private double nonHeapMemoryMetaspace;
|
||||
|
||||
@ApiModelProperty("非堆内存使用")
|
||||
private double nonHeapMemoryUsed;
|
||||
|
||||
@ApiModelProperty("非堆内存大小")
|
||||
private double nonHeapMemorySize;
|
||||
|
||||
@ApiModelProperty("非堆内存最大")
|
||||
private double nonHeapMemoryMax;
|
||||
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
package cn.estsh.i3plus.pojo.ics.bean;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description : 实例线程信息
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-04-10 16:57
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@ApiModel("实例线程信息")
|
||||
public class IcsInstanceThread {
|
||||
|
||||
@ApiModelProperty("实时线程")
|
||||
private double threadLive;
|
||||
|
||||
@ApiModelProperty("守护线程")
|
||||
private double threadDaemon;
|
||||
|
||||
@ApiModelProperty("线程峰值")
|
||||
private double threadPeakLive;
|
||||
|
||||
}
|
||||
@ -0,0 +1,68 @@
|
||||
package cn.estsh.i3plus.pojo.ics.bean;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 注册中心信息
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-04-09 10:12
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@ApiModel("注册中心")
|
||||
public class IcsRegist {
|
||||
|
||||
@ApiModelProperty("环境")
|
||||
private String environment;
|
||||
|
||||
@ApiModelProperty("数据中心")
|
||||
private String dataCenter;
|
||||
|
||||
@ApiModelProperty("集群信息")
|
||||
private List<String> clusterInfo;
|
||||
|
||||
@ApiModelProperty("是否低于续订阈值")
|
||||
private Integer isBelowRenewThresold;
|
||||
|
||||
@ApiModelProperty("启用自我保护模式")
|
||||
private Integer selfPreservationModeEnabled;
|
||||
|
||||
@ApiModelProperty("注册中心启动时长")
|
||||
private String upDateTime;
|
||||
|
||||
@ApiModelProperty("租约到期启用")
|
||||
private Integer leaseExpirationEnabled;
|
||||
|
||||
@ApiModelProperty("实例IP")
|
||||
private String instanceIp;
|
||||
|
||||
@ApiModelProperty("实例状态")
|
||||
private String instanceStatus;
|
||||
|
||||
@ApiModelProperty("cpu数量")
|
||||
private Integer cpuNum;
|
||||
|
||||
@ApiModelProperty("总可用内存")
|
||||
private Integer totalAvailMemory;
|
||||
|
||||
@ApiModelProperty("当前的内存使用情况")
|
||||
private Integer currentMemoryUsage;
|
||||
|
||||
@ApiModelProperty("应用数量")
|
||||
private Integer appNum;
|
||||
|
||||
@ApiModelProperty("实例数量")
|
||||
private Integer instanceNum;
|
||||
|
||||
@ApiModelProperty("下线实例数量")
|
||||
private Integer downInstanceNum;
|
||||
|
||||
@ApiModelProperty("应用集合")
|
||||
private List<IcsApplication> icsApplicationList;
|
||||
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/4/14 15:18
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@Deprecated
|
||||
public class StateModel {
|
||||
|
||||
private String stateCode;
|
||||
|
||||
private String stateName;
|
||||
|
||||
private String routeCode;
|
||||
|
||||
private String smCode;
|
||||
}
|
||||
@ -0,0 +1,41 @@
|
||||
package cn.estsh.i3plus.pojo.model.form;
|
||||
|
||||
import cn.estsh.i3plus.pojo.form.bean.BfButton;
|
||||
import cn.estsh.i3plus.pojo.form.bean.BfElement;
|
||||
import cn.estsh.i3plus.pojo.form.bean.BfRefButtonMethod;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @Description : 按钮操作数据模型
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-04-13 19:45
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@ApiModel("按钮操作数据模型")
|
||||
public class BfButtonOperateDataModel {
|
||||
|
||||
@ApiModelProperty("按钮id")
|
||||
private Long buttonId;
|
||||
|
||||
@ApiModelProperty("元素id")
|
||||
private Long elementId;
|
||||
|
||||
@ApiModelProperty("操作数据")
|
||||
private List<Map<String,Object>> operateData;
|
||||
|
||||
@ApiModelProperty("按钮功能关系信息")
|
||||
private BfRefButtonMethod bfRefButtonMethod;
|
||||
|
||||
@ApiModelProperty("元素信息")
|
||||
private BfElement bfElement;
|
||||
|
||||
@ApiModelProperty("按钮信息")
|
||||
private BfButton bfButton;
|
||||
}
|
||||
@ -0,0 +1,304 @@
|
||||
package cn.estsh.i3plus.pojo.wms.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;
|
||||
import javax.persistence.Transient;
|
||||
import javax.persistence.Version;
|
||||
|
||||
/**
|
||||
* @Description : 车辆信息明细
|
||||
* @Reference :
|
||||
* @Author : qianhuasheng
|
||||
* @CreateDate : 2019-12-06 15:58
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="WMS_TMS_SHIPPING_EXT_DETAIL")
|
||||
@Api("装车单信息明细")
|
||||
public class WmsTmsShippingExtDetail extends BaseBean {
|
||||
private static final long serialVersionUID = -4800308354250386102L;
|
||||
|
||||
@Column(name="MOVE_NO")
|
||||
@ApiParam("装车单")
|
||||
public String moveNo;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料编码")
|
||||
public String partNo;
|
||||
|
||||
@Column(name = "PART_NAME_RDD")
|
||||
@ApiParam("物料名称")
|
||||
public String partNameRdd;
|
||||
|
||||
@Column(name = "ITEM")
|
||||
@ApiParam("行号")
|
||||
public String item;
|
||||
|
||||
@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 = "ORDER_NO")
|
||||
@ApiParam("订单号")
|
||||
public String orderNo;
|
||||
|
||||
@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 = "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 = "PRINT_QTY", columnDefinition = "decimal(18,8)")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam(value = "条码打印数量", example = "1")
|
||||
private Double printQty;
|
||||
|
||||
@Column(name = "PLAN_DATE")
|
||||
@ApiParam(value = "计划日期")
|
||||
private String planDate;
|
||||
|
||||
@Column(name = "PLAN_TIME")
|
||||
@ApiParam(value = "计划时间")
|
||||
private String planTime;
|
||||
|
||||
@Column(name = "SRC_NO")
|
||||
@ApiParam(value = "源单号")
|
||||
private String srcNo;
|
||||
/**
|
||||
* 状态:N=正常,C=行取消
|
||||
*/
|
||||
@Column(name = "ITEM_STATUS")
|
||||
@ApiParam(value = "状态", example = "1")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description")
|
||||
private Integer itemStatus;
|
||||
|
||||
/**
|
||||
* 是否免费:0=计费,1=免费
|
||||
*/
|
||||
@Column(name = "IS_FREE")
|
||||
@ApiParam(value = "是否免费", example = "1")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
|
||||
public Integer isFree;
|
||||
|
||||
@Column(name = "REMARK")
|
||||
@ApiParam(value = "操作原因")
|
||||
private String remark;
|
||||
|
||||
@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 = "TASK_GENERATE_QTY", columnDefinition = "decimal(18,8)")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam(value = "任务生成数量", example = "1")
|
||||
private Double taskGenerateQty;
|
||||
|
||||
@Column(name = "SRC_AREA_NO")
|
||||
@ApiParam("源库存地代码")
|
||||
public String srcAreaNo;
|
||||
|
||||
@Column(name = "DEST_AREA_NO")
|
||||
@ApiParam("目的库存地代码")
|
||||
public String destAreaNo;
|
||||
|
||||
@Column(name = "LOT_NO")
|
||||
@ApiParam("批次")
|
||||
public String lotNo;
|
||||
|
||||
@Column(name="SRC_ITEM", columnDefinition="varchar(50) default ''",nullable=false)
|
||||
@ApiParam("源单行号")
|
||||
public String srcItem;
|
||||
|
||||
@Column(name = "CUST_ORDER_NO")
|
||||
@ApiParam("客户订单号")
|
||||
public String custOrderNo;
|
||||
|
||||
@Column(name = "ASSIGN_DATE_CODE")
|
||||
@ApiParam(value = "指定生产日期")
|
||||
private String assignDateCode;
|
||||
|
||||
@Transient
|
||||
@ApiParam("实际批次")
|
||||
private String actualLot;
|
||||
|
||||
@Transient
|
||||
@ApiParam("实际数量")
|
||||
private Double actualQty;
|
||||
|
||||
@Transient
|
||||
@ApiParam("推荐批次")
|
||||
private String recommondLot;
|
||||
|
||||
@Transient
|
||||
@ApiParam("推荐库位")
|
||||
private String recommondLocateNo;
|
||||
|
||||
@Transient
|
||||
@ApiParam("前端表格编辑使用")
|
||||
private Boolean isSet = false;
|
||||
|
||||
@Transient
|
||||
@ApiParam("生产日期")
|
||||
public String dateCode;
|
||||
|
||||
@ApiParam(value = "散件移库输入移库数量")
|
||||
@Transient
|
||||
public Double inputMoveQty;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value = "标准包装", example = "1")
|
||||
private Double snp;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value = "条码总数量", example = "1")
|
||||
private Double detailsSnCount;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value = "余数", example = "1")
|
||||
private Double restQty;
|
||||
|
||||
@Transient
|
||||
@ApiParam("任务状态")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
|
||||
private Integer isTask;
|
||||
|
||||
@Transient
|
||||
@ApiParam("主表单据状态")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
|
||||
private Integer orderMasterStatus;
|
||||
|
||||
@Transient
|
||||
@ApiParam("打印状态")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description")
|
||||
private Integer printStatus;
|
||||
|
||||
@Transient
|
||||
@ApiParam("优先级")
|
||||
private Integer priority;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value = "汇总需求数量", example = "0")
|
||||
public Double sumQty;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value = "汇总拣货数量", example = "0")
|
||||
public Double sumPickQty;
|
||||
|
||||
@Transient
|
||||
@ApiParam("执行状态")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_EXECUTE_STATUS.class, refForeignKey = "value", value = "description")
|
||||
private Integer executeStatus;
|
||||
|
||||
@Version
|
||||
@Column(name = "LOCK_VERSION")
|
||||
@ApiParam(value = "乐观锁", example = "1")
|
||||
public transient Integer lockVersion;
|
||||
|
||||
@Transient
|
||||
@ApiParam("移动类型")
|
||||
public Integer moveType;
|
||||
|
||||
@Transient
|
||||
@ApiParam("业务类型")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
|
||||
public Integer busiType;
|
||||
|
||||
@Column(name = "IS_SN")
|
||||
@ApiParam(value = "条码生成状态", example = "20")
|
||||
public Integer isSn;
|
||||
|
||||
|
||||
public WmsTmsShippingExtDetail () {
|
||||
|
||||
}
|
||||
|
||||
|
||||
public String getRecommondLot() {
|
||||
return recommondLot == null ? "无" : this.recommondLot;
|
||||
}
|
||||
|
||||
public Double getQty() {
|
||||
return qty == null ? 0D : this.qty.doubleValue();
|
||||
}
|
||||
|
||||
public Double getOutQty() {
|
||||
return outQty == null ? 0D : this.outQty.doubleValue();
|
||||
}
|
||||
|
||||
public Double getPickQty() {
|
||||
return pickQty == null ? 0D : this.pickQty.doubleValue();
|
||||
}
|
||||
|
||||
public Double getActualQty() {
|
||||
return actualQty == null ? 0D : this.actualQty.doubleValue();
|
||||
}
|
||||
|
||||
public Double getRecQty() {
|
||||
return recQty == null ? 0D : this.recQty.doubleValue();
|
||||
}
|
||||
|
||||
public Integer getIsTaskVal() {
|
||||
return isTask == null ? 0 : this.isTask.intValue();
|
||||
}
|
||||
|
||||
public Integer getOrderMasterStatus() {
|
||||
return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue();
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
package cn.estsh.i3plus.pojo.wms.dto;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description :装车单入参
|
||||
* @Reference :
|
||||
* @Author : gcj
|
||||
* @CreateDate : 2019-12-07 16:06
|
||||
* @Modify:
|
||||
**/
|
||||
@Api("装车单批量入参")
|
||||
@Data
|
||||
public class WmsTmsShipBacthDto extends BaseDto implements Serializable {
|
||||
@ApiParam("装车单集合")
|
||||
private List<WmsTmsShipDto> wmsTmsShipDtoList=new ArrayList<>();
|
||||
}
|
||||
@ -0,0 +1,41 @@
|
||||
package cn.estsh.i3plus.pojo.wms.modelbean;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.persistence.Column;
|
||||
|
||||
/**
|
||||
* @Description :装车单打印输出model
|
||||
* @Reference :
|
||||
* @Author :QianHuaSheng
|
||||
* @CreateDate : 2020-04-10 3:21 下午
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Api("静态盘点查询输出model")
|
||||
public class WmsTmsShippingExtDeatilModel {
|
||||
|
||||
@ApiParam(value ="零件号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name="PART_NAME_RDD")
|
||||
@ApiParam(value ="零件名称")
|
||||
private String partNameRdd;
|
||||
|
||||
@ApiParam("需求数量")
|
||||
private Double qty;
|
||||
|
||||
@ApiParam("发运数量")
|
||||
private Double shippQty;
|
||||
|
||||
@ApiParam("箱数")
|
||||
private Integer boxQty;
|
||||
|
||||
@ApiParam("标准包装")
|
||||
private Double snp;
|
||||
|
||||
@ApiParam("收货数量")
|
||||
private String receivedQuantity="";
|
||||
}
|
||||
@ -0,0 +1,133 @@
|
||||
package cn.estsh.i3plus.pojo.wms.modelbean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsTmsShippingExt;
|
||||
import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipModel;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description :装车单打印输出model
|
||||
* @Reference :
|
||||
* @Author :QianHuaSheng
|
||||
* @CreateDate : 2020-04-10 3:21 下午
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Api("静态盘点查询输出model")
|
||||
public class WmsTmsShippingExtModel {
|
||||
|
||||
@ApiParam(value = "移库单号")
|
||||
private String moveNo="";
|
||||
|
||||
@ApiParam(value = "到货地点")
|
||||
private String destination="";
|
||||
|
||||
@ApiParam(value = "接收人")
|
||||
private String recUser="";
|
||||
|
||||
@ApiParam(value = "接收人电话")
|
||||
private String recPhone="";
|
||||
|
||||
@ApiParam(value = "道口")
|
||||
private String dockNo="";
|
||||
|
||||
@ApiParam(value = "承运商编号")
|
||||
private String vendorNo="";
|
||||
|
||||
@ApiParam(value = "承运商名称RDD")
|
||||
private String vendorName="";
|
||||
|
||||
@ApiParam(value = "驾驶员编号")
|
||||
private String driverNo="";
|
||||
|
||||
@ApiParam(value = "驾驶员名称RDD")
|
||||
private String driverName="";
|
||||
|
||||
@ApiParam(value = "驾驶员联系方式RDD")
|
||||
private String phone="";
|
||||
|
||||
@ApiParam(value = "单据状态")
|
||||
private Integer orderStatus=0;
|
||||
|
||||
@ApiParam(value = "客户名称RDD")
|
||||
private String custName="";
|
||||
|
||||
@ApiParam(value = "客户编号RDD")
|
||||
private String custNo="";
|
||||
|
||||
@ApiParam(value = "车牌号RDD")
|
||||
private String carNo="";
|
||||
|
||||
@ApiParam(value = "计划发车时间")
|
||||
private String deliveryTime="";
|
||||
|
||||
@ApiParam(value = "要求到货时间")
|
||||
private String arrivelTime="";
|
||||
|
||||
@ApiParam(value = " 申请部门")
|
||||
private String depart="";
|
||||
|
||||
@ApiParam("物料编码")
|
||||
private String partNo="";
|
||||
|
||||
@ApiParam("关联单号")
|
||||
private String refOrderNo="";
|
||||
|
||||
@ApiParam("回执单地址")
|
||||
private String pathUrl="";
|
||||
|
||||
@ApiParam("打印模板列表")
|
||||
private List<WmsTmsShipModel> shipModels=new ArrayList<>();
|
||||
|
||||
//需求仓库-目的仓库
|
||||
@ApiParam("目的仓库")
|
||||
private String descWarehouse="";
|
||||
|
||||
//承运商-物流供应商
|
||||
@ApiParam("物流供应商")
|
||||
private String logisticsVendorNo="";
|
||||
|
||||
//运输方式-单据运输方式（维护内容）
|
||||
@ApiParam("单据运输方式")
|
||||
private Integer documentTransportMethod=0;
|
||||
|
||||
//是否不良品调拨—调拨单录入字段
|
||||
@ApiParam("调拨单录入字段")
|
||||
private String defectiveAllocation="";
|
||||
|
||||
@ApiParam("发运时间")
|
||||
private String shippingTime="";
|
||||
|
||||
@ApiParam("发运人")
|
||||
private String shippingUser="";
|
||||
|
||||
@ApiParam("下单日期")
|
||||
private String orderDate="";
|
||||
|
||||
@ApiParam("模板编号")
|
||||
private String templateNo="";
|
||||
|
||||
//装车单明细已物料区分
|
||||
@ApiParam("各个物料详情")
|
||||
private List<WmsTmsShippingExtDeatilModel> tmsShippingExtDeatilModels = new ArrayList<>();
|
||||
|
||||
public WmsTmsShippingExtModel() {
|
||||
|
||||
}
|
||||
|
||||
public WmsTmsShippingExtModel(WmsTmsShippingExt wmsTmsShippingExt) {
|
||||
this.moveNo = wmsTmsShippingExt.getMoveNo();
|
||||
this.descWarehouse=wmsTmsShippingExt.getDescWarehouse();
|
||||
this.vendorName=wmsTmsShippingExt.getVendorName();
|
||||
this.documentTransportMethod=wmsTmsShippingExt.getDocumentTransportMethod();
|
||||
this.shippingTime=wmsTmsShippingExt.getCreateDatetime();
|
||||
this.shippingUser=wmsTmsShippingExt.getCreateUser();
|
||||
this.defectiveAllocation=wmsTmsShippingExt.getDefectiveAllocation();
|
||||
this.refOrderNo=wmsTmsShippingExt.getRefOrderNo();
|
||||
this.orderDate=wmsTmsShippingExt.getCreateDatetime();
|
||||
}
|
||||
}
|
||||
@ -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.WmsTmsShippingExtDetail;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description : 装车单明细
|
||||
* @Reference :
|
||||
* @author: qianhuasheng
|
||||
* @date: 2019/9/19 14:22
|
||||
* @Modify:
|
||||
*/
|
||||
|
||||
@Repository
|
||||
public interface IWmsTmsShippingExtDetailRepository extends BaseRepository<WmsTmsShippingExtDetail,Long> {
|
||||
}
|
||||
@ -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.WmsTmsShippingExtSn;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description : 装车单条码明细
|
||||
* @Reference :
|
||||
* @author: qianhuasheng
|
||||
* @date: 2019/9/19 14:22
|
||||
* @Modify:
|
||||
*/
|
||||
|
||||
@Repository
|
||||
public interface IWmsTmsShippingExtSnRepository extends BaseRepository<WmsTmsShippingExtSn,Long> {
|
||||
}
|
||||
Loading…
Reference in New Issue