yun-zuoyi
alwaysfrin 6 years ago
commit 759f9ee819

@ -2712,7 +2712,8 @@ public class MesEnumUtil {
PCN_PUSH(70, "PCN_PUSH"),
FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"),
REWORK_REPAIR(90, "REWORK_REPAIR"),
PCN_LOGIN(100, "PCN_LOGIN");
PCN_LOGIN(100, "PCN_LOGIN"),
PCN_MENU(110, "PCN_MENU");
private int value;
private String description;

@ -85,6 +85,10 @@ public class MesDismantleRecord extends BaseBean {
@ApiParam("备注")
private String memo;
@Column(name = "LOT_NO")
@ApiParam("关联批次")
private String lotNo;
@Transient
private String serialNumber;
}

@ -46,15 +46,6 @@ public class MesPcnSysUserOffline extends BaseBean {
@ApiParam(value = "登陆名称", access = "登陆名称")
private String loginName;
@Column(name = "ORGANIZE_ID")
@ApiParam(value = "部门ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long organizeId;
@Column(name = "ORGANIZE_NAME")
@ApiParam(value = "部门名称", access = "部门名称")
private String organizeName;
@Column(name="USER_TYPE")
@ApiParam(value ="账号类型(枚举,待定)" , example ="-1")
private Integer userType;

@ -46,11 +46,13 @@ public class MesProdBindRecordModel {
private String modifyDatetime;
@ApiParam("产品条码")
private String serialNumber;
@ApiParam("关联批次")
private String lotNo;
public MesProdBindRecordModel() {
}
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty) {
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty, String lotNo) {
this.id = id;
this.itemPartNo = itemPartNo;
this.itemPartName = itemPartName;
@ -64,9 +66,10 @@ public class MesProdBindRecordModel {
this.parentPartNo = parentPartNo;
this.parentPartName = parentPartName;
this.dismantleQty = dismantleQty;
this.lotNo = lotNo;
}
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName) {
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String lotNo) {
this.id = id;
this.itemPartNo = itemPartNo;
this.itemPartName = itemPartName;
@ -80,9 +83,10 @@ public class MesProdBindRecordModel {
this.kpSn = kpSn;
this.parentPartNo = parentPartNo;
this.parentPartName = parentPartName;
this.lotNo = lotNo;
}
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber) {
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber, String lotNo) {
this.id = id;
this.itemPartNo = itemPartNo;
this.itemPartName = itemPartName;
@ -101,9 +105,10 @@ public class MesProdBindRecordModel {
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
this.serialNumber = serialNumber;
this.lotNo = lotNo;
}
public MesProdBindRecordModel(String itemPartNo, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String serialNumber) {
public MesProdBindRecordModel(String itemPartNo, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String serialNumber, String lotNo) {
this.itemPartNo = itemPartNo;
this.qty = qty;
this.isValid = isValid;
@ -115,5 +120,6 @@ public class MesProdBindRecordModel {
this.kpSn = kpSn;
this.parentPartNo = parentPartNo;
this.serialNumber = serialNumber;
this.lotNo = lotNo;
}
}

Loading…
Cancel
Save