|
|
|
@ -24,24 +24,22 @@ public class ProOrder extends TreeEntity {
|
|
|
|
|
@Excel(name = "计划工厂编码")
|
|
|
|
|
private String planFactoryCode;
|
|
|
|
|
|
|
|
|
|
/** 计划工厂编码 */
|
|
|
|
|
@Excel(name = "工厂编码")
|
|
|
|
|
/** 工厂编码 */
|
|
|
|
|
private String factoryCode;
|
|
|
|
|
|
|
|
|
|
/** 订单类型 */
|
|
|
|
|
@Excel(name = "订单类型")
|
|
|
|
|
private String orderType;
|
|
|
|
|
|
|
|
|
|
/** 订单号 */
|
|
|
|
|
@Excel(name = "订单号")
|
|
|
|
|
@Excel(name = "订单号",width = 30)
|
|
|
|
|
private String orderCode;
|
|
|
|
|
|
|
|
|
|
/** 物料号 */
|
|
|
|
|
@Excel(name = "物料号")
|
|
|
|
|
@Excel(name = "物料号",width = 30)
|
|
|
|
|
private String prodCode;
|
|
|
|
|
|
|
|
|
|
/** 物料名称 */
|
|
|
|
|
@Excel(name = "物料名称")
|
|
|
|
|
@Excel(name = "物料名称",width = 30)
|
|
|
|
|
private String prodDesc;
|
|
|
|
|
|
|
|
|
|
/** 订单数量 */
|
|
|
|
@ -57,7 +55,6 @@ public class ProOrder extends TreeEntity {
|
|
|
|
|
private String unit;
|
|
|
|
|
|
|
|
|
|
/** 任务清单 */
|
|
|
|
|
@Excel(name = "任务清单")
|
|
|
|
|
private String workerOrder;
|
|
|
|
|
|
|
|
|
|
public Long getQuantitySplit() {
|
|
|
|
@ -70,32 +67,28 @@ public class ProOrder extends TreeEntity {
|
|
|
|
|
|
|
|
|
|
/** 计划生产日期 */
|
|
|
|
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
|
|
|
|
@Excel(name = "计划生产日期", width = 30, dateFormat = "yyyy-MM-dd")
|
|
|
|
|
@Excel(name = "计划生产日期", width = 20, dateFormat = "yyyy-MM-dd")
|
|
|
|
|
private Date planProDate;
|
|
|
|
|
|
|
|
|
|
/** 计划完成日期 */
|
|
|
|
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
|
|
|
|
@Excel(name = "计划完成日期", width = 30, dateFormat = "yyyy-MM-dd")
|
|
|
|
|
@Excel(name = "计划完成日期", width = 20, dateFormat = "yyyy-MM-dd")
|
|
|
|
|
private Date planComplete;
|
|
|
|
|
|
|
|
|
|
/** $column.columnComment */
|
|
|
|
|
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
|
|
|
|
private String atrr1;
|
|
|
|
|
|
|
|
|
|
/** $column.columnComment */
|
|
|
|
|
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
|
|
|
|
private String atrr2;
|
|
|
|
|
|
|
|
|
|
/** $column.columnComment */
|
|
|
|
|
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
|
|
|
|
private String atrr3;
|
|
|
|
|
|
|
|
|
|
/** 0未拆分 */
|
|
|
|
|
@Excel(name = "0未拆分")
|
|
|
|
|
@Excel(name = "订单状态", readConverterExp = "o0=未拆分,o1=已拆分")
|
|
|
|
|
private String status;
|
|
|
|
|
|
|
|
|
|
/** 上级工单 */
|
|
|
|
|
@Excel(name = "上级工单")
|
|
|
|
|
private String parentOrder;
|
|
|
|
|
|
|
|
|
|
public String getPlanFactoryCode() {
|
|
|
|
@ -107,10 +100,10 @@ public class ProOrder extends TreeEntity {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/** 产品类型 */
|
|
|
|
|
@Excel(name = "产品类型")
|
|
|
|
|
@Excel(name = "产品类型", readConverterExp = "white=白坯,prod=成品")
|
|
|
|
|
private String prodType;
|
|
|
|
|
|
|
|
|
|
/** 物料型号 */
|
|
|
|
|
@Excel(name = "物料名称")
|
|
|
|
|
private String prodSpc;
|
|
|
|
|
|
|
|
|
|
// 计划生产日期开始
|
|
|
|
@ -119,6 +112,36 @@ public class ProOrder extends TreeEntity {
|
|
|
|
|
// 计划生产日期结束
|
|
|
|
|
private String planDateEnd;
|
|
|
|
|
|
|
|
|
|
/** 创建日期 */
|
|
|
|
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
|
|
|
|
@Excel(name = "创建日期", width = 20, dateFormat = "yyyy-MM-dd")
|
|
|
|
|
private Date createTime;
|
|
|
|
|
|
|
|
|
|
/** 更新日期 */
|
|
|
|
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
|
|
|
|
@Excel(name = "更新日期", width = 20, dateFormat = "yyyy-MM-dd")
|
|
|
|
|
private Date updateTime;
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public Date getCreateTime() {
|
|
|
|
|
return createTime;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public void setCreateTime(Date createTime) {
|
|
|
|
|
this.createTime = createTime;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public Date getUpdateTime() {
|
|
|
|
|
return updateTime;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public void setUpdateTime(Date updateTime) {
|
|
|
|
|
this.updateTime = updateTime;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public String getPlanDateStart() {
|
|
|
|
|
return planDateStart;
|
|
|
|
|
}
|
|
|
|
|