From acc907dd28166ed7677be1e569439af9c221aa16 Mon Sep 17 00:00:00 2001 From: luweihao Date: Tue, 21 Jan 2020 09:48:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?task=20`1295`=20mes=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 5 +++-- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java index 6eb2592..6c7b997 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java @@ -24,10 +24,11 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PRODUCE_SN", indexes = { - @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PRODUCT_SN"), @Index(columnList = "CREATE_DATE_TIME") -}) +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"SERIAL_NUMBER"})} +) @Api("产品条码表") public class MesProduceSn extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 3a0cbbb..7619062 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -25,11 +25,11 @@ import java.math.BigDecimal; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PRODUCE_SN", indexes = { - @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PRODUCT_SN"), @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "PART_NO") -}) +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"SERIAL_NUMBER"})}) @Api("产品条码表") public class MesProduceSn extends BaseBean implements Serializable { From e14e813230a1320b943a97f8673ae9546ffa5c02 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 21 Jan 2020 13:36:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=907476=20=E5=8F=91=E8=BF=90=E7=9A=84?= =?UTF-8?q?=E6=96=B0=E8=80=81=E6=A0=87=E7=AD=BE=E5=AF=B9=E5=BA=94=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 8c32ae6..fd72780 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1294,6 +1294,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result); + DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getCustSn(), "custSn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); if (wmsStockSn.getIsValid() != null) {