Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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;

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;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java

@@ -120,7 +120,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("实收数量")

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;
 }

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条码总箱数")

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;
 }