diff --git a/.classpath b/.classpath
index 734d2ee..fea78a7 100644
--- a/.classpath
+++ b/.classpath
@@ -92,7 +92,7 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="lib/org.eclipse.osgi.services.nl_12000.2.0.jar"/>
 	<classpathentry kind="lib" path="lib/org.eclipse.osgi.services_3.7.100.v20180827-1536.jar"/>
-	<classpathentry kind="lib" path="lib/cn.com.origin.autocode_1.0.0.jar"/>
 	<classpathentry kind="lib" path="lib/cn.com.origin.autocodemanager_1.0.0.jar"/>
+	<classpathentry kind="lib" path="lib/cn.com.origin.autocode_1.0.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/lib/cn.com.origin.autocode_1.0.0.jar b/lib/cn.com.origin.autocode_1.0.0.jar
index 27d18de..8d92202 100644
Binary files a/lib/cn.com.origin.autocode_1.0.0.jar and b/lib/cn.com.origin.autocode_1.0.0.jar differ
diff --git a/src/com/connor/dfl/plm/dfl003/Dfl003AIFDialog.java b/src/com/connor/dfl/plm/dfl003/Dfl003AIFDialog.java
index 54949ff..2ed607d 100644
--- a/src/com/connor/dfl/plm/dfl003/Dfl003AIFDialog.java
+++ b/src/com/connor/dfl/plm/dfl003/Dfl003AIFDialog.java
@@ -458,12 +458,10 @@ public class Dfl003AIFDialog extends AbstractAIFDialog {
 					} else {	
 						MessageBox.post("名称、来源码、分群码不能为空!", "提示", MessageBox.INFORMATION);
 					}
-
-
-
-
-
-
+					if(itemName.contains("\\")) {
+						MessageBox.post("名称中不能含有反斜杠!", "提示", MessageBox.INFORMATION);
+						return;
+					}
 				} else {
 					MessageBox.post("请选择创建类型!", "提示", MessageBox.INFORMATION);
 				}
@@ -569,6 +567,21 @@ public class Dfl003AIFDialog extends AbstractAIFDialog {
 						System.out.println("输入的旧品号-----"+oldId2);
 						rev.setStringProperty("t2_OldId", oldId2);
 					}
+					if(material.contains("\\")) {
+						MessageBox.post("材质中不能含有反斜杠!" ,"提示",
+								MessageBox.INFORMATION);
+						return ;
+					}
+					if(weight.contains("\\")) {
+						MessageBox.post("重量中不能含有反斜杠!" ,"提示",
+								MessageBox.INFORMATION);
+						return ;
+					}
+					if(Specifications.contains("\\")) {
+						MessageBox.post("规格中不能含有反斜杠!" ,"提示",
+								MessageBox.INFORMATION);
+						return ;
+					}
 					if(material != null && material != "" && material != " " ) {
 						rev.setStringProperty("t2_material", material);
 					}
diff --git a/src/com/connor/dfl/plm/dfl006/CreateChangeOrderDialog.java b/src/com/connor/dfl/plm/dfl006/CreateChangeOrderDialog.java
index 00352f6..b22c4bd 100644
--- a/src/com/connor/dfl/plm/dfl006/CreateChangeOrderDialog.java
+++ b/src/com/connor/dfl/plm/dfl006/CreateChangeOrderDialog.java
@@ -45,7 +45,8 @@ public class CreateChangeOrderDialog  extends AbstractAIFDialog{
 		//判断是否为变更申请单	
 		final TCComponent itemR = (TCComponent)targetComponents[0];
 		if(!itemR.getTypeComponent().toString().equals("T2_ECRRevision")) {
-			System.out.println(itemR.getTypeComponent());
+			//System.out.println(itemR.getTypeComponent());
+			
 			MessageBox.post("创建失败，请选择变更申请单版本进行创建！", "提示信息",MessageBox.INFORMATION);
 		}else {
 		
diff --git a/src/com/connor/dfl/plm/dfl010/CreateProblemSpotDialog.java b/src/com/connor/dfl/plm/dfl010/CreateProblemSpotDialog.java
index b70a3c7..8247f0e 100644
--- a/src/com/connor/dfl/plm/dfl010/CreateProblemSpotDialog.java
+++ b/src/com/connor/dfl/plm/dfl010/CreateProblemSpotDialog.java
@@ -460,7 +460,7 @@ public class CreateProblemSpotDialog extends AbstractAIFDialog {
 			String type = selCodeBean.getType();
 			TCComponentItemType tctype = (TCComponentItemType) session.getTypeComponent(type);
 			String newsid=id_field.getText();
-			System.out.println(tctype);
+			//System.out.println(tctype);
 			TCComponentItem find = tctype.find(newsid);
 			if (find != null) {
 				MessageBox.post("当前流水ID:" + newsid + "已存在对象,无法创建!", "错误",
diff --git a/src/com/connor/dfl/plm/dfl028/Dfl028AIFDialog.java b/src/com/connor/dfl/plm/dfl028/Dfl028AIFDialog.java
index 578c964..353989f 100644
--- a/src/com/connor/dfl/plm/dfl028/Dfl028AIFDialog.java
+++ b/src/com/connor/dfl/plm/dfl028/Dfl028AIFDialog.java
@@ -3,14 +3,14 @@ package com.connor.dfl.plm.dfl028;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Container;
-import java.awt.Desktop; 
+import java.awt.Desktop;
 import java.awt.Dimension;
 import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileInputStream; 
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
@@ -25,7 +25,7 @@ import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JDialog;
 import javax.swing.JFileChooser;
-import javax.swing.JLabel; 
+import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JProgressBar;
 import javax.swing.JTextField;
@@ -36,7 +36,7 @@ import org.jacorb.idl.runtime.int_token;
 import com.teamcenter.rac.aif.AbstractAIFApplication;
 import com.teamcenter.rac.aif.AbstractAIFDialog;
 import com.teamcenter.rac.aif.kernel.AIFComponentContext;
-import com.teamcenter.rac.aif.kernel.InterfaceAIFComponent; 
+import com.teamcenter.rac.aif.kernel.InterfaceAIFComponent;
 import com.teamcenter.rac.kernel.TCComponent;
 import com.teamcenter.rac.kernel.TCComponentBOMLine;
 import com.teamcenter.rac.kernel.TCComponentBOMWindow;
@@ -45,11 +45,11 @@ import com.teamcenter.rac.kernel.TCComponentDataset;
 import com.teamcenter.rac.kernel.TCComponentItem;
 import com.teamcenter.rac.kernel.TCComponentItemRevision;
 import com.teamcenter.rac.kernel.TCComponentRevisionRule;
-import com.teamcenter.rac.kernel.TCComponentTcFile; 
+import com.teamcenter.rac.kernel.TCComponentTcFile;
 import com.teamcenter.rac.kernel.TCException;
-import com.teamcenter.rac.kernel.TCSession; 
+import com.teamcenter.rac.kernel.TCSession;
 import com.teamcenter.rac.util.MessageBox;
-import com.teamcenter.rac.util.PropertyLayout; 
+import com.teamcenter.rac.util.PropertyLayout;
 
 public class Dfl028AIFDialog extends AbstractAIFDialog {
 	private AbstractAIFApplication app;
@@ -69,86 +69,114 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 	private JPanel btnPanel1;
 	private JPanel btnPanel2;
 	private JPanel btnPanel3;
-	private String hzm;  
-	private int iDataset=0;
+	private JPanel btnPanel4;
+	private String hzm;
+	private int iDataset = 0;
 	private String datasetDir;
-	private Boolean outPartBool=false;
+	private Boolean outPartBool = false;
 	private JProgressBar bar;
-	private long fileSize=0;  
-	private Boolean allCheck=false;
-	private List<String> noFileList=new ArrayList<String>();
-	private List<String> datasetList=new ArrayList<String>();
-	private Map<String, String> pathMap=new HashMap<String, String>();
+	private long fileSize = 0;
+	private Boolean allCheck = false;
+	private List<String> noFileList = new ArrayList<String>();
+	private List<String> datasetList = new ArrayList<String>();
+	private Map<String, String> pathMap = new HashMap<String, String>();
 	private String pathString;
+	private Boolean isCarryRev = true;
+	private List<String> carryRevList;
 	ExecutorService pool = Executors.newCachedThreadPool();
-	public Dfl028AIFDialog(AbstractAIFApplication arg0){
+
+	public Dfl028AIFDialog(AbstractAIFApplication arg0) {
 		this.app = arg0;
-		this.session = (TCSession)app.getSession();
+		this.session = (TCSession) app.getSession();
 		this.targets = app.getTargetComponents();
-		
+
 	}
+
 	@Override
 	public void run() {
-		//显示窗口
-		init();	
-		//启用查询按钮
+		// 显示窗口
+		init();
+		// 启用查询按钮
 //		qryBtn.setEnabled(true);	
 	}
-	//获取下载文件列表
-	private void getload(TCComponentDataset dataset,String path,List<String> list,String itemid){
-		try {  
+
+	// 获取下载文件列表
+	private void getload(TCComponentDataset dataset, String path, List<String> list, String itemid) {
+		
+		try {
 			TCComponentTcFile[] file = dataset.getTcFiles();
-			if(file == null || file.length ==0){ 
-				if(itemid.equals("sjj")) {
-					String noFileString=path+"_"+dataset.getStringProperty("object_name");
+			if (file == null || file.length == 0) {
+				if (itemid.equals("sjj")) {
+					String noFileString = path + "_" + dataset.getStringProperty("object_name");
 					noFileList.add(noFileString);
-				}else {
+				} else {
 					AIFComponentContext[] itemRev = dataset.whereReferenced();
-					String items="";
-					for(AIFComponentContext context:itemRev) {
-						if(context.getComponent() instanceof TCComponentItemRevision) {
-							TCComponentItemRevision revision=(TCComponentItemRevision)context.getComponent();
-							items=revision.getStringProperty("item_id")+"_"+revision.getStringProperty("current_revision_id");
+					String items = "";
+					for (AIFComponentContext context : itemRev) {
+						if (context.getComponent() instanceof TCComponentItemRevision) {
+							TCComponentItemRevision revision = (TCComponentItemRevision) context.getComponent();
+							items = revision.getStringProperty("item_id") + "_"
+									+ revision.getStringProperty("current_revision_id");
 						}
 					}
-					String noFileString=items+"_"+dataset.getStringProperty("object_name");
+					String noFileString = items + "_" + dataset.getStringProperty("object_name");
 					noFileList.add(noFileString);
-				} 
+				}
 				return;
-			}else{
-				for(int i=0;i<file.length;i++){
-					if(!file[i].getType().equals("ImanFile")){
+			} else {
+				for (int i = 0; i < file.length; i++) {
+					if (!file[i].getType().equals("ImanFile")) {
 						continue;
 					}
-					//获取后缀名
-					 hzm = file[i].getTCProperty("file_ext").getStringValue();
-				    //获取文件名（带后缀）
-					 if(list.contains(hzm)) {
-						 String name = file[i].getTCProperty("original_file_name").getStringValue();
-							if(name.contains(".")){
-								//获取文件名（不带后缀）
-								name = name.substring(0, name.lastIndexOf("."));
+					// 获取后缀名
+					hzm = file[i].getTCProperty("file_ext").getStringValue();
+					// 获取文件名（带后缀）
+					if (list.contains(hzm)) {
+						String name = file[i].getTCProperty("original_file_name").getStringValue();
+						AIFComponentContext[] itemRev = dataset.whereReferenced();
+						for (AIFComponentContext context : itemRev) {
+							if (context.getComponent() instanceof TCComponentItemRevision) {
+								TCComponentItemRevision revision = (TCComponentItemRevision) context.getComponent();
+								if ("T2_OutBuyPartRevision".equals(revision.getType())
+										|| "T2_outsourceRevision".equals(revision.getType()) || "T2_VirtualRevision".equals(revision.getType())) {
+									if(isCarryRev) {
+										name = revision.getStringProperty("item_id")
+												+ revision.getStringProperty("current_revision_id") + " "
+												+ revision.getStringProperty("object_name");
+									}else {
+										
+									}
+								} else {
+									name = revision.getStringProperty("item_id") + " "
+											+ revision.getStringProperty("object_name");
+								}
+
 							}
-							String replace = name.replace("/", "-").replace("<", "-").
-					                replace(">", "-").replace(":", "-").replace("|","-").
-					                replace("\\","-").replace("*","-").replace("?","-");
-							//获取文件用户下载
-							File fmsFile = file[i].getFmsFile();
-							hzmlist.add(hzm);
-							namelist.add(path+File.separator+replace);
-							fmsFilelist.add(fmsFile);
-							fileSize=fileSize+fmsFile.length();
-					 } 
+						}
+
+						if (name.contains(".")) {
+							// 获取文件名（不带后缀）
+							name = name.substring(0, name.lastIndexOf("."));
+						}
+						String replace = name.replace("/", "-").replace("<", "-").replace(">", "-").replace(":", "-")
+								.replace("|", "-").replace("\\", "-").replace("*", "-").replace("?", "-");
+						// 获取文件用户下载
+						File fmsFile = file[i].getFmsFile();
+						hzmlist.add(hzm);
+						namelist.add(path + File.separator + replace);
+						fmsFilelist.add(fmsFile);
+						fileSize = fileSize + fmsFile.length();
+					}
 				}
 			}
 		} catch (TCException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
-			MessageBox.post("发生错误："+e.getMessage(),"错误",MessageBox.ERROR);
+			MessageBox.post("发生错误：" + e.getMessage(), "错误", MessageBox.ERROR);
 		}
-		
+
 	}
-	//获取文件后缀名
+	// 获取文件后缀名
 //	private void gethzm(TCComponentDataset dataset) {
 //	try {
 //		//获取文件数组
@@ -175,150 +203,169 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 //			MessageBox.post("发生错误："+e.getMessage(),"错误",MessageBox.ERROR);
 //		}
 //	}
-	
-	//文件下载到指定路径
-	private void downloadfile(String fpath){  
-		try{
+
+	// 文件下载到指定路径
+	private void downloadfile(String fpath) {
+		try {
 			long hasReadByte = 0L;// 已经读取的字节个数
 			float result;
-			int progressSize = 0; 
-			for(int i=0;i<hzmlist.size();i++){
-				//拼接输出文件名
-				String filename = namelist.get(i)+"."+hzmlist.get(i);
-				//拼接输出带路径全文件名
+			int progressSize = 0;
+			for (int i = 0; i < hzmlist.size(); i++) {
+				// 拼接输出文件名
+				String filename = namelist.get(i) + "." + hzmlist.get(i);
+				// 拼接输出带路径全文件名
 				String path = fpath + File.separator + filename;
-				System.out.println("path=8.3"+path);
-				File fileout = new File(path);				
+				System.out.println("path=8.3" + path);
+				File fileout = new File(path);
 				fis = new FileInputStream(fmsFilelist.get(i));
 				fos = new FileOutputStream(fileout);
 				byte[] bs = new byte[1024];
 				int len = 0;
-				while((len=fis.read(bs))!=-1){
-					fos.write(bs, 0, len);  
+				while ((len = fis.read(bs)) != -1) {
+					fos.write(bs, 0, len);
 					hasReadByte = hasReadByte + len;
 					result = (float) ((double) hasReadByte / fileSize);
 					progressSize = Math.round(result * 100);
 					updateProgress(bar, progressSize);
 				}
-				if (progressSize <100) {
+				if (progressSize < 100) {
 					updateProgress(bar, progressSize);
 				}
-				if(progressSize==100) {
+				if (progressSize == 100) {
 					bar.setForeground(Color.blue);
-					
-				} 
-				if(fos!=null) fos.close();
-				if(fis!=null) fis.close();
-			}  
-		}catch(Exception e){
+
+				}
+				if (fos != null)
+					fos.close();
+				if (fis != null)
+					fis.close();
+			}
+		} catch (Exception e) {
 			e.printStackTrace();
-			MessageBox.post("下载失败："+e.getMessage(),"错误",MessageBox.ERROR);
-		}finally{
-			try { 
+			MessageBox.post("下载失败：" + e.getMessage(), "错误", MessageBox.ERROR);
+		} finally {
+			try {
 				fos.close();
-				fis.close(); 
-				MessageBox.post("下载完成","2",2);
+				fis.close();
+				MessageBox.post("下载完成", "2", 2);
 				this.dispose();
 			} catch (IOException e) {
 				// TODO Auto-generated catch block
-				
+
 				e.printStackTrace();
 			}
 		}
 	}
 
-	//弹出下载路径选择框
-	public void selectFileButtonEvent(){
+	// 弹出下载路径选择框
+	public void selectFileButtonEvent() {
 		int state = jFileChooser.showOpenDialog(null);
-		if(state == 1) {
+		if (state == 1) {
 			return;
-		}else{
+		} else {
 			File f = jFileChooser.getSelectedFile();
 			jtf.setText(f.getAbsolutePath());
 		}
 	}
-	
-	//界面初始化
-	private void init(){
+
+	// 界面初始化
+	private void init() {
 		this.setLayout(new PropertyLayout());
 		this.setPreferredSize(new Dimension(650, 300));
 		FileSystemView fsv = FileSystemView.getFileSystemView();
 		String deskPath = fsv.getHomeDirectory().getPath();
-		//第一行：图纸类型
-		btnPanel1 = new JPanel(); 
+		// 第一行：图纸类型
+		btnPanel1 = new JPanel();
 		JLabel drawingtype = new JLabel("图纸类型:");
 		JCheckBox checkBox1 = new JCheckBox("DWG");
-		JCheckBox checkBox2 = new JCheckBox("idw");//new
+		JCheckBox checkBox2 = new JCheckBox("idw");// new
 		JCheckBox checkBox3 = new JCheckBox("PDF");
-		JCheckBox checkBox4 = new JCheckBox("ipt");//new
-		JCheckBox checkBox5 = new JCheckBox("iam");//new
+		JCheckBox checkBox4 = new JCheckBox("ipt");// new
+		JCheckBox checkBox5 = new JCheckBox("iam");// new
 		JCheckBox checkBox6 = new JCheckBox("STP");
-		JCheckBox checkBox7 = new JCheckBox("STEP");//new
-		//btnPanel1.add(drawingtype);
-		btnPanel1.add("1.1.left.top",drawingtype);
-		btnPanel1.add("1.2.left.top",checkBox1);
-		btnPanel1.add("1.3.left.top",checkBox2);
-		btnPanel1.add("1.4.left.top",checkBox3);
-		btnPanel1.add("1.5.left.top",checkBox4);
-		btnPanel1.add("1.6.left.top",checkBox5);
-		btnPanel1.add("1.7.left.top",checkBox6);
-		btnPanel1.add("1.8.left.top",checkBox7);
-		//第二行：零件类型
-	    btnPanel2 = new JPanel();
+		JCheckBox checkBox7 = new JCheckBox("STEP");// new
+		// btnPanel1.add(drawingtype);
+		btnPanel1.add("1.1.left.top", drawingtype);
+		btnPanel1.add("1.2.left.top", checkBox1);
+		btnPanel1.add("1.3.left.top", checkBox2);
+		btnPanel1.add("1.4.left.top", checkBox3);
+		btnPanel1.add("1.5.left.top", checkBox4);
+		btnPanel1.add("1.6.left.top", checkBox5);
+		btnPanel1.add("1.7.left.top", checkBox6);
+		btnPanel1.add("1.8.left.top", checkBox7);
+		// 第二行：零件类型
+		btnPanel2 = new JPanel();
 		JLabel itemtype = new JLabel("零件类型:");
-		JCheckBox checkBox11 = new JCheckBox("全部"); 
+		JCheckBox checkBox11 = new JCheckBox("全部");
 		JCheckBox checkBox12 = new JCheckBox("外购件");
 		JCheckBox checkBox13 = new JCheckBox("外协件");
 		JCheckBox checkBox14 = new JCheckBox("虚拟件");
-		//btnPanel2.add(itemtype);
-		btnPanel2.add("1.1.left.top",itemtype);
-		btnPanel2.add("1.2.left.top",checkBox11);
-		btnPanel2.add("1.3.left.top",checkBox12);
-		btnPanel2.add("1.4.left.top",checkBox13);
-		btnPanel2.add("1.5.left.top",checkBox14);
-		//第三行附加条件
+		// btnPanel2.add(itemtype);
+		btnPanel2.add("1.1.left.top", itemtype);
+		btnPanel2.add("1.2.left.top", checkBox11);
+		btnPanel2.add("1.3.left.top", checkBox12);
+		btnPanel2.add("1.4.left.top", checkBox13);
+		btnPanel2.add("1.5.left.top", checkBox14);
+		// 第三行附加条件
 		btnPanel3 = new JPanel();
 		JLabel additional = new JLabel("附加筛选:");
 		JCheckBox checkBox21 = new JCheckBox("外协件/外购件打包下载");
 		JCheckBox checkBox22 = new JCheckBox("仅下载已发布图纸");
-		//btnPanel3.add(additional);
-		btnPanel3.add("1.1.left.top",additional);
-		btnPanel3.add("1.2.left.top",checkBox21);
-		btnPanel3.add("1.3.left.top",checkBox22);
-		//第四行下载选项
+		// btnPanel3.add(additional);
+		btnPanel3.add("1.1.left.top", additional);
+		btnPanel3.add("1.2.left.top", checkBox21);
+		btnPanel3.add("1.3.left.top", checkBox22);
+		// 第四行行选项
+		btnPanel4 = new JPanel();
+		JCheckBox bt4op1 = new JCheckBox("设计");
+		JCheckBox bt4op2 = new JCheckBox("其他");
+		btnPanel4.add("1.1.left.top",bt4op1);
+		btnPanel4.add("1.2.left.top",bt4op2);
+		// 第五行下载选项
 		jLabel = new JLabel("下载路径:");
 		jtf.setText(deskPath);
-		jButton = new JButton("浏览"); 
+		jButton = new JButton("浏览");
 		jFileChooser = new JFileChooser();
 		this.jFileChooser.setCurrentDirectory(new File(deskPath));
 		this.jFileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
 		JPanel panel = new JPanel();
-		panel.add("1.1.left.top",jLabel);
-		panel.add("1.2.left.top",jtf);
-		panel.add("1.3.left.top",jButton);
-		panel.add("2.1.left.top",okBut);
-		panel.add("2.2.left.top",celBut); 
-		this.add("1.1.left.top",btnPanel1);
+		panel.add("1.1.left.top", jLabel);
+		panel.add("1.2.left.top", jtf);
+		panel.add("1.3.left.top", jButton);
+		panel.add("2.1.left.top", okBut);
+		panel.add("2.2.left.top", celBut);
+		this.add("1.1.left.top", btnPanel1);
 //		this.add("2.1.left.top",itemtype);
-		this.add("2.1.left.top",btnPanel2);
+		this.add("2.1.left.top", btnPanel2);
 //		this.add("3.1.left.top",additional);
-		this.add("3.1.left.top",btnPanel3);
-		this.add("4.1.left.top",panel); 
+		this.add("3.1.left.top", btnPanel3);
+		this.add("4.1.left.top", btnPanel4);
+		this.add("5.1.left.top", panel);
 //		this.add("5.1.left.top",paneljdt);
 		this.setResizable(false);
 		this.setBounds(5, 5, 5, 5);
 		this.centerToScreen();
-		this.showDialog(); 
-		jButton.addActionListener(new ActionListener() {			
+		this.showDialog();
+		jButton.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				// TODO Auto-generated method stub
 				selectFileButtonEvent();
 			}
-		});  
-		okBut.addActionListener(new ActionListener() {			
+		});
+		okBut.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
+				carryRevList = getIscarryRev();
+				if(null == carryRevList || carryRevList.size() ==0) {
+					isCarryRev = true;
+				}else if(carryRevList.size()==2){
+					isCarryRev = true;
+				}else if(carryRevList.contains("其他")) {
+					isCarryRev = true;
+				}else {
+					isCarryRev = false;
+				}
 				datasetList.add("DWG");
 				datasetList.add("Tofflon_DWG");
 				datasetList.add("T2_DWG");
@@ -327,101 +374,103 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 				datasetList.add("AIPart");
 				datasetList.add("AIAssembly");
 				datasetList.add("TAI2_TCAI115_AISTEP");
-				datasetList.add("TAI2_TCAI115_AISTEP"); 
-				Component[] jcbs = btnPanel2.getComponents();//将勾选的内容存入数组  
-				Boolean btnpa2=false; 
-				for(Component component : jcbs) {
-					if(component instanceof JCheckBox) {
-						JCheckBox checkBox=(JCheckBox)component;
-						if(checkBox.isSelected()) {
-							btnpa2=true;
+				datasetList.add("TAI2_TCAI115_AISTEP");
+				Component[] jcbs = btnPanel2.getComponents();// 将勾选的内容存入数组
+				Boolean btnpa2 = false;
+				for (Component component : jcbs) {
+					if (component instanceof JCheckBox) {
+						JCheckBox checkBox = (JCheckBox) component;
+						if (checkBox.isSelected()) {
+							btnpa2 = true;
 						}
 					}
 				}
-				Component[] jcbs2 = btnPanel1.getComponents();//将勾选的内容存入数组  
-				Boolean btnpa1=false;
-				for(Component component : jcbs2) {
-					if(component instanceof JCheckBox) {
-						JCheckBox checkBox=(JCheckBox)component;
-						if(checkBox.isSelected()) {
-							btnpa1=true;
+				Component[] jcbs2 = btnPanel1.getComponents();// 将勾选的内容存入数组
+				Boolean btnpa1 = false;
+				for (Component component : jcbs2) {
+					if (component instanceof JCheckBox) {
+						JCheckBox checkBox = (JCheckBox) component;
+						if (checkBox.isSelected()) {
+							btnpa1 = true;
 						}
 					}
 				}
-				if(!btnpa1) {
-					MessageBox.post("请选择图纸类型","提示",2);
+				if (!btnpa1) {
+					MessageBox.post("请选择图纸类型", "提示", 2);
 				}
-				Boolean ljlxno=false;
-				for(int t=0;t<targets.length;t++) {
-					if(targets[t]  instanceof TCComponentDataset) {
-					}else {
-						ljlxno=true;
+				Boolean ljlxno = false;
+				for (int t = 0; t < targets.length; t++) {
+					if (targets[t] instanceof TCComponentDataset) {
+					} else {
+						ljlxno = true;
 					}
 				}
-				
-				if(!btnpa2 && ljlxno) {
-					MessageBox.post("请选择零件类型","提示",2);
+
+				if (!btnpa2 && ljlxno) {
+					MessageBox.post("请选择零件类型", "提示", 2);
 				}
 				// TODO Auto-generated method stub
-				if((btnpa2||!ljlxno)&&btnpa1) {
+				if ((btnpa2 || !ljlxno) && btnpa1) {
 					getTypes();
-					if(fmsFilelist.size()!=0) {
-						System.out.print("开始下载"); 
+					if (fmsFilelist.size() != 0) {
+						System.out.print("开始下载");
 						final String fpath = jtf.getText();
-						if(fpath != null && (!fpath.trim().equals(""))){ 
+						if (fpath != null && (!fpath.trim().equals(""))) {
 //							ProgressBarThread wait = new ProgressBarThread("下载", "下载中。。。");		
 //							wait.start();
-							new Thread(new Runnable() { 
+							new Thread(new Runnable() {
 								@Override
 								public void run() {
 									JDialog dialog = new JDialog();
-									bar=new JProgressBar(0,100);
+									bar = new JProgressBar(0, 100);
 									Container contentPane = dialog.getContentPane();
 									contentPane.setLayout(new GridLayout(2, 1));
-									JTextField text=new JTextField("下载中");
+									JTextField text = new JTextField("下载中");
 									contentPane.add("1.1.center.top", text);
 									contentPane.add("2.1.center.top", bar);
 									dialog.setSize(300, 100);
 									dialog.setVisible(true);
 									dialog.setLocationRelativeTo(dialog.getParent());
-									downloadfile(fpath);  
+									downloadfile(fpath);
 									dialog.setVisible(false);
 								}
-							}).start(); 
+							}).start();
 //							wait.setBool(true);// 关闭进度条
 //							wait.interrupt();
-							
-						}else{
+
+						} else {
 							MessageBox.post("文件路径不能为空!", "警告", MessageBox.INFORMATION);
-						} 
+						}
 					} else {
-						MessageBox.post("没有找到符合条件的图纸","提示",2);
+						MessageBox.post("没有找到符合条件的图纸", "提示", 2);
 					}
-					if(noFileList.size()!=0) {
+					if (noFileList.size() != 0) {
 						OutputStreamWriter outputStreamWriter;
 						try {
-							outputStreamWriter = new OutputStreamWriter(new FileOutputStream(pathString+File.separator+"部分数据集没有命名的引用.txt"));
+							outputStreamWriter = new OutputStreamWriter(
+									new FileOutputStream(pathString + File.separator + "部分数据集没有命名的引用.txt"));
 							BufferedWriter bWriter = new BufferedWriter(outputStreamWriter);
-							for(String liString:noFileList) {
-								bWriter.write(liString); 
+							for (String liString : noFileList) {
+								bWriter.write(liString);
 								bWriter.newLine();
 							}
 							bWriter.close();
-			                outputStreamWriter.close();
+							outputStreamWriter.close();
 
-							if(Desktop.isDesktopSupported()){
-							    File worksheet = new File(pathString+File.separator+"部分数据集没有命名的引用.txt");
-							    Desktop.getDesktop().open(worksheet); // or Desktop.getDesktop().edit(worksheet);
+							if (Desktop.isDesktopSupported()) {
+								File worksheet = new File(pathString + File.separator + "部分数据集没有命名的引用.txt");
+								Desktop.getDesktop().open(worksheet); // or Desktop.getDesktop().edit(worksheet);
 							}
 						} catch (Exception e1) {
 							// TODO Auto-generated catch block
 							e1.printStackTrace();
 						}
 					}
-				} 
+				}
+				
 			}
 		});
-		celBut.addActionListener(new ActionListener() {			
+		celBut.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				// TODO Auto-generated method stub
@@ -433,295 +482,294 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 		this.centerToScreen();
 		this.showDialog();
 	}
-	//获取图纸类型
+
+	// 获取图纸类型
 	public void getTypes() {
 		List<String> list = new ArrayList<String>();
-		Component[] jcbs = btnPanel1.getComponents();//将勾选的内容存入数组
-		for(Component component : jcbs) {
-			if(component instanceof JCheckBox) {
+		Component[] jcbs = btnPanel1.getComponents();// 将勾选的内容存入数组
+		for (Component component : jcbs) {
+			if (component instanceof JCheckBox) {
 				JCheckBox jcb = (JCheckBox) component;
-				if(jcb.isSelected()) {
+				if (jcb.isSelected()) {
 					list.add(jcb.getText());
-					if("DWG".equals(jcb.getText())) {
+					if ("DWG".equals(jcb.getText())) {
 						list.add("DWG");
 						list.add("dwg");
-					}else if ("STP".equals(jcb.getText())) {
+					} else if ("STP".equals(jcb.getText())) {
 						list.add("stp");
-					}else if("PDF".equals(jcb.getText())) {
+					} else if ("PDF".equals(jcb.getText())) {
 						list.add("pdf");
 						list.add("PDF");
-					}else if("idw".equals(jcb.getText())) {
+					} else if ("idw".equals(jcb.getText())) {
 						list.add("idw");
-					}else if ("ipt".equals(jcb.getText())) {
+					} else if ("ipt".equals(jcb.getText())) {
 						list.add("ipt");
-					}else if ("iam".equals(jcb.getText())) {
+					} else if ("iam".equals(jcb.getText())) {
 						list.add("iam");
-					}else if ("STEP".equals(jcb.getText())) {
+					} else if ("STEP".equals(jcb.getText())) {
 						list.add("STEP");
 						list.add("step");
 					}
 				}
-			} 
-		}  
+			}
+		}
 		try {
 			for (int i = 0; i < targets.length; i++) {
-				if(targets[i] instanceof TCComponentBOMLine){	
+				if (targets[i] instanceof TCComponentBOMLine) {
 					List<String> itemlist = new ArrayList<String>();
-					//执行获取零件类型的方法
+					// 执行获取零件类型的方法
 					itemlist = getitemType();
-					//定义bom行
+					// 定义bom行
 					TCComponentBOMLine line = (TCComponentBOMLine) targets[i];
-					TCComponentItemRevision rev = line.getItemRevision(); 
-					String objName= rev.getStringProperty("object_name");
-					String replace = objName.replace("/", "-").replace("<", "-").
-	                replace(">", "-").replace(":", "-").replace("|","-").
-	                replace("\\","-").replace("*","-").replace("?","-");
+					TCComponentItemRevision rev = line.getItemRevision();
+					String objName = rev.getStringProperty("object_name");
+					String replace = objName.replace("/", "-").replace("<", "-").replace(">", "-").replace(":", "-")
+							.replace("|", "-").replace("\\", "-").replace("*", "-").replace("?", "-");
 					String revtype = rev.getType();
-					String dataDir2 =jtf.getText()+File.separator+rev.getStringProperty("item_id")+"_"+
-							rev.getStringProperty("current_revision_id")+"_"+replace;//创建版本文件夹
-					File csFile=new File(dataDir2); 
-					//数据版本创建自己的文件夹
-					String dataName = rev.getStringProperty("item_id")+"_"+ rev.getStringProperty("current_revision_id")+
-							"_"+replace;//文件名 
-					pathString=dataDir2;
-					if(!csFile.exists()) {
-						csFile.mkdir();  
+					String dataDir2 = jtf.getText() + File.separator + rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + replace;// 创建版本文件夹
+					File csFile = new File(dataDir2);
+					// 数据版本创建自己的文件夹
+					String dataName = rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + replace;// 文件名
+					pathString = dataDir2;
+					if (!csFile.exists()) {
+						csFile.mkdir();
 					}
-					System.out.println("cs"+rev.toString()+list.get(0));
-					String dataName2="";
-					//遍历视图 去找符合条件的 文件夹已经创建
-					getOutPart(rev,dataName,list);
-					String dataDir3 =jtf.getText()+File.separator+rev.getStringProperty("item_id")+"_"+
-							rev.getStringProperty("current_revision_id")+"_"+replace+File.separator+rev.getStringProperty("item_id")+"_"+
-									rev.getStringProperty("current_revision_id")+"_"+replace;//创建版本文件夹总成
-					File csFile2=new File(dataDir3);
-					if(!csFile2.exists()) {
-						csFile2.mkdir();  
+					System.out.println("cs" + rev.toString() + list.get(0));
+					String dataName2 = "";
+					// 遍历视图 去找符合条件的 文件夹已经创建
+					getOutPart(rev, dataName, list);
+					String dataDir3 = jtf.getText() + File.separator + rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + replace + File.separator
+							+ rev.getStringProperty("item_id") + "_" + rev.getStringProperty("current_revision_id")
+							+ "_" + replace;// 创建版本文件夹总成
+					File csFile2 = new File(dataDir3);
+					if (!csFile2.exists()) {
+						csFile2.mkdir();
 					}
-					dataName2=dataName+File.separator+rev.getStringProperty("item_id")+"_"+ rev.getStringProperty("current_revision_id")+
-							"_"+replace;
+					dataName2 = dataName + File.separator + rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + replace;
 					TCComponent[] datasets = rev.getReferenceListProperty("IMAN_specification");
 					TCComponent[] datasets2 = rev.getReferenceListProperty("IMAN_Rendering");
 					for (int j = 0; j < datasets.length; j++) {
-						//获取数据集数组
+						// 获取数据集数组
 						TCComponentDataset dataset01 = null;
-						if(datasets[j] instanceof TCComponentDataset) {
-							 dataset01 = (TCComponentDataset) datasets[j];
-						}else {
+						if (datasets[j] instanceof TCComponentDataset) {
+							dataset01 = (TCComponentDataset) datasets[j];
+						} else {
 							continue;
 						}
-						//执行获取后缀名的方法
+						// 执行获取后缀名的方法
 //						gethzm(dataset01); 
-						//执行获取零件类型的方法 
+						// 执行获取零件类型的方法
 						String type = dataset01.getType();
-						//判断list包含hzm字符串的值 且 itemlist包含revtype的值
-						if(itemlist.contains(revtype)||allCheck) {
-							if(datasetList.contains(type)) {
-								//获取数据集数据
+						// 判断list包含hzm字符串的值 且 itemlist包含revtype的值
+						if (itemlist.contains(revtype) || allCheck) {
+							if (datasetList.contains(type)) {
+								// 获取数据集数据
 								TCComponentDataset dataset02 = (TCComponentDataset) datasets[j];
-								//执行getload方法
-								getload(dataset02,dataName,list,rev.getStringProperty("item_id"));
-								getload(dataset02,dataName2,list,rev.getStringProperty("item_id"));
+								// 执行getload方法
+								getload(dataset02, dataName, list, rev.getStringProperty("item_id"));
+								getload(dataset02, dataName2, list, rev.getStringProperty("item_id"));
 							}
 						}
 					}
 					for (int j = 0; j < datasets2.length; j++) {
-						//获取数据集数组
+						// 获取数据集数组
 						TCComponentDataset dataset02 = null;
-						if(datasets2[j] instanceof TCComponentDataset) {
-							 dataset02 = (TCComponentDataset) datasets2[j];
-						}else {
+						if (datasets2[j] instanceof TCComponentDataset) {
+							dataset02 = (TCComponentDataset) datasets2[j];
+						} else {
 							continue;
 						}
-						//执行获取后缀名的方法
+						// 执行获取后缀名的方法
 //						gethzm(dataset02); 
 						String type = dataset02.getType();
-						//判断是否为所需要的零件类型
-						if(itemlist.contains(revtype)||allCheck) {
-							if(datasetList.contains(type)) { 
+						// 判断是否为所需要的零件类型
+						if (itemlist.contains(revtype) || allCheck) {
+							if (datasetList.contains(type)) {
 								TCComponentDataset dataset = (TCComponentDataset) datasets2[j];
-								getload(dataset,dataName,list,rev.getStringProperty("item_id"));
-								getload(dataset,dataName2,list,rev.getStringProperty("item_id"));
+								getload(dataset, dataName, list, rev.getStringProperty("item_id"));
+								getload(dataset, dataName2, list, rev.getStringProperty("item_id"));
 							}
 						}
 					}
-				 }
-				else if(targets[i] instanceof TCComponentItemRevision){
+				} else if (targets[i] instanceof TCComponentItemRevision) {
 					List<String> itemlist = new ArrayList<String>();
-					//执行获取零件类型的方法
+					// 执行获取零件类型的方法
 					itemlist = getitemType();
 					TCComponentItemRevision rev = (TCComponentItemRevision) targets[i];
 					String revtype = rev.getType();
-					String objName= rev.getStringProperty("object_name");
-					String replace = objName.replace("/", "-").replace("<", "-").
-	                replace(">", "-").replace(":", "-").replace("|","-").
-	                replace("\\","-").replace("*","-").replace("?","-");
-					String dataDir =jtf.getText()+File.separator+rev.getStringProperty("item_id")+"_"+
-							rev.getStringProperty("current_revision_id")+"_"+replace;//创建版本文件夹
-					
-					File csFile=new File(dataDir);
-					//数据版本创建自己的文件夹
-					String dataName =rev.getStringProperty("item_id")+"_"+
-							rev.getStringProperty("current_revision_id")+"_"+replace;//文件名
-					String dataName2="";
-					pathString=dataDir;
-					if(!csFile.exists()) {
+					String objName = rev.getStringProperty("object_name");
+					String replace = objName.replace("/", "-").replace("<", "-").replace(">", "-").replace(":", "-")
+							.replace("|", "-").replace("\\", "-").replace("*", "-").replace("?", "-");
+					String dataDir = jtf.getText() + File.separator + rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + replace;// 创建版本文件夹
+
+					File csFile = new File(dataDir);
+					// 数据版本创建自己的文件夹
+					String dataName = rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + replace;// 文件名
+					String dataName2 = "";
+					pathString = dataDir;
+					if (!csFile.exists()) {
 						csFile.mkdir();
 					}
-					//遍历视图 去找符合条件的 文件夹已经创建
-					getOutPart(rev,dataName,list);
-					String dataDir3 =jtf.getText()+File.separator+rev.getStringProperty("item_id")+"_"+
-							rev.getStringProperty("current_revision_id")+"_"+replace+File.separator+rev.getStringProperty("item_id")+"_"+
-									rev.getStringProperty("current_revision_id")+"_"+replace;//创建版本文件夹总成
-					File csFile2=new File(dataDir3);
-					if(!csFile2.exists()) {
-						csFile2.mkdir();  
+					// 遍历视图 去找符合条件的 文件夹已经创建
+					getOutPart(rev, dataName, list);
+					String dataDir3 = jtf.getText() + File.separator + rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + replace + File.separator
+							+ rev.getStringProperty("item_id") + "_" + rev.getStringProperty("current_revision_id")
+							+ "_" + replace;// 创建版本文件夹总成
+					File csFile2 = new File(dataDir3);
+					if (!csFile2.exists()) {
+						csFile2.mkdir();
 					}
-					dataName2 =dataName+File.separator+rev.getStringProperty("item_id")+"_"+
-							rev.getStringProperty("current_revision_id")+"_"+replace;//文件名
+					dataName2 = dataName + File.separator + rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + replace;// 文件名
 					TCComponent[] datasets = rev.getReferenceListProperty("IMAN_specification");
 					TCComponent[] datasets2 = rev.getReferenceListProperty("IMAN_Rendering");
 					for (int j = 0; j < datasets.length; j++) {
-						
-						//获取数据集数组
+
+						// 获取数据集数组
 						TCComponentDataset dataset02 = null;
-						if(datasets[j] instanceof TCComponentDataset) {
-							 dataset02 = (TCComponentDataset) datasets[j];
-						}else {
+						if (datasets[j] instanceof TCComponentDataset) {
+							dataset02 = (TCComponentDataset) datasets[j];
+						} else {
 							continue;
 						}
-						//执行获取后缀名的方法
+						// 执行获取后缀名的方法
 //						gethzm(dataset02);
 						String type = dataset02.getType();
-						//判断零件类型
-						if(itemlist.contains(revtype)||allCheck) {
-							if(datasetList.contains(type)) {
+						// 判断零件类型
+						if (itemlist.contains(revtype) || allCheck) {
+							if (datasetList.contains(type)) {
 								TCComponentDataset dataset = (TCComponentDataset) datasets[j];
 								System.out.println("下载文件");
-								getload(dataset,dataName,list,rev.getStringProperty("item_id"));
-								getload(dataset,dataName2,list,rev.getStringProperty("item_id"));
+								getload(dataset, dataName, list, rev.getStringProperty("item_id"));
+								getload(dataset, dataName2, list, rev.getStringProperty("item_id"));
 							}
 						}
 					}
 					for (int j = 0; j < datasets2.length; j++) {
-						//获取数据集数组
+						// 获取数据集数组
 						TCComponentDataset dataset02 = null;
-						if(datasets2[j] instanceof TCComponentDataset) {
-							 dataset02 = (TCComponentDataset) datasets2[j];
-						}else {
+						if (datasets2[j] instanceof TCComponentDataset) {
+							dataset02 = (TCComponentDataset) datasets2[j];
+						} else {
 							continue;
 						}
-						//执行获取后缀名的方法
+						// 执行获取后缀名的方法
 //						gethzm(dataset02);
 						String type = dataset02.getType();
-						//判断零件类型
-						if (itemlist.contains(revtype)||allCheck) {
-							if(datasetList.contains(type)) {
+						// 判断零件类型
+						if (itemlist.contains(revtype) || allCheck) {
+							if (datasetList.contains(type)) {
 								TCComponentDataset dataset = (TCComponentDataset) datasets2[j];
-								getload(dataset,dataName,list,rev.getStringProperty("item_id"));
-								getload(dataset,dataName2,list,rev.getStringProperty("item_id"));
+								getload(dataset, dataName, list, rev.getStringProperty("item_id"));
+								getload(dataset, dataName2, list, rev.getStringProperty("item_id"));
 							}
 						}
 					}
-				}else if(targets[i] instanceof TCComponentDataset) { 
+				} else if (targets[i] instanceof TCComponentDataset) {
 					TCComponentDataset dataset = (TCComponentDataset) targets[i];
-					String dataName="";
+					String dataName = "";
 					String objName = dataset.getStringProperty("object_name");
-					String replaceName = objName.replace("/", "-").replace("<", "-").
-			                replace(">", "-").replace(":", "-").replace("|","-").
-			                replace("\\","-").replace("*","-").replace("?","-");
-					if(iDataset==0) {
-						dataName=jtf.getText()+File.separator+replaceName;
-						datasetDir=replaceName;
-						pathString=dataName;
-						File csFile=new File(dataName);
-						if(!csFile.exists()) {
-							csFile.mkdir(); 
+					String replaceName = objName.replace("/", "-").replace("<", "-").replace(">", "-").replace(":", "-")
+							.replace("|", "-").replace("\\", "-").replace("*", "-").replace("?", "-");
+					if (iDataset == 0) {
+						dataName = jtf.getText() + File.separator + replaceName;
+						datasetDir = replaceName;
+						pathString = dataName;
+						File csFile = new File(dataName);
+						if (!csFile.exists()) {
+							csFile.mkdir();
 						}
 					}
-					iDataset=1; 
+					iDataset = 1;
 					String type = dataset.getType();
 //					gethzm(dataset);
-					if(datasetList.contains(type)) {
-						getload(dataset,datasetDir,list,"sjj");
-					} 
-				}else if(targets[i] instanceof TCComponentItem){
+					if (datasetList.contains(type)) {
+						getload(dataset, datasetDir, list, "sjj");
+					}
+				} else if (targets[i] instanceof TCComponentItem) {
 					List<String> itemlist = new ArrayList<String>();
-					//执行获取零件类型的方法
+					// 执行获取零件类型的方法
 					itemlist = getitemType();
 					TCComponentItem item = (TCComponentItem) targets[i];
 //					item.getReleasedItemRevisions();
 					TCComponentItemRevision rev = item.getLatestItemRevision();
-					String revtype = rev.getType();  
-					String objName= rev.getStringProperty("object_name");
-					String replace = objName.replace("/", "-").replace("<", "-").
-	                replace(">", "-").replace(":", "-").replace("|","-").
-	                replace("\\","-").replace("*","-").replace("?","-");
-					String dataDir2 =jtf.getText()+File.separator+rev.getStringProperty("item_id")+"_"+
-							rev.getStringProperty("current_revision_id")+"_"+replace;//创建版本文件夹
-					File csFile=new File(dataDir2); 
-					//数据版本创建自己的文件夹
-					String dataName = rev.getStringProperty("item_id")+"_"+
-							rev.getStringProperty("current_revision_id")+"_"+replace;//文件名 
-					pathString=dataDir2;
-					if(!csFile.exists()) {
-						csFile.mkdir(); 
-						
+					String revtype = rev.getType();
+					String objName = rev.getStringProperty("object_name");
+					String replace = objName.replace("/", "-").replace("<", "-").replace(">", "-").replace(":", "-")
+							.replace("|", "-").replace("\\", "-").replace("*", "-").replace("?", "-");
+					String dataDir2 = jtf.getText() + File.separator + rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + replace;// 创建版本文件夹
+					File csFile = new File(dataDir2);
+					// 数据版本创建自己的文件夹
+					String dataName = rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + replace;// 文件名
+					pathString = dataDir2;
+					if (!csFile.exists()) {
+						csFile.mkdir();
+
 					}
-					String dataName2="";
-					//遍历视图 去找符合条件的 文件夹已经创建
-					getOutPart(rev,dataName,list);
-					String dataDir3 =jtf.getText()+File.separator+rev.getStringProperty("item_id")+"_"+
-							rev.getStringProperty("current_revision_id")+"_"+replace+File.separator+rev.getStringProperty("item_id")+"_"+
-									rev.getStringProperty("current_revision_id")+"_"+replace;//创建版本文件夹总成
-					File csFile2=new File(dataDir3);
-					if(!csFile2.exists()) {
-						csFile2.mkdir();  
+					String dataName2 = "";
+					// 遍历视图 去找符合条件的 文件夹已经创建
+					getOutPart(rev, dataName, list);
+					String dataDir3 = jtf.getText() + File.separator + rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + replace + File.separator
+							+ rev.getStringProperty("item_id") + "_" + rev.getStringProperty("current_revision_id")
+							+ "_" + replace;// 创建版本文件夹总成
+					File csFile2 = new File(dataDir3);
+					if (!csFile2.exists()) {
+						csFile2.mkdir();
 					}
-					dataName2 =dataName+File.separator+rev.getStringProperty("item_id")+"_"+
-							rev.getStringProperty("current_revision_id")+"_"+replace;//文件名
+					dataName2 = dataName + File.separator + rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + replace;// 文件名
 					TCComponent[] datasets = rev.getReferenceListProperty("IMAN_specification");
 					TCComponent[] datasets2 = rev.getReferenceListProperty("IMAN_Rendering");
 					for (int j = 0; j < datasets.length; j++) {
-						//获取数据集数组
+						// 获取数据集数组
 						TCComponentDataset dataset02 = null;
-						if(datasets[j] instanceof TCComponentDataset) {
-							 dataset02 = (TCComponentDataset) datasets[j];
-						}else {
+						if (datasets[j] instanceof TCComponentDataset) {
+							dataset02 = (TCComponentDataset) datasets[j];
+						} else {
 							continue;
 						}
-						//执行获取后缀名的方法
-						String type = dataset02.getType(); 
+						// 执行获取后缀名的方法
+						String type = dataset02.getType();
 //						gethzm(dataset02);
-						if(itemlist.contains(revtype)||allCheck) {
-							if(datasetList.contains(type)) {
+						if (itemlist.contains(revtype) || allCheck) {
+							if (datasetList.contains(type)) {
 								TCComponentDataset dataset = (TCComponentDataset) datasets[j];
-								getload(dataset,dataName,list,rev.getStringProperty("item_id"));
-								getload(dataset,dataName2,list,rev.getStringProperty("item_id"));
+								getload(dataset, dataName, list, rev.getStringProperty("item_id"));
+								getload(dataset, dataName2, list, rev.getStringProperty("item_id"));
 							}
 						}
 					}
 					for (int j = 0; j < datasets2.length; j++) {
-						//获取数据集数组
+						// 获取数据集数组
 						TCComponentDataset dataset02 = null;
-						if(datasets2[j] instanceof TCComponentDataset) {
-							 dataset02 = (TCComponentDataset) datasets2[j];
-						}else {
+						if (datasets2[j] instanceof TCComponentDataset) {
+							dataset02 = (TCComponentDataset) datasets2[j];
+						} else {
 							continue;
 						}
-						//执行获取后缀名的方法
+						// 执行获取后缀名的方法
 //						gethzm(dataset02);
 						String type = dataset02.getType();
-						if(itemlist.contains(revtype)||allCheck) {
-							if(datasetList.contains(type)) {
+						if (itemlist.contains(revtype) || allCheck) {
+							if (datasetList.contains(type)) {
 								TCComponentDataset dataset = (TCComponentDataset) datasets2[j];
-								getload(dataset, dataName,list,rev.getStringProperty("item_id"));
-								getload(dataset, dataName2,list,rev.getStringProperty("item_id"));
+								getload(dataset, dataName, list, rev.getStringProperty("item_id"));
+								getload(dataset, dataName2, list, rev.getStringProperty("item_id"));
 							}
 						}
 					}
-				}else {
-					MessageBox.post("选中的不是版本对象或者BOM行对象或者数据集对象","error",MessageBox.ERROR);
+				} else {
+					MessageBox.post("选中的不是版本对象或者BOM行对象或者数据集对象", "error", MessageBox.ERROR);
 					return;
 				}
 			}
@@ -730,64 +778,65 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 			e.printStackTrace();
 		}
 	}
-	//获取零件类型
+
+	// 获取零件类型
 	public List<String> getitemType() {
 		List<String> itemlist = new ArrayList<String>();
-		Component[] jcbs = btnPanel2.getComponents();//将勾选的内容存入数组  
-		//遍历勾选的内容 
-		for(Component component : jcbs) {
-			if(component instanceof JCheckBox) {
+		Component[] jcbs = btnPanel2.getComponents();// 将勾选的内容存入数组
+		// 遍历勾选的内容
+		for (Component component : jcbs) {
+			if (component instanceof JCheckBox) {
 				JCheckBox jcb = (JCheckBox) component;
-				//判断元素是否被选中
-				if(jcb.isSelected()) {
+				// 判断元素是否被选中
+				if (jcb.isSelected()) {
+					itemlist.add(jcb.getText());
 					itemlist.add(jcb.getText());
-					itemlist.add(jcb.getText()); 
-					if("全部".equals(jcb.getText())) {
-						allCheck=true;
+					if ("全部".equals(jcb.getText())) {
+						allCheck = true;
 						itemlist.add("T2_VirtualRevision");
 						itemlist.add("T2_OutBuyPartRevision");
-						itemlist.add("T2_outsourceRevision"); 
+						itemlist.add("T2_outsourceRevision");
 						itemlist.add("T2_EquipmentRevision");
-					}else if ("外协件".equals(jcb.getText())) {
+					} else if ("外协件".equals(jcb.getText())) {
 						itemlist.add("T2_outsourceRevision");
-					}else if ("外购件".equals(jcb.getText())) {
+					} else if ("外购件".equals(jcb.getText())) {
 						itemlist.add("T2_OutBuyPartRevision");
-					}else if ("虚拟件".equals(jcb.getText())) {
-						itemlist.add("T2_VirtualRevision"); 
+					} else if ("虚拟件".equals(jcb.getText())) {
+						itemlist.add("T2_VirtualRevision");
 					}
 				}
-				
-			} 
+
+			}
 		}
 		return itemlist;
 	}
-	public void getOutPart(TCComponentItemRevision rev ,String dir,List<String> list) throws TCException {
-		//设备获取完成了  获取子键 全部 全获取 外购 判断当前 外购子键不判断
+
+	public void getOutPart(TCComponentItemRevision rev, String dir, List<String> list) throws TCException {
+		// 设备获取完成了 获取子键 全部 全获取 外购 判断当前 外购子键不判断
 		TCComponentItem item = rev.getItem();
 		List<String> itemlist = new ArrayList<String>();
-		//执行获取零件类型的方法
+		// 执行获取零件类型的方法
 		itemlist = getitemType();
 		Boolean sxTj = getSxTj();
 		TCComponentBOMWindowType winType = (TCComponentBOMWindowType) session.getTypeService()
 				.getTypeComponent("BOMWindow");
-		TCComponentRevisionRule[] listAllRules = TCComponentRevisionRule.listAllRules(session); 
-		TCComponentBOMWindow window = winType.create(null); 
-		for(TCComponentRevisionRule rule:listAllRules) {
-			if(sxTj&&rule.toString().equals("Precise;Any Status;Latest Working")) {
-				window.setRevisionRule(rule); 
-			}else if (!sxTj&&rule.toString().equals("Latest Working")) {
-				window.setRevisionRule(rule); 
+		TCComponentRevisionRule[] listAllRules = TCComponentRevisionRule.listAllRules(session);
+		TCComponentBOMWindow window = winType.create(null);
+		for (TCComponentRevisionRule rule : listAllRules) {
+			if (sxTj && rule.toString().equals("Precise;Any Status;Latest Working")) {
+				window.setRevisionRule(rule);
+			} else if (!sxTj && rule.toString().equals("Latest Working")) {
+				window.setRevisionRule(rule);
 			}
 		}
 		window.lock();
-		TCComponentBOMLine topLine = window.setWindowTopLine(
-				item, rev, null, null);
-		AIFComponentContext[] children2=new AIFComponentContext[4096];
-		children2=topLine.getChildren();
+		TCComponentBOMLine topLine = window.setWindowTopLine(item, rev, null, null);
+		AIFComponentContext[] children2 = new AIFComponentContext[4096];
+		children2 = topLine.getChildren();
 //		AIFComponentContext[] children = topLine.getChildren();
-		for(int i=0;i<children2.length;i++) {
-			TCComponentBOMLine line=(TCComponentBOMLine)children2[i].getComponent();
-			getOutPartInBom(line,sxTj,0,itemlist,dir,list,0,dir);
+		for (int i = 0; i < children2.length; i++) {
+			TCComponentBOMLine line = (TCComponentBOMLine) children2[i].getComponent();
+			getOutPartInBom(line, sxTj, 0, itemlist, dir, list, 0, dir);
 		}
 //		for(AIFComponentContext context:children2) { 
 //			TCComponentBOMLine line=(TCComponentBOMLine)context.getComponent();
@@ -801,6 +850,7 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 		window.unlock();
 		window.close();
 	}
+
 //	public TCComponentItemRevision findLatesStatus(TCComponentItemRevision rev) {
 //		TCComponentItemRevision latestRev=rev;
 //		try {
@@ -835,153 +885,176 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 //		}
 //		return latestRev;
 //	}
-	//遍历bom视图，找出所有外协件 外购件  i判断是不是第一层外协外购 
-	public void getOutPartInBom(TCComponentBOMLine bomLine,Boolean sxtj,int i,List<String> itemList,
-			String dir,List<String> list,int bomNum,String dirFs) throws TCException { 
+	// 遍历bom视图，找出所有外协件 外购件 i判断是不是第一层外协外购
+	public void getOutPartInBom(TCComponentBOMLine bomLine, Boolean sxtj, int i, List<String> itemList, String dir,
+			List<String> list, int bomNum, String dirFs) throws TCException {
 		TCComponentItemRevision rev = bomLine.getItemRevision();
 //		if(sxtj) { 
 //			rev=findLatesStatus(rev);
 //		}
-			String dirTop=dir;
+		String dirTop = dir;
 //			String revtype = rev.getStringProperty("object_type");
-			String revtype=  rev.getType();//真实值 
-			if((itemList.contains(revtype)&&bomNum==0)||allCheck||bomNum==1) {
-				Boolean l=revtype.equals("T2_OutBuyPartRevision")||revtype.equals("T2_outsourceRevision")||revtype.equals("ItemRevision");
-				if(outPartBool&&l) {
-					String dirString=jtf.getText()+File.separator+dir+File.separator+rev.getStringProperty("item_id")+"_"+
-							rev.getStringProperty("current_revision_id")+"_"+rev.getStringProperty("object_name");
-					dir=dir+File.separator+rev.getStringProperty("item_id")+"_"+
-							rev.getStringProperty("current_revision_id")+"_"+rev.getStringProperty("object_name");
-					dirTop=dir;
-					File csFile=new File(dirString);
-					if(!csFile.exists()) {
-						csFile.mkdir();
+		String revtype = rev.getType();// 真实值
+		if ((itemList.contains(revtype) && bomNum == 0) || allCheck || bomNum == 1) {
+			Boolean l = revtype.equals("T2_OutBuyPartRevision") || revtype.equals("T2_outsourceRevision")
+					|| revtype.equals("ItemRevision");
+			if (outPartBool && l) {
+				String dirString = jtf.getText() + File.separator + dir + File.separator
+						+ rev.getStringProperty("item_id") + "_" + rev.getStringProperty("current_revision_id") + "_"
+						+ rev.getStringProperty("object_name");
+				dir = dir + File.separator + rev.getStringProperty("item_id") + "_"
+						+ rev.getStringProperty("current_revision_id") + "_" + rev.getStringProperty("object_name");
+				dirTop = dir;
+				File csFile = new File(dirString);
+				if (!csFile.exists()) {
+					csFile.mkdir();
+				}
+				if (bomLine.getChildren().length != 0) {
+					dirString = dirString + File.separator + rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + rev.getStringProperty("object_name");
+					dir = dir + File.separator + rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + rev.getStringProperty("object_name");
+
+					File csFile2 = new File(dirString);
+					if (!csFile2.exists()) {
+						csFile2.mkdir();
 					}
-					if(bomLine.getChildren().length!=0) {
-						dirString=dirString+File.separator+rev.getStringProperty("item_id")+"_"+
-								rev.getStringProperty("current_revision_id")+"_"+rev.getStringProperty("object_name");
-						dir=dir+File.separator+rev.getStringProperty("item_id")+"_"+
-								rev.getStringProperty("current_revision_id")+"_"+rev.getStringProperty("object_name");
-								
-						File csFile2=new File(dirString);
-						if(!csFile2.exists()) {
-							csFile2.mkdir();
+
+				}
+				if (i == 0) {
+					pathMap.put("1", dir);
+					if (bomLine.getChildren().length != 0) {
+						dirString = dirString + File.separator + rev.getStringProperty("item_id") + "_"
+								+ rev.getStringProperty("current_revision_id") + "_"
+								+ rev.getStringProperty("object_name");
+						File csFile3 = new File(dirString);
+						if (!csFile3.exists()) {
+							csFile3.mkdir();
 						}
-						
+
+						dir = dir + File.separator + rev.getStringProperty("item_id") + "_"
+								+ rev.getStringProperty("current_revision_id") + "_"
+								+ rev.getStringProperty("object_name");
 					}
-					if(i==0 ) {
-						pathMap.put("1", dir);
-						if(bomLine.getChildren().length!=0) {
-							dirString=dirString+File.separator+rev.getStringProperty("item_id")+"_"+
-									rev.getStringProperty("current_revision_id")+"_"+rev.getStringProperty("object_name");
-							File csFile3=new File(dirString);
-							if(!csFile3.exists()) {
-								csFile3.mkdir();
-							}
-							
-							dir=dir+File.separator+rev.getStringProperty("item_id")+"_"+
-									rev.getStringProperty("current_revision_id")+"_"+rev.getStringProperty("object_name");
-						}
-					}i++;
 				}
-				TCComponent[] datasets = rev.getReferenceListProperty("IMAN_specification");
-				TCComponent[] datasets2 = rev.getReferenceListProperty("IMAN_Rendering");
-				for (int j = 0; j < datasets.length; j++) {
-					//获取数据集数组
-					TCComponentDataset dataset01=null;
-					if(datasets[j] instanceof TCComponentDataset) {
-						 dataset01 = (TCComponentDataset) datasets[j];
-					}
-					else {
-						continue;
-					}
+				i++;
+			}
+			TCComponent[] datasets = rev.getReferenceListProperty("IMAN_specification");
+			TCComponent[] datasets2 = rev.getReferenceListProperty("IMAN_Rendering");
+			for (int j = 0; j < datasets.length; j++) {
+				// 获取数据集数组
+				TCComponentDataset dataset01 = null;
+				if (datasets[j] instanceof TCComponentDataset) {
+					dataset01 = (TCComponentDataset) datasets[j];
+				} else {
+					continue;
+				}
 //					TCComponentDataset dataset01 = (TCComponentDataset) datasets[j];
-					//执行获取后缀名的方法
+				// 执行获取后缀名的方法
 //					gethzm(dataset01); 
-					//执行获取零件类型的方法 
-					String type = dataset01.getStringProperty("object_type");
-					
-					//判断list包含hzm字符串的值 且 itemlist包含revtype的值 
-					if(datasetList.contains(type)) {
-						//获取数据集数据
-						TCComponentDataset dataset02 = null;
-						if(datasets[j] instanceof TCComponentDataset) {
-							 dataset02 = (TCComponentDataset) datasets[j];
-						}else {
-							continue;
-						}
-						//执行getload方法
-						getload(dataset02,dir,list,rev.getStringProperty("item_id"));
-						//复制一份到父级
-						if(!dir.equals(dirFs)) {
-							getload(dataset02,dirFs,list,rev.getStringProperty("item_id"));
-						} 
-						if(!dir.equals(pathMap.get("1"))&& pathMap.get("1")!=null) {
-							getload(dataset02,pathMap.get("1"),list,rev.getStringProperty("item_id"));
-						}
-					}
-				}
-				for (int j = 0; j < datasets2.length; j++) {
-					//获取数据集数组
+				// 执行获取零件类型的方法
+				String type = dataset01.getStringProperty("object_type");
+
+				// 判断list包含hzm字符串的值 且 itemlist包含revtype的值
+				if (datasetList.contains(type)) {
+					// 获取数据集数据
 					TCComponentDataset dataset02 = null;
-					if(datasets2[j] instanceof TCComponentDataset) {
-						 dataset02 = (TCComponentDataset) datasets2[j];
-					}else {
+					if (datasets[j] instanceof TCComponentDataset) {
+						dataset02 = (TCComponentDataset) datasets[j];
+					} else {
 						continue;
 					}
-					//执行获取后缀名的方法
-//					gethzm(dataset02); 
-					//判断是否为所需要的零件类型
-					String type = dataset02.getStringProperty("object_type");
-					if(datasetList.contains(type)) { 
-						TCComponentDataset dataset = (TCComponentDataset) datasets2[j];
-						getload(dataset,dir,list,rev.getStringProperty("item_id"));
-						if(!dir.equals(dirFs)) {
-							getload(dataset,dirFs,list,rev.getStringProperty("item_id"));
-						} 
-						if(!dir.equals(pathMap.get("1"))) {
-							getload(dataset02,pathMap.get("1"),list,rev.getStringProperty("item_id"));
-						}
+					// 执行getload方法
+					getload(dataset02, dir, list, rev.getStringProperty("item_id"));
+					// 复制一份到父级
+					if (!dir.equals(dirFs)) {
+						getload(dataset02, dirFs, list, rev.getStringProperty("item_id"));
+					}
+					if (!dir.equals(pathMap.get("1")) && pathMap.get("1") != null) {
+						getload(dataset02, pathMap.get("1"), list, rev.getStringProperty("item_id"));
 					}
-					
 				}
-				AIFComponentContext[] children = bomLine.getChildren();
-				for(AIFComponentContext context:children) {
-					TCComponentBOMLine line=(TCComponentBOMLine)context.getComponent();
-					getOutPartInBom(line,sxtj,i,itemList,dirTop,list,1,dirFs);
+			}
+			for (int j = 0; j < datasets2.length; j++) {
+				// 获取数据集数组
+				TCComponentDataset dataset02 = null;
+				if (datasets2[j] instanceof TCComponentDataset) {
+					dataset02 = (TCComponentDataset) datasets2[j];
+				} else {
+					continue;
 				}
-			} else {
-				AIFComponentContext[] children = bomLine.getChildren();
-				for(AIFComponentContext context:children) {
-					TCComponentBOMLine line=(TCComponentBOMLine)context.getComponent();
-					getOutPartInBom(line,sxtj,0,itemList,dirTop,list,0,dirFs);
+				// 执行获取后缀名的方法
+//					gethzm(dataset02); 
+				// 判断是否为所需要的零件类型
+				String type = dataset02.getStringProperty("object_type");
+				if (datasetList.contains(type)) {
+					TCComponentDataset dataset = (TCComponentDataset) datasets2[j];
+					getload(dataset, dir, list, rev.getStringProperty("item_id"));
+					if (!dir.equals(dirFs)) {
+						getload(dataset, dirFs, list, rev.getStringProperty("item_id"));
+					}
+					if (!dir.equals(pathMap.get("1"))) {
+						getload(dataset02, pathMap.get("1"), list, rev.getStringProperty("item_id"));
+					}
 				}
+
+			}
+			AIFComponentContext[] children = bomLine.getChildren();
+			for (AIFComponentContext context : children) {
+				TCComponentBOMLine line = (TCComponentBOMLine) context.getComponent();
+				getOutPartInBom(line, sxtj, i, itemList, dirTop, list, 1, dirFs);
 			}
-	} 
+		} else {
+			AIFComponentContext[] children = bomLine.getChildren();
+			for (AIFComponentContext context : children) {
+				TCComponentBOMLine line = (TCComponentBOMLine) context.getComponent();
+				getOutPartInBom(line, sxtj, 0, itemList, dirTop, list, 0, dirFs);
+			}
+		}
+	}
+
 	private static void updateProgress(JProgressBar copyProgressBar, int progressSize) {
 		copyProgressBar.setString(progressSize + "%");
 		copyProgressBar.setValue(progressSize);
 	}
-	public Boolean getSxTj(){
+
+	public Boolean getSxTj() {
 		List<String> tjlist = new ArrayList<String>();
-		Boolean statusBool=false;
+		Boolean statusBool = false;
 		Component[] jcbs = btnPanel3.getComponents();
-		for(Component component:jcbs) {
-			if(component instanceof JCheckBox) {
+		for (Component component : jcbs) {
+			if (component instanceof JCheckBox) {
 				JCheckBox jcb = (JCheckBox) component;
-				if(jcb.isSelected()) {
+				if (jcb.isSelected()) {
 					tjlist.add(jcb.getText());
 				}
 			}
-		}  
-		for(String s:tjlist) {
-			if(s.equals("仅下载已发布图纸")) {
-				statusBool=true;
-			} 
-			if(s.equals("外协件/外购件打包下载")) {
-				outPartBool=true;
+		}
+		for (String s : tjlist) {
+			if (s.equals("仅下载已发布图纸")) {
+				statusBool = true;
+			}
+			if (s.equals("外协件/外购件打包下载")) {
+				outPartBool = true;
+			}
+		}
+		return statusBool;
+	}
+	
+	public List<String> getIscarryRev() {
+		List<String> tjlist = new ArrayList<String>();
+		Boolean statusBool = false;
+		Component[] jcbs = btnPanel4.getComponents();
+		for (Component component : jcbs) {
+			if (component instanceof JCheckBox) {
+				JCheckBox jcb = (JCheckBox) component;
+				if (jcb.isSelected()) {
+					tjlist.add(jcb.getText());
+				}
 			}
-		}  
-		return statusBool; 
-	} 
+		}
+
+		return tjlist;
+	}
+	
 }
diff --git a/src/com/connor/dfl/plm/dfl042/Dfl042Dialog.java b/src/com/connor/dfl/plm/dfl042/Dfl042Dialog.java
index 66605b9..a950705 100644
--- a/src/com/connor/dfl/plm/dfl042/Dfl042Dialog.java
+++ b/src/com/connor/dfl/plm/dfl042/Dfl042Dialog.java
@@ -134,7 +134,7 @@ public class Dfl042Dialog extends AbstractAIFDialog {
 //			public void mouseClicked(MouseEvent e){
 //				if(e.getButton() == MouseEvent.BUTTON3){
 //					//					tableRow = qryTable.rowAtPoint(e.getPoint());
-//					tableRow = qryTable.getSelectedRow();
+//					tableRow = .getSelectedRow();
 //					qryTable.setRowSelectionInterval(tableRow, tableRow);
 //					int indexRow = qryTable.convertRowIndexToModel(tableRow);
 //					System.out.println("indexRow=============="+indexRow);
diff --git a/src/com/connor/dfl/plm/dfl044/Dfl044Dialog.java b/src/com/connor/dfl/plm/dfl044/Dfl044Dialog.java
index e13efff..6552949 100644
--- a/src/com/connor/dfl/plm/dfl044/Dfl044Dialog.java
+++ b/src/com/connor/dfl/plm/dfl044/Dfl044Dialog.java
@@ -221,7 +221,6 @@ public class Dfl044Dialog extends AbstractAIFDialog {
 				}
 			}
 		    
-		    
 			sql2 = sb.toString();
 			System.out.println("sql===================="+sql2);
 			Stock = getRecords(sql2);
@@ -238,9 +237,9 @@ public class Dfl044Dialog extends AbstractAIFDialog {
 			System.out.println("11.05选择的下拉值单价======="+Select);
 		    if(!("".equals(userid.trim()))) {
 		    	if("".equals(Select) || " ".equals(Select) || "null".equals(Select)) {
-		    		numsSb.append(zhangtao + ".ccc_file inner join "+zhangtao+".ccz_file on ccz01=ccc02 and ccz02=ccc03 where ccc01='"+userid+"'");
+		    		numsSb.append(zhangtao + ".ccc_file inner join "+zhangtao+".ccz_file on ccz01=ccc02 and ccz02-1=ccc03 where ccc01='"+userid+"'");
 		    	}else {
-		    		numsSb.append(zhangtao1 + ".ccc_file inner join "+zhangtao1+".ccz_file on ccz01=ccc02 and ccz02=ccc03 where ccc01='"+userid+"'");
+		    		numsSb.append(zhangtao1 + ".ccc_file inner join "+zhangtao1+".ccz_file on ccz01=ccc02 and ccz02-1=ccc03 where ccc01='"+userid+"'");
 				}
 			}
 			String numsSql = numsSb.toString();
diff --git a/src/com/connor/dfl/plm/dfl045/Dfl045Operation.java b/src/com/connor/dfl/plm/dfl045/Dfl045Operation.java
index b823ab2..ed4c9ea 100644
--- a/src/com/connor/dfl/plm/dfl045/Dfl045Operation.java
+++ b/src/com/connor/dfl/plm/dfl045/Dfl045Operation.java
@@ -18,6 +18,7 @@ import java.util.stream.Collectors;
 
 import javax.swing.JComboBox;
 
+import org.apache.commons.lang.ObjectUtils.Null;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFCellStyle;
 import org.apache.poi.xssf.usermodel.XSSFRow;
@@ -93,14 +94,18 @@ public class Dfl045Operation extends AbstractAIFOperation{
 		}
 		TCComponentDataset excel = (TCComponentDataset) session.stringToComponent(puid);
 		File file = ((TCComponentDataset)excel).getTcFiles()[0].getFmsFile();
-		SimpleDateFormat df = new SimpleDateFormat("yyyyMMddHHmmss");// 设置日期格式
+		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");// 设置日期格式
+		SimpleDateFormat mmdf = new SimpleDateFormat("yyyyMMddHHmm");// 设置命名日期格式
 		Date startDate = df.parse(Starttime);
 		Date endDate = df.parse(Endtime);
 		String starttime = df.format(startDate);
+		String mmstart = mmdf.format(mmdf.parse(Starttime)) ;
 		String endtime = df.format(endDate);
+		String mmend = mmdf.format(mmdf.parse(Endtime)) ;
 		System.out.println("11.12start====="+Starttime+"======end======"+Endtime);
-		String[] keys = new String[] {"创建日期晚于","创建日期早于"};
-		String[] values = new String[] {Starttime,Endtime};
+		System.out.println("11.12start====="+starttime+"======end======"+endtime);
+		String[] keys = new String[] {"创建日期晚于","创建日期早于","任务状态不等于"};
+		String[] values = new String[] {Starttime,Endtime,"32"};
 		List<TCComponent> compList = queryObject("东富龙-查找已发起的流程", keys, values);
 		
 		pathRoute = pathRoute + File.separator + "流程报表【"+starttime+"】-【"+endtime+"】.xlsx";
@@ -320,16 +325,18 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//String task_type = comp.getStringProperty("task_type");
 						taskList.add(task_name);
 						//责任人
-						String resp_party = comp.getProperty("fnd0Performer");
-					//	System.out.println("11.12resp_party======"+resp_party);
-						taskList.add(resp_party);
-						//责任部门
+						String resp_party = null;
+						//责任部门valid_signoffs
 						String group = comp.getProperty("awp0Reviewers");
+						//System.out.println("11.19处理前========="+group);
 						if("".equals(group)) {
+							taskList.add(resp_party);
 							taskList.add(group);
 						}else {
 							String[] ss = group.split("/");
 							group = ss[0];
+							resp_party = ss[2];
+							taskList.add(resp_party);
 							taskList.add(group);
 						}
 						//开始时间
@@ -400,17 +407,18 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						taskList.add(task_name);
 						
 						//责任人
-						String resp_party = comp.getProperty("fnd0Performer");
-					//	System.out.println("11.12resp_party======"+resp_party);
-						taskList.add(resp_party);
+						String resp_party = null;
 						//责任部门valid_signoffs
 						String group = comp.getProperty("awp0Reviewers");
 						//System.out.println("11.19处理前========="+group);
 						if("".equals(group)) {
+							taskList.add(resp_party);
 							taskList.add(group);
 						}else {
 							String[] ss = group.split("/");
 							group = ss[0];
+							resp_party = ss[2];
+							taskList.add(resp_party);
 							taskList.add(group);
 						}
 						//开始时间
@@ -499,7 +507,7 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//将单个的string集合给到beanlist1
 						List<String> beanList1 = makeList.get(k);
 						//System.out.println("11.16--beanList1.size====="+beanList1.size());
-						for(int l = 5 , m = 0 ; l<beanList1.size()+5 ; l++ , m++ ) {
+						for(int l = 4 , m = 0 ; l<beanList1.size()+4 ; l++ , m++ ) {
 							//System.out.println("int-l-11.17========"+l);
 							XSSFRow row2 = sheet.getRow(o);
 							XSSFCell excelCell2 = null;
@@ -523,7 +531,7 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//将单个的string集合给到beanlist1
 						List<String> beanList1 = examineList.get(k);
 						//System.out.println("11.16--beanList1.size====="+beanList1.size());
-						for(int l = 5 , m = 0 ; l<beanList1.size()+5 ; l++ , m++ ) {
+						for(int l = 4 , m = 0 ; l<beanList1.size()+4 ; l++ , m++ ) {
 							//System.out.println("int-l-11.17========"+l);
 							XSSFRow row2 = sheet.getRow(o);
 							XSSFCell excelCell2 = null;
@@ -547,7 +555,7 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//将单个的string集合给到beanlist1
 						List<String> beanList1 = approvalList.get(k);
 						//System.out.println("11.16--beanList1.size====="+beanList1.size());
-						for(int l = 5 , m = 0 ; l<beanList1.size()+5 ; l++ , m++ ) {
+						for(int l = 4 , m = 0 ; l<beanList1.size()+4 ; l++ , m++ ) {
 							//System.out.println("int-l-11.17========"+l);
 							XSSFRow row2 = sheet.getRow(o);
 							XSSFCell excelCell2 = null;
@@ -682,16 +690,18 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//String task_type = comp.getStringProperty("task_type");
 						taskList.add(task_name);
 						//责任人
-						String resp_party = comp.getProperty("fnd0Performer");
-					//	System.out.println("11.12resp_party======"+resp_party);
-						taskList.add(resp_party);
-						//责任部门
+						String resp_party = null;
+						//责任部门valid_signoffs
 						String group = comp.getProperty("awp0Reviewers");
+						//System.out.println("11.19处理前========="+group);
 						if("".equals(group)) {
+							taskList.add(resp_party);
 							taskList.add(group);
 						}else {
 							String[] ss = group.split("/");
 							group = ss[0];
+							resp_party = ss[2];
+							taskList.add(resp_party);
 							taskList.add(group);
 						}
 						//开始时间
@@ -761,16 +771,18 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//String task_type = comp.getStringProperty("task_type");
 						taskList.add(task_name);
 						//责任人
-						String resp_party = comp.getProperty("fnd0Performer");
-					//	System.out.println("11.12resp_party======"+resp_party);
-						taskList.add(resp_party);
-						//责任部门
+						String resp_party = null;
+						//责任部门valid_signoffs
 						String group = comp.getProperty("awp0Reviewers");
+						//System.out.println("11.19处理前========="+group);
 						if("".equals(group)) {
+							taskList.add(resp_party);
 							taskList.add(group);
 						}else {
 							String[] ss = group.split("/");
 							group = ss[0];
+							resp_party = ss[2];
+							taskList.add(resp_party);
 							taskList.add(group);
 						}
 						//开始时间
@@ -850,7 +862,7 @@ public class Dfl045Operation extends AbstractAIFOperation{
 
 					for (int k=0 ;k<makeList.size();k++) {
 						List<String> beanList1 = makeList.get(k);
-						for(int l = 5 , m = 0 ; l<beanList1.size()+5 ; l++ , m++ ) {
+						for(int l = 4 , m = 0 ; l<beanList1.size()+4 ; l++ , m++ ) {
 							XSSFRow row2 = sheet.getRow(o);
 							XSSFCell excelCell2 = null;
 							if(row2 == null){
@@ -868,7 +880,7 @@ public class Dfl045Operation extends AbstractAIFOperation{
 					for (int k=0 ;k<examineList.size();k++) {
 
 						List<String> beanList1 = examineList.get(k);
-						for(int l = 5 , m = 0 ; l<beanList1.size()+5 ; l++ , m++ ) {
+						for(int l = 4 , m = 0 ; l<beanList1.size()+4 ; l++ , m++ ) {
 
 							XSSFRow row2 = sheet.getRow(o);
 							XSSFCell excelCell2 = null;
@@ -892,7 +904,7 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//将单个的string集合给到beanlist1
 						List<String> beanList1 = approvalList.get(k);
 						//System.out.println("11.16--beanList1.size====="+beanList1.size());
-						for(int l = 5 , m = 0 ; l<beanList1.size()+5 ; l++ , m++ ) {
+						for(int l = 4 , m = 0 ; l<beanList1.size()+4 ; l++ , m++ ) {
 							//System.out.println("int-l-11.17========"+l);
 							XSSFRow row2 = sheet.getRow(o);
 							XSSFCell excelCell2 = null;
@@ -1024,16 +1036,18 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//String task_type = comp.getStringProperty("task_type");
 						taskList.add(task_name);
 						//责任人
-						String resp_party = comp.getProperty("fnd0Performer");
-					//	System.out.println("11.12resp_party======"+resp_party);
-						taskList.add(resp_party);
-						//责任部门
+						String resp_party = null;
+						//责任部门valid_signoffs
 						String group = comp.getProperty("awp0Reviewers");
+						//System.out.println("11.19处理前========="+group);
 						if("".equals(group)) {
+							taskList.add(resp_party);
 							taskList.add(group);
 						}else {
 							String[] ss = group.split("/");
 							group = ss[0];
+							resp_party = ss[2];
+							taskList.add(resp_party);
 							taskList.add(group);
 						}
 						//开始时间
@@ -1103,19 +1117,20 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//String task_type = comp.getStringProperty("task_type");
 						taskList.add(task_name);
 						//责任人
-						String resp_party = comp.getProperty("fnd0Performer");
-					//	System.out.println("11.12resp_party======"+resp_party);
-						taskList.add(resp_party);
-						//责任部门
+						String resp_party = null;
+						//责任部门valid_signoffs
 						String group = comp.getProperty("awp0Reviewers");
+						//System.out.println("11.19处理前========="+group);
 						if("".equals(group)) {
+							taskList.add(resp_party);
 							taskList.add(group);
 						}else {
 							String[] ss = group.split("/");
 							group = ss[0];
+							resp_party = ss[2];
+							taskList.add(resp_party);
 							taskList.add(group);
 						}
-						
 						//开始时间
 						String fnd0StartDate = comp.getProperty("fnd0StartDate");
 						taskList.add(fnd0StartDate);
@@ -1183,16 +1198,18 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//String task_type = comp.getStringProperty("task_type");
 						taskList.add(task_name);
 						//责任人
-						String resp_party = comp.getProperty("fnd0Performer");
-					//	System.out.println("11.12resp_party======"+resp_party);
-						taskList.add(resp_party);
-						//责任部门
+						String resp_party = null;
+						//责任部门valid_signoffs
 						String group = comp.getProperty("awp0Reviewers");
+						//System.out.println("11.19处理前========="+group);
 						if("".equals(group)) {
+							taskList.add(resp_party);
 							taskList.add(group);
 						}else {
 							String[] ss = group.split("/");
 							group = ss[0];
+							resp_party = ss[2];
+							taskList.add(resp_party);
 							taskList.add(group);
 						}
 						//开始时间
@@ -1280,7 +1297,7 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//将单个的string集合给到beanlist1
 						List<String> beanList1 = makeList.get(k);
 						//System.out.println("11.16--beanList1.size====="+beanList1.size());
-						for(int l = 5 , m = 0 ; l<beanList1.size()+5 ; l++ , m++ ) {
+						for(int l = 4 , m = 0 ; l<beanList1.size()+4 ; l++ , m++ ) {
 							//System.out.println("int-l-11.17========"+l);
 							XSSFRow row2 = sheet.getRow(o);
 							XSSFCell excelCell2 = null;
@@ -1304,7 +1321,7 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//将单个的string集合给到beanlist1
 						List<String> beanList1 = examineList.get(k);
 						//System.out.println("11.16--beanList1.size====="+beanList1.size());
-						for(int l = 5 , m = 0 ; l<beanList1.size()+5 ; l++ , m++ ) {
+						for(int l = 4 , m = 0 ; l<beanList1.size()+4 ; l++ , m++ ) {
 							//System.out.println("int-l-11.17========"+l);
 							XSSFRow row2 = sheet.getRow(o);
 							XSSFCell excelCell2 = null;
@@ -1328,7 +1345,7 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//将单个的string集合给到beanlist1
 						List<String> beanList1 = approvalList.get(k);
 						//System.out.println("11.16--beanList1.size====="+beanList1.size());
-						for(int l = 5 , m = 0 ; l<beanList1.size()+5 ; l++ , m++ ) {
+						for(int l = 4 , m = 0 ; l<beanList1.size()+4 ; l++ , m++ ) {
 							//System.out.println("int-l-11.17========"+l);
 							XSSFRow row2 = sheet.getRow(o);
 							XSSFCell excelCell2 = null;
@@ -1352,7 +1369,7 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//将单个的string集合给到beanlist1
 						List<String> beanList1 = wukonglList.get(k);
 						//System.out.println("11.16--beanList1.size====="+beanList1.size());
-						for(int l = 5 , m = 0 ; l<beanList1.size()+5 ; l++ , m++ ) {
+						for(int l = 4 , m = 0 ; l<beanList1.size()+4 ; l++ , m++ ) {
 							//System.out.println("int-l-11.17========"+l);
 							XSSFRow row2 = sheet.getRow(o);
 							XSSFCell excelCell2 = null;
@@ -1389,18 +1406,19 @@ public class Dfl045Operation extends AbstractAIFOperation{
 		
 		List<String> userList = new  ArrayList<String>();
 		List<List> newList = new ArrayList<List>();
-		double zongshu = 1;
-		double yuqishu = 0;
-		double yuqilv = 0;
+		
 
 		for(int i=0;i<oneList.size();i++) {
+			double zongshu = 1;
+			double yuqishu = 0;
+			double yuqilv = 0;
 			
 			List<String> array = new ArrayList<String>();
 			List<String> Overdue = new  ArrayList<String>();
 			array = oneList.get(i);
 			String user = array.get(0);
 			
-			System.out.println("11.22user==========="+user);
+			System.out.println("11.24======array==========="+array);
 			//定义和赋值集合中的元素
 			String group = array.get(1);
 			String rate = array.get(2);
@@ -1419,7 +1437,7 @@ public class Dfl045Operation extends AbstractAIFOperation{
 			Overdue.add(zongString);
 			Overdue.add(yuqiString);
 			Overdue.add(yuqilvString+"%");
-			
+			//判断是否有重复的用户
 			boolean a = userList.contains(user); 
 			//System.out.println("11.22===a========="+a);
 			if(a==true) {
@@ -1442,12 +1460,14 @@ public class Dfl045Operation extends AbstractAIFOperation{
 							yuanyuqishu++;
 							yuqiString = String.valueOf(yuanyuqishu);
 							System.out.println("11.22=====yuqiString======"+yuqiString);
-							beanList2.set(3, zongString);
+							beanList2.set(3, yuqiString);
 							list.set(j, beanList2);
 						}
 						//计算逾期率
+						System.out.println("11.24=====yuqishu"+beanList2.get(3));
 						zongshu = Double.valueOf(beanList2.get(2));
 						yuqishu = Double.valueOf(beanList2.get(3));
+						
 						yuqilv = yuqishu/zongshu*100;
 						yuqilvString = String.valueOf(yuqilv)+"%";
 						beanList2.set(4, yuqilvString);
@@ -1459,13 +1479,13 @@ public class Dfl045Operation extends AbstractAIFOperation{
 			}else //如果不是就正常添加
 			{
 				userList.add(user);
-				//System.out.println("11.22====list======="+list);
+				//System.out.println("11.24====Overdue======="+Overdue);
 				list.add(Overdue);
 			}
 			
 		}
-		System.out.println("11.22userlist==========="+userList);
-		System.out.println("11.22====list====="+list);
+//		System.out.println("11.22userlist==========="+userList);
+//		System.out.println("11.22====list====="+list);
 		for(int k=0;k<list.size();k++) {
 			List<String> Overdue1 = new  ArrayList<String>();
 			Overdue1 = list.get(k);
diff --git a/src/com/connor/dfl/plm/dfl046/test.java b/src/com/connor/dfl/plm/dfl046/test.java
index 83b394b..f87677a 100644
--- a/src/com/connor/dfl/plm/dfl046/test.java
+++ b/src/com/connor/dfl/plm/dfl046/test.java
@@ -97,7 +97,6 @@ public class test extends AbstractAIFOperation {
 							if(names[names.length-2].equals(zts[0])) {
 								this.zhangtao = zts[1];
 								System.out.println("11.04账套======"+zhangtao);
-								
 								break;
 							}
 						}
@@ -867,7 +866,7 @@ public class test extends AbstractAIFOperation {
 	private String getPrice () {
 		String price = null;
 		String sql = null;
-		sql  = "select ccc23a from " +zhangtao + ".ccc_file inner join "+zhangtao+".ccz_file on ccz01=ccc02 and ccz02=ccc03 where ccc01='"+item_id1+"'";
+		sql  = "select ccc23a from " +zhangtao + ".ccc_file inner join "+zhangtao+".ccz_file on ccz01=ccc02 and ccz02-1=ccc03 where ccc01='"+item_id1+"'";
 		System.out.println("sql======"+sql);
 		try {
 			price = data.getRecord(sql);
diff --git a/src/com/connor/dfl/plm/exportBOM/test.java b/src/com/connor/dfl/plm/exportBOM/test.java
index d08ac6b..4ee84af 100644
--- a/src/com/connor/dfl/plm/exportBOM/test.java
+++ b/src/com/connor/dfl/plm/exportBOM/test.java
@@ -765,8 +765,8 @@ public class test extends AbstractAIFOperation {
 			item_id1 = rev.getStringProperty("item_id");
 			rev_id1 = rev.getStringProperty("item_revision_id");
 			name1 = rev.getStringProperty("object_name");
-			price1 = getPrice();
-			total1 = getTotal(design_num1,price1);
+//			price1 = getPrice();
+//			total1 = getTotal(design_num1,price1);
 			if("T2_outsourceRevision".equals(type)) {
 				xuhao1 = num ;
 				String classID = item_id1.substring(0, 2);
@@ -864,38 +864,38 @@ public class test extends AbstractAIFOperation {
 		     	}
 		}
 	
-	private String getPrice () {
-		String price = null;
-		String sql = null;
-		sql  = "select ccc23a from " +zhangtao + ".ccc_file inner join "+zhangtao+".ccz_file on ccz01=ccc02 and ccz02=ccc03 where ccc01='"+item_id1+"'";
-		System.out.println("sql======"+sql);
-		try {
-			price = data.getRecord(sql);
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		System.out.println("11.08==price=="+price);
-		if(price == null  ) {
-			price  ="";
-	  }
-		return price;
-	}
-	
-	private String getTotal(String quantity,String price) {
-		// TODO Auto-generated method stub
-		if("".equals(price)||" ".equals(price)||"null".equals(price)) {
-			price = "0";
-		}
-		String total;
-		double amount =  Double.valueOf(quantity).doubleValue();
-		double tariff = Double.valueOf(price).doubleValue();
-		double product = amount * tariff ;
-		
-		total = ""+product;
-		System.out.println("11.08==总价====="+total);
-		return total;
-	}
+//	private String getPrice () {
+//		String price = null;
+//		String sql = null;
+//		sql  = "select ccc23a from " +zhangtao + ".ccc_file inner join "+zhangtao+".ccz_file on ccz01=ccc02 and ccz02=ccc03 where ccc01='"+item_id1+"'";
+//		System.out.println("sql======"+sql);
+//		try {
+//			price = data.getRecord(sql);
+//		} catch (Exception e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
+//		System.out.println("11.08==price=="+price);
+//		if(price == null  ) {
+//			price  ="";
+//	  }
+//		return price;
+//	}
+//	
+//	private String getTotal(String quantity,String price) {
+//		// TODO Auto-generated method stub
+//		if("".equals(price)||" ".equals(price)||"null".equals(price)) {
+//			price = "0";
+//		}
+//		String total;
+//		double amount =  Double.valueOf(quantity).doubleValue();
+//		double tariff = Double.valueOf(price).doubleValue();
+//		double product = amount * tariff ;
+//		
+//		total = ""+product;
+//		System.out.println("11.08==总价====="+total);
+//		return total;
+//	}
  //匹配分群码
 	private void getgroup() {
 		if("F10".equals(group1)) {