diff --git a/bin/.gitignore b/bin/.gitignore
index 4286c16..c2d9872 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1,2 +1 @@
 /com/
-/syn/
diff --git a/plugin.xml b/plugin.xml
index 2a87b0f..af942d6 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -231,6 +231,7 @@
 		<command name="导出变更单报表" id="com.connor.dfl.plm.dfl040.Dfl038Handler"/>
 		<command name="创建标准Bom" id="com.connor.dfl.plm.dfl041.Dfl041Handler"/>
 		<command name="ERP队列" id="com.connor.dfl.plm.dfl042.Dfl042Handler"/>
+		<command name="自动填写作业编号" id="com.connor.dfl.plm.dfl043.Dfl043Handler"/>
 	</extension>
 	<!--handlers-->
 	<extension point="org.eclipse.ui.handlers">
@@ -445,6 +446,7 @@
 	     <handler commandId="com.connor.dfl.plm.dfl040.Dfl038Handler" class="com.connor.dfl.plm.dfl040.Dfl038Handler"/>
 	     <handler commandId="com.connor.dfl.plm.dfl041.Dfl041Handler" class="com.connor.dfl.plm.dfl041.Dfl041Handler"/>
 	     <handler commandId="com.connor.dfl.plm.dfl042.Dfl042Handler" class="com.connor.dfl.plm.dfl042.Dfl042Handler"/>
+	     <handler commandId="com.connor.dfl.plm.dfl043.Dfl043Handler" class="com.connor.dfl.plm.dfl043.Dfl043Handler"/>
 	
 		<!--
 		 <handler commandId="com.connor.dfl.plm.dfl030.Dfl030Handler" class="com.connor.dfl.plm.dfl030.Dfl030Handler"/>
@@ -761,6 +763,19 @@
 						</and>
 					</visibleWhen>
 			</command>
+			<command commandId="com.connor.dfl.plm.dfl043.Dfl043Handler" id="com.connor.dfl.plm.dfl043.Dfl043Handler">
+					<visibleWhen>
+						<and>
+							<with variable="rac_command_suppression">
+								<not>
+									<iterate operator="or">
+										<equals value="com.connor.dfl.plm.dfl043.Dfl043Handler"/>
+									</iterate>
+								</not>
+							</with>
+						</and>
+					</visibleWhen>
+			</command>
 			<command commandId="com.connor.dfl.plm.dfl027.Dfl027Handler" id="com.connor.dfl.plm.dfl027.Dfl027Handler">
 					<visibleWhen>
 						<and>
diff --git a/src/com/connor/dfl/plm/dfl020/Dfl020Operation.java b/src/com/connor/dfl/plm/dfl020/Dfl020Operation.java
index fd4fc13..0f3264b 100644
--- a/src/com/connor/dfl/plm/dfl020/Dfl020Operation.java
+++ b/src/com/connor/dfl/plm/dfl020/Dfl020Operation.java
@@ -73,6 +73,7 @@ public class Dfl020Operation extends AbstractAIFOperation{
 	String accountSet;
 	private String zhangtao;
 	private AutoSign as = null;
+	private List<FatherBomLineBean> list = new ArrayList<FatherBomLineBean>();
 	String zong;
 
 
@@ -210,37 +211,37 @@ public class Dfl020Operation extends AbstractAIFOperation{
 				//TCProperty tcProperty = rev.getTCProperty("fnd0MyWorkflowTasks");
 				TCProperty tcProperty = rev.getTCProperty("fnd0MyWorkflowTasks");
 				TCComponent[] targets = tcProperty.getReferenceValueArray();
-				if(targets != null && targets.length>0) {
+//				if(targets != null && targets.length>0) {
 					//					MessageBox.post("��ѡ�еİ汾����û����������","��ʾ",MessageBox.INFORMATION);
 					//					return;
-					for(int i = 0;i<targets.length;i++) {
-						String ss =targets[i].getStringProperty("current_name");
-						System.out.println("ss======"+ss);
-						if("����ERP".equals(ss)) {
-							uid = targets[i].getUid();
-						}else {
-							MessageBox.post("����ǰ���ڵ����̲���ִ�д���ERP","��ʾ",MessageBox.INFORMATION);
-							return;
-						}
-					}
-				}
+//					for(int i = 0;i<targets.length;i++) {
+//						String ss =targets[i].getStringProperty("current_name");
+//						System.out.println("ss======"+ss);
+//						if("����ERP".equals(ss)) {
+//							uid = targets[i].getUid();
+//						}else {
+//							MessageBox.post("����ǰ���ڵ����̲���ִ�д���ERP","��ʾ",MessageBox.INFORMATION);
+//							return;
+//						}
+//					}
+//				}
 			}else if(comp[0] instanceof TCComponentTask){
 				TCComponentTask task = (TCComponentTask) comp[0];
 				String ss = task.getStringProperty("object_name");
 				System.out.println("ss==========="+ss);
-				if("����ERP".equals(ss)) {
-					uid = comp[0].getUid();
-					TCComponent[] targets = task.getReferenceListProperty("root_target_attachments");
-					for (int i = 0; i < targets.length; i++) {
-						if(targets[i] instanceof TCComponentItemRevision) {
-							rev = (TCComponentItemRevision) targets[i];
-							break;
-						}
-					}
-				}else {
-					MessageBox.post("����ǰ���ڵ����̲���ִ�д���ERP","��ʾ",MessageBox.INFORMATION);
-					return;
-				}
+//				if("����ERP".equals(ss)) {
+//					uid = comp[0].getUid();
+//					TCComponent[] targets = task.getReferenceListProperty("root_target_attachments");
+//					for (int i = 0; i < targets.length; i++) {
+//						if(targets[i] instanceof TCComponentItemRevision) {
+//							rev = (TCComponentItemRevision) targets[i];
+//							break;
+//						}
+//					}
+//				}else {
+//					MessageBox.post("����ǰ���ڵ����̲���ִ�д���ERP","��ʾ",MessageBox.INFORMATION);
+//					return;
+//				}
 			}else {
 				MessageBox.post("��ѡ�еIJ��ǰ汾���� ����BOM��","��ʾ",MessageBox.INFORMATION);
 				return;
@@ -266,8 +267,11 @@ public class Dfl020Operation extends AbstractAIFOperation{
 				as.AutoSignServer(uid,session);
 
 			}
+			
 			MessageBox.post("BOM���ݴ洢�ɹ���׼������ERP������",
 					"��ʾ", MessageBox.WARNING);
+			
+			
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			MessageBox.post("BOM���ݴ洢ʧ�ܣ���������´��ݣ�����",
@@ -280,12 +284,12 @@ public class Dfl020Operation extends AbstractAIFOperation{
 
 	protected void createXMLFile(TCComponentBOMLine line ,String zhangtao) throws TCException, IOException {
 
-		List<FatherBomLineBean> list = new ArrayList<FatherBomLineBean>();
+		//List<FatherBomLineBean> list = new ArrayList<FatherBomLineBean>();
 		StringBuilder uidSB = new StringBuilder();
 		try {
 			getBOMValue(line,list);
 			if(list.size() <=0) {
-				MessageBox.post("�����ݵ�BOM���Ѿ����ݵ�ERP,���飡", "��ʾ",
+				MessageBox.post("BOM ����ʧ�ܣ�����BOM���Ƿ���ȷ������", "��ʾ",
 						MessageBox.INFORMATION);
 				return;
 			}
@@ -476,10 +480,11 @@ public class Dfl020Operation extends AbstractAIFOperation{
 						num = childLine.getStringProperty( "T2_DesignQuantity");//�������	
 						if(num==null||"".equals(num.trim())) {
 							num = childLine.getStringProperty( "bl_quantity");//����	
-//							if(num==null||"".equals(num.trim())) {
-//								int num1=1;
-//								num =String.valueOf(num1);//Ĭ��Ϊ1
-//							}
+							if(num==null||"".equals(num.trim())) {
+								MessageBox.post("BOM������Ϊ�գ�����д����������",
+										"��ʾ", MessageBox.ERROR);
+								break;
+							}
 						}
 					}
 					System.out.println("num=============="+num);
@@ -555,9 +560,8 @@ public class Dfl020Operation extends AbstractAIFOperation{
 				if(Quantity==null||"".equals(Quantity.trim())) {
 					Quantity = childLine.getStringProperty( "bl_quantity");//����	
 					if(Quantity==null||"".equals(Quantity.trim())) {
-					
-					Quantity =1+"";//Ĭ��Ϊ1
-				}
+						return;
+				 }
 				}
 			}
 			System.out.println("Quantity=============="+Quantity);
diff --git a/src/com/connor/dfl/plm/dfl028/Dfl028AIFDialog.java b/src/com/connor/dfl/plm/dfl028/Dfl028AIFDialog.java
index 250e3e7..9834d82 100644
--- a/src/com/connor/dfl/plm/dfl028/Dfl028AIFDialog.java
+++ b/src/com/connor/dfl/plm/dfl028/Dfl028AIFDialog.java
@@ -51,6 +51,8 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 	private FileInputStream fis;
 	private FileOutputStream fos;
 	private JPanel btnPanel1;
+	private JPanel btnPanel2;
+	private JPanel btnPanel3;
 	private String hzm;
 	
 	public Dfl028AIFDialog(AbstractAIFApplication arg0){
@@ -181,16 +183,48 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 	//�����ʼ��
 	private void init(){
 		this.setLayout(new PropertyLayout());
-		this.setPreferredSize(new Dimension(550, 150));
+		this.setPreferredSize(new Dimension(650, 260));
 		FileSystemView fsv = FileSystemView.getFileSystemView();
 		String deskPath = fsv.getHomeDirectory().getPath();
+		//��һ�У�ͼֽ����
 		btnPanel1 = new JPanel();
+		JLabel drawingtype = new JLabel("ͼֽ����:");
 		JCheckBox checkBox1 = new JCheckBox("DWG");
-		JCheckBox checkBox2 = new JCheckBox("PDF");
-		JCheckBox checkBox3 = new JCheckBox("STP");
+		JCheckBox checkBox2 = new JCheckBox("idw");//new
+		JCheckBox checkBox3 = new JCheckBox("PDF");
+		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(checkBox1);
 		btnPanel1.add(checkBox2);
 		btnPanel1.add(checkBox3);
+		btnPanel1.add(checkBox4);
+		btnPanel1.add(checkBox5);
+		btnPanel1.add(checkBox6);
+		btnPanel1.add(checkBox7);
+		//�ڶ��У��������
+	    btnPanel2 = new JPanel();
+		JLabel itemtype = new JLabel("�������:");
+		JCheckBox checkBox11 = new JCheckBox("ȫ��");
+		JCheckBox checkBox12 = new JCheckBox("�⹺��");
+		JCheckBox checkBox13 = new JCheckBox("����");
+		JCheckBox checkBox14 = new JCheckBox("�����");
+		//btnPanel2.add(itemtype);
+		btnPanel2.add(checkBox11);
+		btnPanel2.add(checkBox12);
+		btnPanel2.add(checkBox13);
+		btnPanel2.add(checkBox14);
+		//�����������
+		btnPanel3 = new JPanel();
+		JLabel additional = new JLabel("����ɸѡ:");
+		JCheckBox checkBox21 = new JCheckBox("��Э��/�⹺���������");
+		JCheckBox checkBox22 = new JCheckBox("�������ѷ���ͼֽ");
+		//btnPanel3.add(additional);
+		btnPanel3.add(checkBox21);
+		btnPanel3.add(checkBox22);
+		//����������ѡ��
 		jLabel = new JLabel("����·��:");
 		jtf.setText(deskPath);
 		jButton = new JButton("...");
@@ -203,8 +237,14 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 		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",panel);
+		
+		this.add("1.1.left.top",drawingtype);
+		this.add("1.2.left.top",btnPanel1);
+		this.add("2.1.left.top",itemtype);
+		this.add("2.2.left.top",btnPanel2);
+		this.add("3.1.left.top",additional);
+		this.add("3.2.left.top",btnPanel3);
+		this.add("4.1.left.top",panel);
 		this.setResizable(false);
 		this.setBounds(5, 5, 5, 5);
 		this.centerToScreen();
@@ -243,7 +283,7 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 		this.centerToScreen();
 		this.showDialog();
 	}
-	
+	//��ȡͼֽ����
 	public void getTypes() {
 		List<String> list = new ArrayList<String>();
 		Component[] jcbs = btnPanel1.getComponents();//����ѡ�����ݴ�������
@@ -258,20 +298,37 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 					list.add("stp");
 				}else if("PDF".equals(jcb.getText())) {
 					list.add("pdf");
+				}else if("idw".equals(jcb.getText())) {
+					list.add("idw");
+				}else if ("ipt".equals(jcb.getText())) {
+					list.add("ipt");
+				}else if ("iam".equals(jcb.getText())) {
+					list.add("iam");
+				}else if ("STEP".equals(jcb.getText())) {
+					list.add("STEP");
 				}
 			}
 		}
+		//�ж�list�Ĵ�С����СС�ڵ���0��ȫ������
 		if(list.size() <= 0) {
 			list.add("DWG");
 			list.add("dwg");
 			list.add("pdf");
 			list.add("stp");
+			list.add("idw");
+			list.add("iam");
+			list.add("STEP");
 		}
 		try {
 			for (int i = 0; i < targets.length; i++) {
 				if(targets[i] instanceof TCComponentBOMLine){	
+					List<String> itemlist = new ArrayList<String>();
+					//ִ�л�ȡ������͵ķ���
+					itemlist = getitemType();
+					//����bom��
 					TCComponentBOMLine line = (TCComponentBOMLine) targets[i];
 					TCComponentItemRevision rev = line.getItemRevision();
+					String revtype = rev.getStringProperty("object_type");
 					TCComponent[] datasets = rev.getReferenceListProperty("IMAN_specification");
 					TCComponent[] datasets2 = rev.getReferenceListProperty("IMAN_Rendering");
 					for (int j = 0; j < datasets.length; j++) {
@@ -279,14 +336,18 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 						TCComponentDataset dataset01 = (TCComponentDataset) datasets[j];
 						//ִ�л�ȡ��׺���ķ���
 						gethzm(dataset01);
-						
 						System.out.println("9.07test��׺��"+hzm);
-						//���list����hzm�ַ�����ֵ
-						if(list.contains(hzm)) {
-							//��ȡ���ݼ�����
-							TCComponentDataset dataset02 = (TCComponentDataset) datasets[j];
-							//ִ��getload����
-							getload(dataset02);
+						//ִ�л�ȡ������͵ķ���
+						itemlist = getitemType();
+						
+						//�ж�list����hzm�ַ�����ֵ �� itemlist����revtype��ֵ
+						if(itemlist.contains(revtype)) {
+							if(list.contains(hzm)) {
+								//��ȡ���ݼ�����
+								TCComponentDataset dataset02 = (TCComponentDataset) datasets[j];
+								//ִ��getload����
+								getload(dataset02);
+							}
 						}
 					}
 					for (int j = 0; j < datasets2.length; j++) {
@@ -295,25 +356,36 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 						//ִ�л�ȡ��׺���ķ���
 						gethzm(dataset02);
 						String type2 = datasets2[j].getType();
-						if(list.contains(hzm)) {
-							TCComponentDataset dataset = (TCComponentDataset) datasets2[j];
-							getload(dataset);
+						//�ж��Ƿ�Ϊ����Ҫ���������
+						if(itemlist.contains(revtype)) {
+							if(list.contains(hzm)) {
+								TCComponentDataset dataset = (TCComponentDataset) datasets2[j];
+								getload(dataset);
+							}
 						}
 					}
 				 }
 				else if(targets[i] instanceof TCComponentItemRevision){
+					List<String> itemlist = new ArrayList<String>();
+					//ִ�л�ȡ������͵ķ���
+					itemlist = getitemType();
 					TCComponentItemRevision rev = (TCComponentItemRevision) targets[i];
+					String revtype = rev.getStringProperty("object_type");
 					TCComponent[] datasets = rev.getReferenceListProperty("IMAN_specification");
 					TCComponent[] datasets2 = rev.getReferenceListProperty("IMAN_Rendering");
 					for (int j = 0; j < datasets.length; j++) {
+						
 						//��ȡ���ݼ�����
 						TCComponentDataset dataset02 = (TCComponentDataset) datasets[j];
 						//ִ�л�ȡ��׺���ķ���
 						gethzm(dataset02);
-						if(list.contains(hzm)) {
-							TCComponentDataset dataset = (TCComponentDataset) datasets[j];
-							System.out.println("�����ļ�");
-							getload(dataset);
+						//��������
+						if(itemlist.contains(revtype)) {
+							if(list.contains(hzm)) {
+								TCComponentDataset dataset = (TCComponentDataset) datasets[j];
+								System.out.println("�����ļ�");
+								getload(dataset);
+							}
 						}
 					}
 					for (int j = 0; j < datasets2.length; j++) {
@@ -321,17 +393,24 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 						TCComponentDataset dataset02 = (TCComponentDataset) datasets[j];
 						//ִ�л�ȡ��׺���ķ���
 						gethzm(dataset02);
-						if(list.contains(hzm)) {
-							TCComponentDataset dataset = (TCComponentDataset) datasets2[j];
-							getload(dataset);
+						//��������
+						if (itemlist.contains(revtype)) {
+							if(list.contains(hzm)) {
+								TCComponentDataset dataset = (TCComponentDataset) datasets2[j];
+								getload(dataset);
+							}
 						}
 					}
 				}else if(targets[i] instanceof TCComponentDataset) {
 					TCComponentDataset dataset = (TCComponentDataset) targets[i];
 					getload(dataset);
 				}else if(targets[i] instanceof TCComponentItem){
+					List<String> itemlist = new ArrayList<String>();
+					//ִ�л�ȡ������͵ķ���
+					itemlist = getitemType();
 					TCComponentItem item = (TCComponentItem) targets[i];
 					TCComponentItemRevision rev = item.getLatestItemRevision();
+					String revtype = rev.getStringProperty("object_type");
 					TCComponent[] datasets = rev.getReferenceListProperty("IMAN_specification");
 					TCComponent[] datasets2 = rev.getReferenceListProperty("IMAN_Rendering");
 					for (int j = 0; j < datasets.length; j++) {
@@ -339,9 +418,11 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 						TCComponentDataset dataset02 = (TCComponentDataset) datasets[j];
 						//ִ�л�ȡ��׺���ķ���
 						gethzm(dataset02);
-						if(list.contains(hzm)) {
-							TCComponentDataset dataset = (TCComponentDataset) datasets[j];
-							getload(dataset);
+						if(itemlist.contains(revtype)) {
+							if(list.contains(hzm)) {
+								TCComponentDataset dataset = (TCComponentDataset) datasets[j];
+								getload(dataset);
+							}
 						}
 					}
 					for (int j = 0; j < datasets2.length; j++) {
@@ -349,9 +430,11 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 						TCComponentDataset dataset02 = (TCComponentDataset) datasets[j];
 						//ִ�л�ȡ��׺���ķ���
 						gethzm(dataset02);
-						if(list.contains(hzm)) {
-							TCComponentDataset dataset = (TCComponentDataset) datasets2[j];
-							getload(dataset);
+						if(itemlist.contains(revtype)) {
+							if(list.contains(hzm)) {
+								TCComponentDataset dataset = (TCComponentDataset) datasets2[j];
+								getload(dataset);
+							}
 						}
 					}
 				}else {
@@ -363,5 +446,31 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 			// TODO: handle exception
 		}
 	}
+	//��ȡ�������
+	public List<String> getitemType() {
+		List<String> itemlist = new ArrayList<String>();
+		Component[] jcbs = btnPanel2.getComponents();//����ѡ�����ݴ�������
+		//������ѡ������
+		for(Component component : jcbs) {
+			JCheckBox jcb = (JCheckBox) component;
+			//�ж�Ԫ���Ƿ�ѡ��
+			if(jcb.isSelected()) {
+				itemlist.add(jcb.getText());
+				itemlist.add(jcb.getText());
+				if("ȫ��".equals(jcb.getText())) {
+					itemlist.add("T2_VirtualRevision");
+					itemlist.add("T2_OutBuyPartRevision");
+					itemlist.add("T2_outsourceRevision");
+				}else if ("����".equals(jcb.getText())) {
+					itemlist.add("T2_outsourceRevision");
+				}else if ("�⹺��".equals(jcb.getText())) {
+					itemlist.add("T2_OutBuyPartRevision");
+				}else if ("�����".equals(jcb.getText())) {
+					itemlist.add("T2_VirtualRevision");
+				}
+			}
+		}
+		return itemlist;
+	}
 
 }
diff --git a/src/com/connor/dfl/plm/exportBOM/BOMExportOperation.java b/src/com/connor/dfl/plm/exportBOM/BOMExportOperation.java
index 2cc0d2a..dbe5913 100644
--- a/src/com/connor/dfl/plm/exportBOM/BOMExportOperation.java
+++ b/src/com/connor/dfl/plm/exportBOM/BOMExportOperation.java
@@ -13,6 +13,7 @@ import java.util.Map;
 
 import javax.swing.filechooser.FileSystemView;
 
+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;
@@ -29,6 +30,7 @@ import com.connor.dfl.plm.util.ProgressBarThread;
 import com.teamcenter.rac.aif.AbstractAIFApplication;
 import com.teamcenter.rac.aif.AbstractAIFOperation;
 import com.teamcenter.rac.aif.kernel.AIFComponentContext;
+import com.teamcenter.rac.aif.kernel.IPreferenceService;
 import com.teamcenter.rac.aif.kernel.InterfaceAIFComponent;
 import com.teamcenter.rac.aifrcp.AIFUtility;
 import com.teamcenter.rac.kernel.*;
@@ -40,6 +42,7 @@ import com.teamcenter.rac.psebase.AbstractBOMLineViewerApplication;
 import com.teamcenter.rac.psebase.common.AbstractViewableTreeTable;
 import com.teamcenter.rac.treetable.TreeTableNode;
 import com.teamcenter.rac.util.MessageBox;
+import com.teamcenter.soaictstubs.stringSeq_tHolder;
 
 public class BOMExportOperation extends AbstractAIFOperation {
 	private AbstractAIFApplication app;
@@ -47,10 +50,11 @@ public class BOMExportOperation extends AbstractAIFOperation {
 	private ProgressBarThread wait;
 	private List<String> attrList;
 	private List<List> list = new ArrayList<List>();
-
+	private List<String> idlist = new ArrayList<String>();
 	private List<String> errList = new ArrayList<String>();
 	
 	private String xuninum = "0";
+	private String xuanzhongid = null;
 	
 	private String item_id1 = "";//Ʒ�� item_id
 	private String name1 = "";//���� object_name
@@ -58,6 +62,8 @@ public class BOMExportOperation extends AbstractAIFOperation {
 	private String unit1 = "";//��λ t2_unit
 	private String design_num1;//������� bl_quantity
 	private String brand1 = "";//Ʒ��
+	private String group1 = "";//��Ⱥ��
+	private String source1 = "";//��Դ��
 	private String weihao1 = "";//���  T2_weihao
 	private String importance1 = "";//��Ҫ��  t2_BOMImportance
 	private int xuhao1 ;
@@ -80,7 +86,7 @@ public class BOMExportOperation extends AbstractAIFOperation {
 		}
 		try {
 			System.out.println("��ʼ��ȡBOMģ��");
-			String puid = session.getPreferenceService().getStringValue("DFL_BOM_UID");
+			String puid = session.getPreferenceService().getStringValue("DFL_BOM_UID2");
 			System.out.println("puid======================"+puid);
 			if (puid == null||"".equals(puid)) {
 				MessageBox.post("��ѡ��DFL_BOM_UIDδ����,����ϵ����Ա!!",
@@ -94,21 +100,22 @@ public class BOMExportOperation extends AbstractAIFOperation {
 			FileSystemView fsv = FileSystemView.getFileSystemView();
 			String pathRoute = fsv.getHomeDirectory().getPath() + File.separator + "BOM���ܱ�" + time + ".xlsx";
 			String pathRoute1 = fsv.getHomeDirectory().getPath() + File.separator + "BOM���ձ�" + time + ".xlsx";
-			wait = new ProgressBarThread("�������ܱ��Ͷ��ձ�", "ִ���У����Ե�...");		
+			wait = new ProgressBarThread("�������ձ�", "ִ���У����Ե�...");		
 			wait.start();// ����������
 			TCComponentBOMLine line = (TCComponentBOMLine) app.getTargetComponent();
+			xuanzhongid = line.getStringProperty("awb0BomLineItemId");
 			try {
 				int level = 0;
 				int num = 0;
-			    getAndSetValue(line,level,num);
-				writeToExcel(file,pathRoute);
-				System.out.println("8.10(1)====="+list);
+			    //getAndSetValue(line,level,num);
+				//writeToExcel(file,pathRoute);
+				//System.out.println("8.10(1)====="+list);
 				list.clear();
-				System.out.println("8.10(2)====="+list);
+				//System.out.println("8.10(2)====="+list);
 				getAndSetValue1(line,level,num);
 				
 				writeToExcel(file,pathRoute1);
-				System.out.println("9.15(3)====="+list);
+				//System.out.println("9.15(3)====="+list);
 			} catch (Exception e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -132,16 +139,30 @@ public class BOMExportOperation extends AbstractAIFOperation {
 		}
 
 	}
+	
+	
 	//���ձ��Ļ�ȡ����
 	private void getAndSetValue1(TCComponentBOMLine bomLine,int level,int num) {
 		// TODO Auto-generated method stub
 		try {
 			//ͨ��������������
 			Unpack(bomLine);
-			System.out.println("level================"+level);
+			//System.out.println("level================"+level);
+			String firstnum = "";
+			//TCComponentItemRevision eqrev = bomLine.getItemRevision();
+			String firstid = bomLine.getStringProperty("awb0BomLineItemId");
+			
+			//�ж��Dz��ǵ�һ�㼶
+ 			if(xuanzhongid.equals(firstid)) {
+				firstnum = "1";
+			}else {
+				getItemValue1(bomLine,level,num);
+				firstnum =design_num1;
+				System.out.println("9.22.19.32��һ�㼶����====="+firstnum);
+			}
 			//����Ӽ�����
 			AIFComponentContext[] childs = bomLine.getChildren();
-			//
+			//�ж��Ƿ����Ӽ�
 			if(childs != null && childs.length > 0 ) {
 				//�㼶+1
 					//level++;
@@ -153,16 +174,22 @@ public class BOMExportOperation extends AbstractAIFOperation {
 						TCComponentItemRevision rev =  ((TCComponentBOMLine) comp).getItemRevision();
 						String type = rev.getStringProperty("object_type");
 						String occType = bomLine.getStringProperty("TCAI_OCC_TYPE");
+						//�ж������Ƿ�Ϊ0
+						if("0".equals(firstnum)) {
+							break;
+						}
 						//�ж��Ƿ�����bomline
 						if(comp instanceof TCComponentBOMLine) {
 							//����汾�������⹺���汾������Э���汾���ȡ����
+							if (!"Reference".equals(occType))
+							{
 							if("T2_outsourceRevision".equals(type) || "T2_OutBuyPartRevision".equals(type)) {
 								//���+1
 								num++;
 								//�ж��Ƿ�Ϊ���贫�ݵ�����
-								if (!"Reference".equals(occType))
-								{
+								
 								List<String> beanList1 = new ArrayList<String>();
+								
 								//�������Ķ���ǿת����Ϊbomline
 								TCComponentBOMLine ziLine = (TCComponentBOMLine) comp;
 								getItemValue1(ziLine,level,num);
@@ -171,9 +198,10 @@ public class BOMExportOperation extends AbstractAIFOperation {
 								System.out.println("a--915======"+a);
 								double b = Double.valueOf(design_num1).doubleValue();
 								System.out.println("b--915======"+b);
-								double c = a*b;
+								double c = Double.valueOf(firstnum).doubleValue();
 								System.out.println("c--915======"+c);
-								design_num1 = ""+c;
+								double d = a*b;
+								design_num1 = ""+d;
 								System.out.println("design_num9.15======"+design_num1);
 								String xuhao2 = xuhao1+"";
 								//�������Ե��ַ���������
@@ -185,39 +213,96 @@ public class BOMExportOperation extends AbstractAIFOperation {
 								beanList1.add(unit1);
 								beanList1.add(design_num1);
 								beanList1.add(brand1);
+								beanList1.add(group1);
+								beanList1.add(source1);
 								beanList1.add(weihao1);
 								beanList1.add(importance1);
 								System.out.println("beanList19.15====="+beanList1);
+								//���������߼��ж�
+								boolean include=idlist.contains(item_id1);//true
+								//System.out.println("�����Ƿ����9.18====="+include);
+								boolean panduan = true;
+								//�ٽ�id�����idlist
+								idlist.add(item_id1);
+								//System.out.println("idlist9.18====="+idlist);
 								//�����ַ������ϵ�������
-								list.add(beanList1);	
-								System.out.println("list9.15====="+list);
+								if (include == panduan) {
+									//��������list
+									
+									for (int j = 0; j < list.size(); j++) {
+										int m = list.size();
+										//System.out.println("9.18list�ij���"+m);
+										List<String> beanList2 = new ArrayList<String>();
+										beanList2 = list.get(j);
+										//System.out.println("9.18beanList2====="+beanList2);
+										boolean include1=beanList2.contains(item_id1);//true
+										//���Ϊ�棬���޸�����
+										if(include1 == panduan) {
+											String numString = null;
+											for(int k = 0 ; k<=beanList2.size() ; k++) {
+												 numString = beanList2.get(5);
+												System.out.println("����9.18====="+numString);
+											}
+												double before =  Double.valueOf(numString).doubleValue();
+												double add = Double.valueOf(design_num1).doubleValue();
+												double sum = before+add;
+												//String sum = ""+before+add;
+												System.out.println("9.18sum====="+sum);
+												beanList2.set(5, ""+sum);
+												list.set(j, beanList2);
+										}
+									}
+								}else if(include!=panduan){
+									list.add(beanList1);	
+									System.out.println("list9.15====="+list);
+								 }
 								}
-							}
+							
 							//��������⹺��Э����ݹ�˷���
-							else {
+							else {					
 								TCComponentBOMLine ziLine = (TCComponentBOMLine) comp;
+								String  xuniid  =  ziLine.getStringProperty("awb0BomLineItemId");
+								
+								//�ж����û�и��������û�����ϣ���������ѭ��
+								AIFComponentContext[] childs23 = ziLine.getChildren();
+								int  geshu =  childs23.length;
+								System.out.println("����Ϊ9.22====="+geshu+"====="+xuniid);
+								if (childs23.length <= 0 ) {
+									System.out.println("9.22ִ����������");
+									continue;
+								}
+								
+								//System.out.println("9.22�����id === ==="+xuniid);
 								design_num1 = "1";
 								//�Ƚ������(xuninum)��ֵ��Ϊ��ȡ����ֵ
 								xuninum = design_num1;
-								System.out.println("8.12���������"+xuninum);
+								System.out.println("8.12���������"+xuninum+"===9.22�����id==="+xuniid);
 								//�������������Ϊdouble����a
 								double a = Double.valueOf(xuninum).doubleValue();
-								System.out.println("8.12�������double����a"+a);
+								System.out.println("8.12�������double����a"+a+"===9.22�����id==="+xuniid);
 								getItemValue1(ziLine,level,xuhao1);
 								//���û�ȡ������Ϊdouble����b
+								System.out.println("9.22���з�������design_num1��ֵ====="+design_num1);
 								double b = Double.valueOf(design_num1).doubleValue();
-								System.out.println("8.12�������double����b"+b);
+								System.out.println("8.12�������double����b"+b+"===9.22�����id==="+xuniid);
+							
+								//double c = a*b;
+								double c = Double.valueOf(firstnum).doubleValue();
+								System.out.println("c--915======"+c);
 								//�õ���˵�����
-								double c = a*b;
-								System.out.println("8.12�������double����c"+c);
-								design_num1 = ""+c;
+								double d = a*b*c;
+								System.out.println("8.12�������double����c"+d+"===9.22�����id==="+xuniid);
+								design_num1 = ""+d;
 								//������һ���˻���ֵ�����xuninum
 								xuninum = design_num1;
-								System.out.println("8.12��һ�������"+xuninum);
+								System.out.println("8.12��һ�������"+xuninum+"===9.22�����id==="+xuniid);
+					
 								//�ݹ�
 								getAndSetValue1(ziLine,level,xuhao1);
-						}
+								}
+							}
 					  }
+						
 					}
 					//level--;
 			}
@@ -452,6 +537,8 @@ public class BOMExportOperation extends AbstractAIFOperation {
 		String unit = "";//��λ t2_unit
 		String design_num = "";//������� bl_quantity
 		String brand = "";//Ʒ��
+		String group = "";//��Ⱥ��
+		String source = "";//��Դ��
 		String weihao = "";//���  T2_weihao
 		String importance = "";//��Ҫ��  t2_BOMImportance
 		String xuhao = num + "";
@@ -469,6 +556,8 @@ public class BOMExportOperation extends AbstractAIFOperation {
 				}
 			}
 			String type = rev.getStringProperty("object_type");
+			group = rev.getStringProperty("t2_groupCode");
+			source = rev.getStringProperty("t2_sourceCode");
 			weihao = comp.getStringProperty("T2_weihao");
 			importance = comp.getStringProperty("t2_BOMImportance");
 			item_id = rev.getStringProperty("item_id");
@@ -567,6 +656,8 @@ public class BOMExportOperation extends AbstractAIFOperation {
 		beanList.add(unit);
 		beanList.add(design_num);
 		beanList.add(brand);
+		beanList.add(group);
+		beanList.add(source);
 		beanList.add(weihao);
 		beanList.add(importance);
 		list.add(beanList);		
@@ -577,6 +668,7 @@ public class BOMExportOperation extends AbstractAIFOperation {
 		
 		//lev1 = level + "";
 		TCComponentItemRevision rev =  comp.getItemRevision();
+		
 		try {
 			design_num1 = comp.getStringProperty("T2_ActualConsumption");
 				//���ʵ�������Ǵ���ģ��������ж�
@@ -598,12 +690,16 @@ public class BOMExportOperation extends AbstractAIFOperation {
 					else if(design_num1 == null || "".equals(design_num1) || " ".equals(design_num1)) {
 						design_num1 = comp.getStringProperty("bl_quantity");
 						if(design_num1 == null || "".equals(design_num1) || " ".equals(design_num1)) {
-							design_num1 = "1";
+							design_num1 = "0";
 						}
 					}
 				}
 			
 			String type = rev.getStringProperty("object_type");
+			group1 = rev.getStringProperty("t2_groupCode");
+			getgroup();
+			source1 = rev.getStringProperty("t2_sourceCode");
+			getsource();
 			weihao1 = comp.getStringProperty("T2_weihao");
 			importance1 = comp.getStringProperty("t2_BOMImportance");
 			item_id1 = rev.getStringProperty("item_id");
@@ -665,6 +761,7 @@ public class BOMExportOperation extends AbstractAIFOperation {
 						//ѡ�еĶ���İ汾
 						TCComponentItemRevision rev =  ((TCComponentBOMLine) comp).getItemRevision();
 						String type = rev.getStringProperty("object_type");
+						
 						String occType = unpackLine.getStringProperty("TCAI_OCC_TYPE");
 						//�ж��Ƿ�����bomline
 						if(comp instanceof TCComponentBOMLine) {
@@ -698,5 +795,150 @@ public class BOMExportOperation extends AbstractAIFOperation {
 			e.printStackTrace();
 		     	}
 		}
-
+ //ƥ���Ⱥ��
+	private void getgroup() {
+		if("F10".equals(group1)) {
+			group1 = "�����豸";
+		}
+		if("F11".equals(group1)) {
+			group1 = "���ȷ����豸";
+		}
+		if("F12".equals(group1)) {
+			group1 = "����";
+		}
+		if("F13".equals(group1)) {
+			group1 = "��������";
+		}
+		if("F14".equals(group1)) {
+			group1 = "�ܷ���";
+		}
+		if("F15".equals(group1)) {
+			group1 = "���������";
+		}
+		if("F16".equals(group1)) {
+			group1 = "�Ӿ���";
+		}
+		if("F17".equals(group1)) {
+			group1 = "����������";
+		}
+		if("F18".equals(group1)) {
+			group1 = "�����DZ���";
+		}
+		if("F19".equals(group1)) {
+			group1 = "ԭ������";
+		}
+		if("F20".equals(group1)) {
+			group1 = "��ѧƷ/��Ʒ��";
+		}
+		if("F21".equals(group1)) {
+			group1 = "�����";
+		}
+		if("F22".equals(group1)) {
+			group1 = "����";
+		}
+		if("F23".equals(group1)) {
+			group1 = "ҩ�ð���";
+		}
+		if("F24".equals(group1)) {
+			group1 = "ҽ�úIJ�";
+		}
+		if("F99".equals(group1)) {
+			group1 = "����";
+		}
+		if("F50".equals(group1)) {
+			group1 = "����";
+		}
+		if("F51".equals(group1)) {
+			group1 = "���ɻ�";
+		}
+		if("F52".equals(group1)) {
+			group1 = "������";
+		}
+		if("F53".equals(group1)) {
+			group1 = "������";
+		}
+		if("F54".equals(group1)) {
+			group1 = "��Һ";
+		}
+		if("F55".equals(group1)) {
+			group1 = "ϴƿ��";
+		}
+		if("F56".equals(group1)) {
+			group1 = "����";
+		}
+		if("F57".equals(group1)) {
+			group1 = "��װ��";
+		}
+		if("F58".equals(group1)) {
+			group1 = "���ǻ�";
+		}
+		if("F60".equals(group1)) {
+			group1 = "�����";
+		}
+		if("F61".equals(group1)) {
+			group1 = "�Ƽ��";
+		}
+		if("F62".equals(group1)) {
+			group1 = "��װ��";
+		}
+		if("F63".equals(group1)) {
+			group1 = "ҽ��װ��";
+		}
+		if("F64".equals(group1)) {
+			group1 = "��ˮ";
+		}
+		if("F65".equals(group1)) {
+			group1 = "BFS";
+		}
+		if("F66".equals(group1)) {
+			group1 = "ԭ��ҩ ���ɰ���Ŀ";
+		}
+		if("F67".equals(group1)) {
+			group1 = "ԭ��ҩ ������Ŀ";
+		}
+		if("F68".equals(group1)) {
+			group1 = "�����Ƽ�";
+		}
+		if("F69".equals(group1)) {
+			group1 = "��������";
+		}
+		if("F70".equals(group1)) {
+			group1 = "���﹤��";
+		}
+		if("F71".equals(group1)) {
+			group1 = "Ԥ���";
+		}
+		if("F72".equals(group1)) {
+			group1 = "��ϴ��";
+		}
+		if("F73".equals(group1)) {
+			group1 = "ʳƷװ��";
+		}
+		if("F74".equals(group1)) {
+			group1 = "ҽ�ð���";
+		}
+		if("F75".equals(group1)) {
+			group1 = "�ܿ���Э";
+		}
+		if("F76".equals(group1)) {
+			group1 = "���ڻ�";
+		}
+	}
+//ƥ����Դ��
+	private void getsource() {
+		//M ���Ƽ�
+		
+		if("M".equals(source1)){
+			source1 = "���Ƽ�";
+		}
+		//P �ɹ���
+		if("P".equals(source1)){
+			source1 = "�ɹ���";
+		}
+		//X �����
+		if("X".equals(source1)) {
+			source1 = "�����";
+		}
+		System.out.println("���÷���source1==9.22====="+source1);
+	}
 }