【冲突】
commit
4c3571182c
@ -0,0 +1,54 @@
|
||||
package cn.estsh.i3plus.pojo.model.mes;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description : Mes电检检测实体字段Model信息
|
||||
* @Reference :
|
||||
* @Author : siliter.yuan
|
||||
* @CreateDate : 2020-06-01 09:53
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
public class MesElectricDataModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -6376845639646546495L;
|
||||
|
||||
@ApiParam(value = "车型")
|
||||
public String carType;
|
||||
|
||||
@ApiParam(value = "颜色代码")
|
||||
public String colorCode;
|
||||
|
||||
@ApiParam(value = "日期时间")
|
||||
private String dateTime;
|
||||
|
||||
@ApiParam(value = "生产序号")
|
||||
private String productSeq;
|
||||
|
||||
@ApiParam(value = "车型信息")
|
||||
private String carTypeInfo;
|
||||
|
||||
@ApiParam(value = "生产模式")
|
||||
private String productModel;
|
||||
|
||||
@ApiParam(value = "产品生产号")
|
||||
private String productNumber;
|
||||
|
||||
@ApiParam(value = "备用")
|
||||
private String spare;
|
||||
|
||||
@ApiParam(value = "所有零件信息包括所有选配信息")
|
||||
private String other;
|
||||
|
||||
@ApiParam(value = "电检结果")
|
||||
private String electricResult;
|
||||
|
||||
@ApiParam(value = "文件名称")
|
||||
private String ftpFileName;
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package cn.estsh.i3plus.pojo.model.mes;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description : Mes电检检测补录数据实体字段Model信息
|
||||
* @Reference :
|
||||
* @Author : siliter.yuan
|
||||
* @CreateDate : 2020-06-02 09:53
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class MesElectricMarkUpDataModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -6376845779646546495L;
|
||||
|
||||
@ApiParam(value = "工作中心代码")
|
||||
public String workCenterCode;
|
||||
|
||||
@ApiParam(value = "工作单元代码")
|
||||
public String workCellCode;
|
||||
|
||||
@ApiParam(value = "过程条码")
|
||||
private String serialNumber;
|
||||
|
||||
@ApiParam(value = "产品生产号")
|
||||
private String productNumber;
|
||||
|
||||
@ApiParam(value = "电检结果")
|
||||
private String electricResult;
|
||||
|
||||
@ApiParam(value = "测试时间")
|
||||
private String testDateTime;
|
||||
|
||||
@ApiParam(value = "是否补录")
|
||||
private Integer isMarkUp;
|
||||
|
||||
@ApiParam(value = "补录时间")
|
||||
private String markUpDateTime;
|
||||
|
||||
@ApiParam(value = "开始时间")
|
||||
private String startDateTimeStr;
|
||||
|
||||
@ApiParam(value = "结束时间")
|
||||
private String endDateTimeStr;
|
||||
|
||||
public MesElectricMarkUpDataModel(String workCenterCode, String workCellCode, String serialNumber, String productNumber,
|
||||
String electricResult, String testDateTime, Integer isMarkUp, String markUpDateTime) {
|
||||
this.workCenterCode = workCenterCode;
|
||||
this.workCellCode = workCellCode;
|
||||
this.serialNumber = serialNumber;
|
||||
this.productNumber = productNumber;
|
||||
this.electricResult = electricResult;
|
||||
this.testDateTime = testDateTime;
|
||||
this.isMarkUp = isMarkUp;
|
||||
this.markUpDateTime = markUpDateTime;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,73 @@
|
||||
package cn.estsh.i3plus.pojo.model.wms;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jimmy.zeng
|
||||
* @CreateDate : 2020-06-02 9:27
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class WmsLocateModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 2433931236774158401L;
|
||||
|
||||
@ApiParam(value = "箱数")
|
||||
public Long snBoxQty;
|
||||
|
||||
@ApiParam(value = "最大包装数量")
|
||||
public Integer maxPackageQty;
|
||||
|
||||
@ApiParam(value = "库位利用率值")
|
||||
public Double proportionValue;
|
||||
|
||||
@ApiParam(value = "库位代码")
|
||||
public String locateNo;
|
||||
|
||||
@ApiParam(value = "库位名称")
|
||||
public String locateName;
|
||||
|
||||
@ApiParam(value = "存储区代码")
|
||||
public String zoneNo;
|
||||
|
||||
@ApiParam(value = "存储区名称")
|
||||
public String zoneName;
|
||||
|
||||
@ApiParam(value = "仓库代码")
|
||||
public String whNo;
|
||||
|
||||
@ApiParam(value = "仓库名称")
|
||||
public String whNoName;
|
||||
|
||||
@ApiParam(value = "组织代码")
|
||||
public String organizeCode;
|
||||
|
||||
@ApiParam(value = "库位利用率查询")
|
||||
public Integer proportion;
|
||||
|
||||
@ApiParam(value = "库位利用率")
|
||||
public String proportionValueStr;
|
||||
|
||||
public WmsLocateModel() {
|
||||
}
|
||||
|
||||
public WmsLocateModel(Long snBoxQty, Integer maxPackageQty, Double proportionValue,
|
||||
String locateNo, String locateName, String zoneNo,
|
||||
String zoneName, String whNo, String whNoName, String organizeCode) {
|
||||
this.snBoxQty = snBoxQty;
|
||||
this.maxPackageQty = maxPackageQty;
|
||||
this.proportionValue = proportionValue;
|
||||
this.locateNo = locateNo;
|
||||
this.locateName = locateName;
|
||||
this.zoneNo = zoneNo;
|
||||
this.zoneName = zoneName;
|
||||
this.whNo = whNo;
|
||||
this.whNoName = whNoName;
|
||||
this.organizeCode = organizeCode;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue