流设置添加2种新类型

generated/com/miniframe/generate/comm/mdo/A_MDO0052.java

@@ -35,4 +35,17 @@ public class A_MDO0052 extends BaseMapModel implements Serializable {
 	public String getComid() {
 		return this.comid;
 	}
+	int type;//流数据种类 2求解组件到优化组件 3求解组件到求解组件
+	/**
+	 *流数据种类 2求解组件到优化组件 3求解组件到求解组件
+	 */
+	public void setType(int type) {
+		this.type=type;
+	}
+	/**
+	 *流数据种类 2求解组件到优化组件 3求解组件到求解组件
+	 */
+	public int getType() {
+		return this.type;
+	}
 }

generated/com/miniframe/generate/comm/mdo/D_MDO0052_PARAMS_RECODE.java

@@ -74,15 +74,15 @@ public class D_MDO0052_PARAMS_RECODE extends BaseMapModel implements Serializabl
 	public int getSteamflag() {
 		return this.steamflag;
 	}
-	int steamtype;//流分析类型 1 约束条件 2优化目标
+	int steamtype;//流分析类型 1 约束条件 2优化目标 3 求解组件到求解组件
 	/**
-	 *流分析类型 1 约束条件 2优化目标
+	 *流分析类型 1 约束条件 2优化目标 3 求解组件到求解组件
 	 */
 	public void setSteamtype(int steamtype) {
 		this.steamtype=steamtype;
 	}
 	/**
-	 *流分析类型 1 约束条件 2优化目标
+	 *流分析类型 1 约束条件 2优化目标 3 求解组件到求解组件
 	 */
 	public int getSteamtype() {
 		return this.steamtype;

generated/validateform/a_mdo0052Form.xml

@@ -10,6 +10,9 @@
 <field property="comid" depends="required">
     <arg0 key="a_mdo0052.comid"/>
 </field>
+<field property="type" depends="required">
+    <arg0 key="a_mdo0052.type"/>
+</field>
 </form>
 </formset>
 </form-validation>

generated/validator/resources_a_mdo0052Form_validator.properties

@@ -1,3 +1,4 @@
 a_mdo0052.pid = \u9879\u76EEID
 a_mdo0052.comid = \u7EC4\u4EF6ID
+a_mdo0052.type = \u6D41\u6570\u636E\u79CD\u7C7B2\u6C42\u89E3\u7EC4\u4EF6\u5230\u4F18\u5316\u7EC4\u4EF63\u6C42\u89E3\u7EC4\u4EF6\u5230\u6C42\u89E3\u7EC4\u4EF6
 a_mdo0052Form = true

generated/validator/resources_a_mdo0052Form_validator_zh_CN.properties

@@ -1,3 +1,4 @@
 a_mdo0052.pid = \u9879\u76EEID
 a_mdo0052.comid = \u7EC4\u4EF6ID
+a_mdo0052.type = \u6D41\u6570\u636E\u79CD\u7C7B2\u6C42\u89E3\u7EC4\u4EF6\u5230\u4F18\u5316\u7EC4\u4EF63\u6C42\u89E3\u7EC4\u4EF6\u5230\u6C42\u89E3\u7EC4\u4EF6
 a_mdo0052Form = true

generated/validator/resources_d_mdo0052_params_recodeForm_validator.properties

@@ -3,5 +3,5 @@ d_mdo0052_params_recode.code = \u7F16\u53F7
 d_mdo0052_params_recode.name = \u540D\u79F0
 d_mdo0052_params_recode.comtype = \u7EC4\u4EF6\u7C7B\u578B
 d_mdo0052_params_recode.steamflag = \u6D41\u5206\u67901\u542F\u75280\u5173\u95ED
-d_mdo0052_params_recode.steamtype = \u6D41\u5206\u6790\u7C7B\u578B1\u7EA6\u675F\u6761\u4EF62\u4F18\u5316\u76EE\u6807
+d_mdo0052_params_recode.steamtype = \u6D41\u5206\u6790\u7C7B\u578B1\u7EA6\u675F\u6761\u4EF62\u4F18\u5316\u76EE\u68073\u6C42\u89E3\u7EC4\u4EF6\u5230\u6C42\u89E3\u7EC4\u4EF6
 d_mdo0052_params_recodeForm = true

generated/validator/resources_d_mdo0052_params_recodeForm_validator_zh_CN.properties

@@ -3,5 +3,5 @@ d_mdo0052_params_recode.code = \u7F16\u53F7
 d_mdo0052_params_recode.name = \u540D\u79F0
 d_mdo0052_params_recode.comtype = \u7EC4\u4EF6\u7C7B\u578B
 d_mdo0052_params_recode.steamflag = \u6D41\u5206\u67901\u542F\u75280\u5173\u95ED
-d_mdo0052_params_recode.steamtype = \u6D41\u5206\u6790\u7C7B\u578B1\u7EA6\u675F\u6761\u4EF62\u4F18\u5316\u76EE\u6807
+d_mdo0052_params_recode.steamtype = \u6D41\u5206\u6790\u7C7B\u578B1\u7EA6\u675F\u6761\u4EF62\u4F18\u5316\u76EE\u68073\u6C42\u89E3\u7EC4\u4EF6\u5230\u6C42\u89E3\u7EC4\u4EF6
 d_mdo0052_params_recodeForm = true

src/main/java/com/miniframe/bisiness/mdo/MDO0052Service.java

@@ -24,6 +24,7 @@ public class MDO0052Service extends MDO0052BaseModel implements ExecProcessFlow
 	public void transExecute() throws Exception {
 		String pid = this.getA_mdo0052().getPid();
 		String comid = this.getA_mdo0052().getComid();
+		int type =this.getA_mdo0052().getType();
 		MdoProInoutParaMapper outDao = UtilTools.getBean(MdoProInoutParaMapper.class);
 		MdoProInoutParaSQLBuilder outsb = new MdoProInoutParaSQLBuilder();
 		MdoProInoutParaSQLBuilder.Criteria outsc = outsb.createCriteria();
@@ -41,6 +42,17 @@ public class MDO0052Service extends MDO0052BaseModel implements ExecProcessFlow
 			row.setComtype(p.getComtype());
 			row.setSteamflag(p.getSteamflag()==null?1:p.getSteamflag());
 			row.setSteamtype(p.getSteamtype()==null?1:p.getSteamtype());
+			if(2==type){//求解组件到优化组件 排除求解组件到求解组件已设置的数据
+				if(p.getSteamtype()!=null&&p.getSteamtype().equals("3")){
+					continue;
+				}
+			}else if(3==type){//求解组件到求解组件 排除求解组件到优化组件已设置的数据
+				if(p.getSteamtype()!=null
+						&&(p.getSteamtype().equals("1")||p.getSteamtype().equals("2")
+						)){
+					continue;
+				}
+			}
 			rows.add(row);
 		}
 		this.getD_mdo0052().setParams(rows);

src/main/java/com/miniframe/bisiness/mdo/MDO0053Service.java

@@ -33,7 +33,7 @@ public class MDO0053Service extends MDO0053BaseModel implements ExecProcessFlow
 			String streamtype =pt[2];
 			MdoProInoutParaMapper pdao = UtilTools.getBean(MdoProInoutParaMapper.class);
 			MdoProInoutPara para = pdao.selectByPrimaryKey(paramid);
-			if(para!=null){
+			if(para!=null&&streamflag.equals("1")){//只修改选中的
 				comid = para.getFatherid();
 				comtype =para.getComtype();
 				para.setSteamflag(Integer.valueOf(streamflag));

src/main/java/com/miniframe/bisiness/mdo/MDO0074Service.java

@@ -29,7 +29,7 @@ public class MDO0074Service extends MDO0074BaseModel implements ExecProcessFlow
 			String streamflag = pt[1];
 			MdoProInoutParaMapper pdao = UtilTools.getBean(MdoProInoutParaMapper.class);
 			MdoProInoutPara para = pdao.selectByPrimaryKey(paramid);
-			if(para!=null){
+			if(para!=null&&streamflag.equals("1")){//只修改选中的
 				para.setSteamflag(Integer.valueOf(streamflag));
 				para.setSteamtype(3);
 				pdao.updateByPrimaryKey(para);

系统设计/通信设计/通讯报文/mdo(系统服务)/报文体/MDO0052_A(流查询).csv

@@ -1,3 +1,4 @@
 序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
 1,pid,项目ID,string,,,是,,,,,,,,
-2,comid,组件ID,string,,,是,,,,,,,,
+2,comid,组件ID,string,,,是,,,,,,,,
+3,type,流数据种类 2求解组件到优化组件 3求解组件到求解组件,int,,,是,,,,,,,,

系统设计/通信设计/通讯报文/mdo(系统服务)/报文体/MDO0052_D(流查询).csv

@@ -5,4 +5,4 @@
 1.3,name,名称,string,,,,,,,,,,,
 1.4,comtype,组件类型,int,,,,,,,,,,,
 1.5,steamflag,流分析 1 启用 0 关闭,int,,,,,,,,,,,
-1.6,steamtype,流分析类型 1 约束条件 2优化目标,int,,,,,,,,,,,
+1.6,steamtype,流分析类型 1 约束条件 2优化目标 3 求解组件到求解组件,int,,,,,,,,,,,