From d0d9a467a31d6dce9f9483be259aaa9c2675cc0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 25 Jun 2019 15:07:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B9=90=E8=A7=82=E9=94=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=95=B0=E5=AD=97=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index 913e031..c734ff1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -122,7 +122,7 @@ public class WmsASNMasterDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public transient int lockVersion; + public transient Integer lockVersion; @Transient @ApiParam("实收数量") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 7c8267c..67377b4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -209,5 +209,5 @@ public class WmsDocMovementDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public transient int lockVersion; + public transient Integer lockVersion; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index e6e934f..314e492 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -146,7 +146,7 @@ public class WmsPOMasterDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - private transient int lockVersion; + private transient Integer lockVersion; @Transient @ApiParam("PO条码总箱数") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index f7ed231..d7e8232 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -84,5 +84,5 @@ public class WmsQCDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public transient int lockVersion; + public transient Integer lockVersion; } From 4309454d2a10ef70927f58520eca459fd576bac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 25 Jun 2019 15:15:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96=20EXCEL=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=80=9A=E7=94=A8=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 6b6f7c2..1575b05 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -84,6 +84,7 @@ public class AndonHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", result); getStringBuilderPack(mesWorkCell, result); return result; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 60eec44..6dc423e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -247,7 +247,7 @@ public class AndonEnumUtil { EQUIP("EQUMENT_ALARM","设备"), PROCESS("ROUTING_ALARM","工艺"), CHECK("OTHER_ALARM","其他"), - FIX_ERROR("FIX_ERROR", "设备故障"); + FIX_ERROR("FIX_ERROR", "自动报警"); private String value; private String description;