Merge remote-tracking branch 'origin/ext-dev' into ext-dev

# Conflicts:
#	modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -545,6 +545,9 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java

@@ -36,6 +36,16 @@ import java.io.Serializable;
 public class MesProduceSnTravel extends BaseBean implements Serializable {
     private static final long serialVersionUID = -1807953720033107108L;
 
+    @Version
+    @Column(name = "LOCK_VERSION")
+    @ApiParam(value = "乐观锁", example = "1")
+    public Integer lockVersion;
+
+    @Column(name = "SYSTEM_SYNC_STATUS")
+    @ColumnDefault("2")
+    @ApiParam(value = "系统同步标志")
+    public Integer systemSyncStatus;
+
     @Column(name = "SERIAL_NUMBER")
     @ApiParam("过程条码")
     private String serialNumber;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -1462,7 +1462,7 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesPlc.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCenterCode(), "workCenterCode", packBean);
         }
-        if (!StringUtils.isEmpty(mesPlc.getPlcCode())) {
+        if (!StringUtils.isEmpty(mesPlc.getWorkCellCode())) {
             DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCellCode(), "workCellCode", packBean);
         }
         if (!StringUtils.isEmpty(mesPlc.getEquipmentCode())) {

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java

@@ -131,6 +131,9 @@ public class WmsActionResponseBean<Obj> implements Serializable {
     @ApiParam(value = "是否重置")
     private Integer isReset;
 
+//    @ApiParam(value = "任务编号")
+//    private String taskNo;
+
     public WmsActionResponseBean(Boolean codeStatus, String message) {
         this.codeStatus = codeStatus;
         this.message = message;