Merge branch 'dev' into test

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 {
 

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 {
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1295,6 +1295,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) {