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

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

@@ -1463,8 +1463,10 @@ public class MesEnumUtil {
         MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"),
         MES_DATASOURCE(360, "DB地址清单"),
         MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"),
-        MES_EQU_NOTIFY_OBJECT_CFG(380, "设备通知对象"),
-        MES_PLC(390, "PLC地址清单");
+        MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"),
+        MES_PLC(390,"PLC地址清单"),
+        MES_PROCESS(400,"工序信息"),
+        MES_KPSN_RULE(410,"关键件条码校验规则");
 
         private int value;
         private String description;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java

@@ -40,6 +40,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @ApiParam("工作单元名称")
+    private String workCellName;
+
     @ApiParam("流程代码")
     private String routeCode;