同步规程同步代码和录入监测代码
This commit is contained in:
@@ -334,5 +334,10 @@ public class WmsMaterialCoilVo extends BaseEntity {
|
||||
* 关联的订单列表(通过wms_coil_contract_rel中间表JOIN crm_order)
|
||||
*/
|
||||
private List<com.klp.domain.vo.WmsCoilContractRelVo> orderList;
|
||||
|
||||
private Long specId;
|
||||
private Long versionId;
|
||||
private String specCode;
|
||||
private String versionCode;
|
||||
}
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
@@ -41,4 +42,18 @@ public class WmsProcessSpecVersionVo {
|
||||
@ExcelProperty(value = "更新时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTime;
|
||||
|
||||
private BigDecimal matchEntryThickMin;
|
||||
private BigDecimal matchEntryThickMax;
|
||||
private BigDecimal matchExitThickMin;
|
||||
private BigDecimal matchExitThickMax;
|
||||
private BigDecimal matchEntryWidthMin;
|
||||
private BigDecimal matchEntryWidthMax;
|
||||
private BigDecimal matchExitWidthMin;
|
||||
private BigDecimal matchExitWidthMax;
|
||||
private String matchSteelGrade;
|
||||
|
||||
private String specCode;
|
||||
private String specName;
|
||||
private Long lineId;
|
||||
}
|
||||
|
||||
@@ -64,6 +64,11 @@ public class WmsProductionLineVo {
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 产线支持的操作类型(逗号分隔,1=分卷,2=合卷,3=更新)
|
||||
*/
|
||||
private String actionType;
|
||||
|
||||
/**
|
||||
* 关联的排产计划明细数量
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user