From 315787197a460c45c39b37d5cc007945a94868d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 10 Sep 2019 11:30:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=88=E6=94=B6=E8=B4=A7=EF=BC=89=EF=BC=9A?= =?UTF-8?q?=E5=85=8D=E6=A3=80=E5=86=99=E5=85=A5=E6=94=B6=E8=B4=A7=E4=BA=8B?= =?UTF-8?q?=E5=8A=A1=E5=8F=96=E7=9B=AE=E7=9A=84=E5=BA=93=E4=BD=8D=E7=9A=84?= =?UTF-8?q?=E5=80=BC+=E4=B9=90=E8=A7=82=E9=94=81=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 406067c..d16a300 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -176,7 +176,7 @@ public class WmsMoveDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public transient Integer lockVersion; + public Integer lockVersion; /* @JSONField(name="fPartNo") public String getfPartNo() { return fPartNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 8a251d8..0ffaeb3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -147,7 +147,7 @@ public class WmsMoveMaster extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public transient Integer lockVersion; + public Integer lockVersion; public WmsMoveMaster(){}; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 6f7e434..aab7504 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -186,7 +186,7 @@ public class WmsMoveSn extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public transient Integer lockVersion; + public Integer lockVersion; public WmsMoveSn() { } From f205373964532f5134fd263aa167a87ce135a5ce Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 10 Sep 2019 15:27:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=89=E7=81=AF=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=AE=89=E7=81=AF=E7=B1=BB=E5=9E=8B=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java index a0ee7fc..db58777 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java @@ -48,7 +48,7 @@ public class AndonManageQueue extends BaseBean { @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "code",value = "description") + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") private String alarmCode; @Column(name = "ACTION_CODE")