From 755e9205133d1e5ca0e0bc90e622ca3d6594b566 Mon Sep 17 00:00:00 2001 From: jokelone Date: Thu, 7 Nov 2019 15:55:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90bug=EF=BC=9A6250=20=E8=BF=94?= =?UTF-8?q?=E5=B7=A5=E8=BF=94=E4=BF=AE=E6=8B=86=E8=A7=A3=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java | 4 ++++ .../i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java | 14 ++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java index ea4b34b..33b2402 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java @@ -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; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java index 42840a9..1487bb8 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java @@ -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; } } From e26dadca0140ea9c2ed3a140b5689aea495756d9 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 7 Nov 2019 17:30:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1162?= =?UTF-8?q?=EF=BC=8Cpcn=E7=99=BB=E9=99=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java | 9 --------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index c95c425..4ab5bdd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -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; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java index f1e5193..e2dbc11 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java @@ -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;