1ZDB300000P-逻辑修改前备份

com.connor.chint.wuhan/src/com/chint/plm/createKjBom/KjController.java

@@ -1,6 +1,7 @@
 package com.chint.plm.createKjBom;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -627,6 +628,8 @@ public class KjController {
 	//ÅúÁ¿¸´ÖÆ
 	private void cloneOrUpdate(TCSession session, TCComponentBOMLine parentLine,
 			List<TCComponentBOMLine> bomLines, List<TCComponentBOMLine> useLines) {
+		System.out.println("cloneOrUpdate==>" + bomLines);
+		System.out.println("useLines==>" + useLines);
 		com.teamcenter.services.rac.structuremanagement.StructureService service =
                 com.teamcenter.services.rac.structuremanagement.StructureService.getService(session);
 //		idMapAdd.clear();
@@ -656,6 +659,10 @@ public class KjController {
 //			for(int i = 0; i < bomLines.size(); i++) {
 //				TCComponentBOMLine subLine = bomLines.get(i);
 				TCComponentItem item = subLine.getItem();
+//				String name = item.getProperty("object_name");
+//				if(name.equals("芎뒀보陋") || name.equals("芎懶보陋")) {//TODO 
+//					continue;
+//				}
 				CloneStructureSaveAsIn dataMap = null;
 				if(item.getType().equals("ZT2_Design3D")) {
 //					subLine.replace
@@ -687,8 +694,8 @@ public class KjController {
 //		cloneStructureExpandOrUpdate.serviceData;
 		if (cloneStructure.serviceData.sizeOfPartialErrors() > 0) {
             for (int i = 0; i < cloneStructure.serviceData.sizeOfPartialErrors(); i++) {
-                System.out.println("Save class Partial Error -- " + cloneStructure.serviceData
+                System.out.println(i + "Save class Partial Error -- " + Arrays.toString(cloneStructure.serviceData
-                        .getPartialError(i).getMessages()[0]);
+                        .getPartialError(i).getMessages()));
             }
         }
 		try {

com.connor.chint.wuhan/src/com/connor/plm/txdp/TXDPHandler.java

@@ -3,40 +3,55 @@ import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 
+import com.connor.chint.sap2.util.ChintPreferenceUtil;
 import com.teamcenter.rac.aif.AbstractAIFApplication;
 import com.teamcenter.rac.aifrcp.AIFUtility;
+import com.teamcenter.rac.kernel.TCComponent;
+import com.teamcenter.rac.kernel.TCComponentFolder;
+import com.teamcenter.rac.kernel.TCComponentItem;
+import com.teamcenter.rac.kernel.TCComponentItemRevision;
 import com.teamcenter.rac.kernel.TCSession;
+import com.teamcenter.rac.util.MessageBox;
 
 public class TXDPHandler extends AbstractHandler {
 	
-	
 	@Override
 	public Object execute(ExecutionEvent arg0) throws ExecutionException {
 		AbstractAIFApplication app = AIFUtility.getCurrentApplication();
 		TCSession session = (TCSession) app.getSession();
 		try {
-			
+			String type = ChintPreferenceUtil.getPreference("CHINT_IRON_TYPE", session);
-			
+			if(type == null || type.isEmpty()) {
-			
+				MessageBox.post("首选项CHINT_IRON_TYPE配置不正确", "提示", MessageBox.WARNING);
+				return null;
+			}
+			TCComponent target = (TCComponent) app.getTargetComponent();
+			if(target instanceof TCComponentItem && !target.isTypeOf(type)) {
+				MessageBox.post("请选择文件夹或铁心剪切单进行导入", "提示", MessageBox.WARNING);
+				return null;
+			}else if(target instanceof TCComponentItemRevision 
+					&& !((TCComponentItemRevision)target).getItem().isTypeOf(type)) {
+				MessageBox.post("请选择文件夹或铁心剪切单进行导入", "提示", MessageBox.WARNING);
+				return null;
+			}else if(!(target instanceof TCComponentFolder)) {
+				MessageBox.post("请选择文件夹或铁心剪切单进行导入", "提示", MessageBox.WARNING);
+				return null;
+			}
 			new Thread() {
 				@Override
 				public void run() {
-					
 					try {
-						new TXDPFram(session);
+						new TXDPFram(session, target, type);
 					} catch (Exception e) {
-						// TODO Auto-generated catch block
+						//  Auto-generated catch block
 						e.printStackTrace();
 					}
-					
 				}
 			}.start();
-			
 		} catch (Exception e) {
-			// TODO: handle exception
+			// : handle exception
 			e.printStackTrace();
 		}
-	
 		return null;
 	}
 }