From 42093024076c6604b43a6cfdec4f85f8cb565f09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=86=AC=E9=98=B3?= Date: Tue, 6 Feb 2024 16:56:05 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=8A=93=E5=8F=96=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=B6=E4=B9=9F=E9=9C=80=E8=A6=81=E6=8A=93?= =?UTF-8?q?=E5=8F=96=E5=8F=98=E6=9B=B4=E7=9A=84E=E7=89=A9=E6=96=99=202?= =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0=E5=A4=87=E4=BB=B6=E5=8C=85=E5=B7=A5?= =?UTF-8?q?=E8=89=BA=E8=B7=AF=E7=BA=BF=E6=8C=87=E6=B4=BE=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=203=E3=80=81DBOM=E8=BD=ACEBOM=E5=88=B7=E6=96=B0=E6=9C=BA?= =?UTF-8?q?=E5=88=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../createbomdifference/ExtractDiffComd.class | Bin 14828 -> 14976 bytes .../chint/yunpi/command/AssignProcess$1.class | Bin 6567 -> 8727 bytes .../chint/yunpi/command/AssignProcess.class | Bin 5385 -> 5278 bytes .../yunpi/command/DbomToECommand$1$1.class | Bin 2835 -> 2897 bytes .../yunpi/command/DbomToECommand$1.class | Bin 4370 -> 4395 bytes .../chint/yunpi/command/DbomToECommand.class | Bin 2525 -> 2706 bytes com.connor.chint.wuhan/plugin.xml | 6 +- .../createbomdifference/ExtractDiffComd.java | 65 ++++++++++------- .../chint/yunpi/command/AssignProcess.java | 68 ++++++++++++------ .../chint/yunpi/command/DbomToECommand.java | 31 ++++---- 10 files changed, 103 insertions(+), 67 deletions(-) diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/createbomdifference/ExtractDiffComd.class b/com.connor.chint.wuhan/bin/com/chint/plm/createbomdifference/ExtractDiffComd.class index 164646b8a197f9e2db3f7bcd6498a5ec5f8ad599..38a94da8d5c2e49c073ad84f8279b74fcc3ad308 100644 GIT binary patch delta 6040 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 diff --git a/com.connor.chint.wuhan/bin/com/connor/chint/yunpi/command/AssignProcess$1.class b/com.connor.chint.wuhan/bin/com/connor/chint/yunpi/command/AssignProcess$1.class index 2b0ffab6264116c1a469cd876f2df68eba5e5894..a289046e9eb4331321747d9880cede5b19b69edc 100644 GIT binary patch literal 8727 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 delta 2952 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 K08jJDKmP-z+mzM- literal 5385 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 Jo_Ti^`vXHjey#uj delta 415 zcmXYtO)ErU6vuyeX3Txuxl!X97T8HLsVPedu~D*6SlNgYX2$Cn%#3#i*Go?p*oiDi zNlA*Og^hd!3&R(%l{0b{=bZjM|CjT;g>=Yz`FVH(8rZ$DzWw!zn1R#Q+SU2>c$ITc z+hzN>-pOt5E5;4{xxM|*vj>YwrcI`Fi&^8HA)!ai-ohmFCUXYWI-@G=_Su2K_|$ML zYO|o@(z{ZeXOerCm24w`L2W0KWk58}@eOZ{v zIKgNzUU1Ju?**zee8+6vGpf#eN9slh9D}R@6Lfu`Sa_Skk((1qBPs%vb&+q<#TBx>9)n diff --git a/com.connor.chint.wuhan/bin/com/connor/chint/yunpi/command/DbomToECommand$1.class b/com.connor.chint.wuhan/bin/com/connor/chint/yunpi/command/DbomToECommand$1.class index 9c089a1479d074b4ac5932c0471cd32e83b47252..2bcbcea61be35dc002b2269e93f596f81ef03bac 100644 GIT binary patch delta 640 zcmY+B$xo9(6u^J;wdHF+inO&zj7=d`u^~bg!KIR@QCuM=l~zSftR89%>B&^oLvJ1> zSYu*OC|>BFZnK{Z2bks{MGmpRVLoz%Pg3DCJ$xa=4~{7_y~-f0Tq5g< zB$ba7YAvT!fJ>^4gxbo03UWpDat*hj-C#v|BGiLXi^TbUq_PO`{)5=>$h+FF{K!X}Ij5>lW_2<^-; zi!NARo--%yUI<2nYEKD2Rvo1?ud_jyH&A6A>a~*eF#mUjV~KbrY<`KL&P(+R8NlgA wTaGK&8Sy%-@&U!vv}0XIOJ#aZnwfYdr^ajEh%~dBw=9b05}y)TUg>4=7hNxgRR910 delta 588 zcmY+C%TH5L5Qo3Hz4VsbR!UQBjP;R9p&GT zrtK+P67H}+<}TSAiynVOq%l9XuD)X^(>E}9=}NXu2zC!TnaiEdK#$Yg-)B*IR>!U#thMoV`jWgntONqd<8 zJrPV-8YYRl*DKl2wQQFR6Y diff --git a/com.connor.chint.wuhan/bin/com/connor/chint/yunpi/command/DbomToECommand.class b/com.connor.chint.wuhan/bin/com/connor/chint/yunpi/command/DbomToECommand.class index 38dd3a0b5334d234f1815c6817a7fc6773e67243..adf5c9e91d4dd57f3e31fc801fc9bd2c779617f8 100644 GIT binary patch delta 1107 zcmZvb-BTM?7{-5Rvzra;#)M4?4Hnx#fe?rUtJnfoZ4GL_8!AXY)D%Lb#SqijVH`E% zy*G5dkp2PouGP_ojyMip>Wt&~2Y9bnj`xoBJxjGS=+4eL@4n}Kp7XrVIr~fEMu+pm zUtfOT(}dV&%EaA?*XRSZAaw9UU8@*;T-xYEJX{!gJ( z?lUeHVVgsW(SNH7qIAN)WcHiSDn{1gId}i4!z9n?W}o-B%!|!Qj<_7(QK~l- zq0Hcn!xS&uyrf7xlwDYzFV`AND^-_QG$2-!HX757()`tP_0oLV=D4EsVf}WSN8Vjp zUMSZioK&>^_R0FMckcZD%}s}6oE8;L&L}!ECw8JHwlx%8ra7mGG*-6R6uUBm|E<<^ zGcL2drU;j6wQ_Yqj`06zcVN4!l?MVRG)FPQ1#zNKES@fYS+U+zW>s-O{Ot7q41eEL z7}{mII0j1J7a7|?-NuwJSkDd(=QePLTDaq;jNTT>aVurrWA}JC74{x)vF|2Puiwj< z_sGtEkutv{zmAtpnOo#rJb9O~TcmaR;5xA&eK5#Hz47Khs7)s4vMFnW!!2I8MW5cH zMPZX;bKZ#!PU)|+EnaOg=bhi)h>%?EJlEx5M=1yMBG-aB#6{6wl-mt^q>pZ?+)I*u z5~UfSM{vD@>T7a{ehQL0Lxwp91(+4GAr{F|<9#9gfK@(}vB{@=#HD~ZqOIX|-jG>G zZ&DKDbaa_{u~J715^0Ga3*VyHnG|e=x5VylW>}KdFwIrbbcL&uTo%v-;rk-Xwox`w zn{@ELZIhG$l8Lta#ISZO>*A?&Ji>}74vvpLnYA7(`xRrKOJD?!go9*P(1aFg?B<;z delta 915 zcmZ9LT~8Ee6vuzh%BZ3r7Q$wI;UfdazZnvNc~v2R>=KSDE*Kd{&k_aTwYu%d5i}Mb;~P@rSh3_ zVd3i3N@1b+pxOOhIadPm0%q!Tvw5Zet5{e8aYDKkv=?d>kSd&R0rf9V=)K{0b!Q*p z`OZ3@bybPy9g*9fvm+l#M;_CZchhdNrOK{5)F%C8xAU0YGizz*1%0Cm9B_;e_s1(9RjtBa{9?iW{yF67_HFDS@tl;Ugl+AMS)8KFUi_| z<4-C47uWe)&Oe-#vU5TW+~5?Gq66zRXN0Q2nvzOZXibY1wD}7&oD%{YDKN`UbwoaagWyp&9+jKs r|6iR1%ReIpBmP73_r - @@ -111,7 +111,7 @@ - --> + diff --git a/com.connor.chint.wuhan/src/com/chint/plm/createbomdifference/ExtractDiffComd.java b/com.connor.chint.wuhan/src/com/chint/plm/createbomdifference/ExtractDiffComd.java index 96aa7ff..e2f178c 100644 --- a/com.connor.chint.wuhan/src/com/chint/plm/createbomdifference/ExtractDiffComd.java +++ b/com.connor.chint.wuhan/src/com/chint/plm/createbomdifference/ExtractDiffComd.java @@ -8,7 +8,6 @@ package com.chint.plm.createbomdifference; import java.util.HashMap; -import java.util.List; import java.util.Locale; import java.util.Map; import java.util.ResourceBundle; @@ -17,7 +16,6 @@ import com.chint.plm.createEcn.Util; import com.connor.chint.sap2.util.BomToSapUtil; import com.connor.chint.yunpi.KCommand; import com.teamcenter.rac.aif.AbstractAIFApplication; -import com.teamcenter.rac.aif.kernel.AbstractAIFSession; import com.teamcenter.rac.aif.kernel.InterfaceAIFComponent; import com.teamcenter.rac.kernel.TCComponent; import com.teamcenter.rac.kernel.TCComponentBOMLine; @@ -26,7 +24,6 @@ import com.teamcenter.rac.kernel.TCComponentBOMWindowType; import com.teamcenter.rac.kernel.TCComponentItem; import com.teamcenter.rac.kernel.TCComponentItemRevision; import com.teamcenter.rac.kernel.TCComponentRevisionRule; -import com.teamcenter.rac.kernel.TCComponentRevisionRuleType; import com.teamcenter.rac.kernel.TCException; import com.teamcenter.rac.kernel.TCSession; import com.teamcenter.rac.util.MessageBox; @@ -75,8 +72,8 @@ public class ExtractDiffComd extends KCommand { } readChangeDesign(oldComponents, newComponents, tar); MessageBox.post(resource.getString("SUCC_CHANGE"), "", 2); - } catch (TCException e) { - // TODO Auto-generated catch block + } catch (Exception e) { + // Auto-generated catch block e.printStackTrace(); } } @@ -92,7 +89,7 @@ public class ExtractDiffComd extends KCommand { */ private void readChangeDesign(TCComponent[] oldComponents, TCComponent[] newComponents, TCComponent tar) throws TCException { - // TODO Auto-generated method stub + // Auto-generated method stub Map itemChangeMap = new HashMap<>(); for (TCComponent oldComponent : oldComponents) { if (oldComponent.getType().equals(ZT_DESIGN3D)) { @@ -161,22 +158,42 @@ public class ExtractDiffComd extends KCommand { continue; PBomBean pBomBeanOld = materialOld.get(materialNo); PBomBean pBomBeanNew = materialNew.get(materialNo); - // 有P物料获取P没有遍历EBOM + // 有P物料获取P没有遍历EBOM + /* TCComponent oldMaterial = pBomBeanOld.getpMaterial() == null ? pBomBeanOld.geteMaterial() : pBomBeanOld.getpMaterial(); TCComponent newMaterial = pBomBeanNew.getpMaterial() == null ? pBomBeanNew.geteMaterial() : pBomBeanNew.getpMaterial(); - // 全展开之后比较单层物料编码的数量 - // 旧的bom修改版本规则 - TCComponentBOMLine oldBomLine = sendToStructureManager((TCComponentItemRevision) oldMaterial, - Util.REVISION_RULE_ANY); - TCComponentBOMLine newBomLine = sendToStructureManager((TCComponentItemRevision) newMaterial, null); - // BOM全展开 - Map oldBomMap = BomToSapUtil.getBomLineTreeNodeSOA(oldBomLine); - Map newBomMap = BomToSapUtil.getBomLineTreeNodeSOA(newBomLine); - addChangeBom(oldBomMap, oldBomLine, newBomMap, newBomLine, tar); - System.out.println("oldBomMap===>" + oldBomMap.toString()); - System.out.println("newBomMap===>" + newBomMap.toString()); + */ + //TODO 20240201修改为遍历PBOM和EBOM + TCComponent oldMaterial = pBomBeanOld.getpMaterial(); + if(oldMaterial != null) { + TCComponent newMaterial = pBomBeanNew.getpMaterial(); + // 全展开之后比较单层物料编码的数量 + // 旧的bom修改版本规则 + TCComponentBOMLine oldBomLine = sendToStructureManager((TCComponentItemRevision) oldMaterial, Util.REVISION_RULE_ANY); + TCComponentBOMLine newBomLine = sendToStructureManager((TCComponentItemRevision) newMaterial, null); + // BOM全展开 + Map oldBomMap = BomToSapUtil.getBomLineTreeNodeSOA(oldBomLine); + Map newBomMap = BomToSapUtil.getBomLineTreeNodeSOA(newBomLine); + addChangeBom(oldBomMap, oldBomLine, newBomMap, newBomLine, tar); + System.out.println("oldBomMap===>" + oldBomMap.toString()); + System.out.println("newBomMap===>" + newBomMap.toString()); + } + oldMaterial = pBomBeanOld.geteMaterial(); + if(oldMaterial != null) { + TCComponent newMaterial = pBomBeanNew.geteMaterial(); + // 全展开之后比较单层物料编码的数量 + // 旧的bom修改版本规则 + TCComponentBOMLine oldBomLine = sendToStructureManager((TCComponentItemRevision) oldMaterial, Util.REVISION_RULE_ANY); + TCComponentBOMLine newBomLine = sendToStructureManager((TCComponentItemRevision) newMaterial, null); + // BOM全展开 + Map oldBomMap = BomToSapUtil.getBomLineTreeNodeSOA(oldBomLine); + Map newBomMap = BomToSapUtil.getBomLineTreeNodeSOA(newBomLine); + addChangeBom(oldBomMap, oldBomLine, newBomMap, newBomLine, tar); + System.out.println("oldBomMap===>" + oldBomMap.toString()); + System.out.println("newBomMap===>" + newBomMap.toString()); + } } } System.out.println("itemChangeMap===>" + itemChangeMap.toString()); @@ -196,7 +213,7 @@ public class ExtractDiffComd extends KCommand { private void addChangeBom(Map oldBomMap, TCComponentBOMLine oldBomLine, Map newBomMap, TCComponentBOMLine newBomLine, TCComponent changeTag) throws TCException { - // TODO Auto-generated method stub + // Auto-generated method stub String oldUid = oldBomLine.getUid(); ExpandPSData[] expandPSDatasOld = oldBomMap.get(oldUid); ExpandPSData[] expandPSDatasNew = newBomMap.get(newBomLine.getUid()); @@ -292,7 +309,7 @@ public class ExtractDiffComd extends KCommand { } return bomWindow.setWindowTopLine(null, tcComponentItemRev, null, null); - } catch (TCException e) { + } catch (Exception e) { e.printStackTrace(); return null; } @@ -306,13 +323,12 @@ public class ExtractDiffComd extends KCommand { * @function */ private Map getMaterialByDesign(TCComponentItemRevision designRev) throws TCException { - // TODO Auto-generated method stub + // Auto-generated method stub Map pbomMap = new HashMap<>(); // 图纸下物料 TCComponent[] represents = designRev.getReferenceListProperty(REPRESENTATION_FOR); for (TCComponent represent : represents) { - String[] matnrProps = represent - .getProperties(new String[] { Util.ZT_MATERIAL_NO, Util.ZT_PROP_PBOM, Util.ITEM_REVIISON_ID }); + String[] matnrProps = represent.getProperties(new String[] { Util.ZT_MATERIAL_NO, Util.ZT_PROP_PBOM, Util.ITEM_REVIISON_ID }); String materialNo = matnrProps[0];// material.getProperty(Util.ZT_MATERIAL_NO); if (pbomMap.containsKey(materialNo)) { PBomBean pBomBean = pbomMap.get(materialNo); @@ -322,8 +338,7 @@ public class ExtractDiffComd extends KCommand { if (matnrProps[1].equals(Util.ZT_VAL_PBOM) && matnrProps[2].compareTo(pBomBean.getpRevision()) > 0) { pBomBean.setpMaterial(represent); pBomBean.setpRevision(matnrProps[2]); - } else if (!matnrProps[1].equals(Util.ZT_VAL_PBOM) - && matnrProps[2].compareTo(pBomBean.geteRevision()) > 0) { + } else if (!matnrProps[1].equals(Util.ZT_VAL_PBOM) && matnrProps[2].compareTo(pBomBean.geteRevision()) > 0) { pBomBean.seteMaterial(represent); pBomBean.seteRevision(matnrProps[2]); } diff --git a/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/AssignProcess.java b/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/AssignProcess.java index ad36d1d..1e7b39e 100644 --- a/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/AssignProcess.java +++ b/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/AssignProcess.java @@ -1,6 +1,5 @@ package com.connor.chint.yunpi.command; -import java.sql.Connection; import java.sql.ResultSet; import java.util.ArrayList; import java.util.List; @@ -8,32 +7,30 @@ import java.util.Map; import javax.swing.JOptionPane; -//import com.connor.chint.sap2.KCommand; -import com.connor.chint.sap2.util.ChintPreferenceUtil; -import com.connor.chint.sap2.util.KUtil; import com.connor.chint.sap2.util.MyProgressBarCompent; -import com.connor.chint.sap2.util.SAPMessageUtil; import com.connor.chint.sap2.util.SAPMessageUtilFram; import com.connor.chint.sap2.util.SAPUtil; import com.connor.chint.sap2.util.SqlUtil; import com.connor.chint.yunpi.KCommand; import com.teamcenter.rac.aif.AbstractAIFApplication; +import com.teamcenter.rac.aif.kernel.AIFComponentContext; import com.teamcenter.rac.aif.kernel.InterfaceAIFComponent; import com.teamcenter.rac.kernel.TCComponent; import com.teamcenter.rac.kernel.TCComponentBOMLine; import com.teamcenter.rac.kernel.TCComponentItem; import com.teamcenter.rac.kernel.TCComponentItemRevision; -import com.teamcenter.rac.kernel.TCException; +import com.teamcenter.rac.kernel.TCPreferenceService; import com.teamcenter.rac.kernel.TCSession; import com.teamcenter.rac.kernel.TCUserService; import com.teamcenter.rac.util.MessageBox; +@SuppressWarnings("deprecation") public class AssignProcess extends KCommand { - private boolean top = true; +// private boolean top = true; private TCComponentItemRevision rev; - public TCComponentItemRevision getPRevision(TCComponentItemRevision rev2) throws TCException { + public TCComponentItemRevision getPRevision(TCComponentItemRevision rev2) throws Exception { String zt2_MaterialNo = rev2.getStringProperty("zt2_MaterialNo"); if(rev2.getType().equals("Part Revision")) { @@ -66,7 +63,7 @@ public class AssignProcess extends KCommand { } private TCComponentItemRevision getTopZzItem(TCComponentItemRevision rev) { - // TODO Auto-generated method stub + // Auto-generated method stub // item = null; try { TCComponent[] whereUsed = rev.whereUsed((short)0); @@ -95,10 +92,9 @@ public class AssignProcess extends KCommand { return item; } } - } - } catch (TCException e) { - // TODO Auto-generated catch block + } catch (Exception e) { + // Auto-generated catch block e.printStackTrace(); } return null; @@ -125,26 +121,58 @@ public class AssignProcess extends KCommand { new Thread() { @Override public void run() { - if(!rev.getType().equals("Part Revision")) { MessageBox.post("请选择PBOM对象", "", MessageBox.ERROR); return; } - MyProgressBarCompent comp = null; - try { + TCPreferenceService service = session.getPreferenceService(); // TCComponentItemRevision pRevision = getPRevision(rev); TCComponentItemRevision topZzItem = getTopZzItem(rev); + String name = rev.getProperty("object_name"); String property = topZzItem.getProperty("zt2_ifpbom"); if(!property.equals("P") && topZzItem.getStringProperty("object_desc").contains("1ZDB300000P")) { MessageBox.post("请选择PBOM对象", "", MessageBox.ERROR); return; } + boolean isback = false; + String[] rules = service.getStringValues("CHINT_PROCESS_RULE"); + for(String rule : rules) { + String[] split = rule.split(":"); + if(!split[0].equals(groupID)) + continue; + String[] backs = split[1].split(";"); + for(String back : backs) { + if(name.contains(back)) { + isback = true; + break; + } + } + if(isback) + break; + } TCComponentItemRevision desginRev = (TCComponentItemRevision) topZzItem.getRelatedComponent("TC_Is_Represented_By"); - System.out.println("topZzItem==>"+topZzItem.toString()); - if(desginRev==null) { - MessageBox.post("存在顶层P物料没有关联图纸,请检查.","提示",2); + System.out.println("topZzItem=="+topZzItem.toString()+">>"+isback); + if(isback) { + AIFComponentContext[] folders = topZzItem.getItem() + .whereReferencedByTypeRelation(new String[] { "ZT2_ProjectFolder" }, null);//new String[] { "contents" } + if(folders.length == 0) { + MessageBox.post("未找到产成品文件夹,请检查.", "提示", MessageBox.WARNING); + return; + } + AIFComponentContext[] ccps = folders[0].getComponent().getChildren(); + System.out.println(folders[0].getComponent() + "==>" + ccps.length); + for(AIFComponentContext aifcc : ccps) { + TCComponentItem item = (TCComponentItem) aifcc.getComponent(); + desginRev = (TCComponentItemRevision) item.getLatestItemRevision().getRelatedComponent("TC_Is_Represented_By"); + System.out.println(item + "==>" + desginRev); + if(desginRev != null) + break; + } + } + if(desginRev == null) { + MessageBox.post("存在顶层P物料没有关联图纸,请检查.", "提示", MessageBox.WARNING); return; } Map classificationAttributes = desginRev.getItem().getClassificationAttributes(); @@ -154,7 +182,7 @@ public class AssignProcess extends KCommand { if(key.equals("产品型号")) { String cphx = classificationAttributes.get(key); String sql = "SELECT \"ProductZu\" FROM \"CHINT_WORKHOUR_WhProductXH\" where \"ProductXH\" = '"+cphx+"'"; - String[] prefs = session.getPreferenceService().getStringValues("database_tc"); + String[] prefs = service.getStringValues("database_tc"); SqlUtil.getTCDataConnection(prefs); ResultSet read2 = SqlUtil.read(sql); if(!read2.next()) { @@ -210,7 +238,7 @@ public class AssignProcess extends KCommand { MessageBox.post("一键指派工艺路线完成。","提示",MessageBox.INFORMATION); } } catch (Exception e1) { - // TODO Auto-generated catch block + // Auto-generated catch block e1.printStackTrace(); }finally { SqlUtil.freeAll(); diff --git a/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/DbomToECommand.java b/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/DbomToECommand.java index 6bf90ed..837826c 100644 --- a/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/DbomToECommand.java +++ b/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/DbomToECommand.java @@ -1,38 +1,28 @@ package com.connor.chint.yunpi.command; -import java.util.Map; - import javax.swing.JOptionPane; -import org.jdesktop.swingx.treetable.DefaultMutableTreeTableNode; - -import com.connor.chint.sap2.util.BomToSapUtil; import com.connor.chint.sap2.util.ChintPreferenceUtil; import com.connor.chint.sap2.util.KUtil; import com.connor.chint.sap2.util.MyProgressBarCompent; -import com.connor.chint.sap2.util.SAPMessageUtil; import com.connor.chint.sap2.util.SAPMessageUtilFram; import com.connor.chint.sap2.util.SAPUtil; import com.connor.chint.yunpi.KCommand; import com.teamcenter.rac.aif.AbstractAIFApplication; import com.teamcenter.rac.aif.kernel.InterfaceAIFComponent; import com.teamcenter.rac.kernel.TCComponentBOMLine; -import com.teamcenter.rac.kernel.TCComponentBOMWindow; -import com.teamcenter.rac.kernel.TCComponentBOMWindowType; import com.teamcenter.rac.kernel.TCComponentItem; import com.teamcenter.rac.kernel.TCComponentItemRevision; import com.teamcenter.rac.kernel.TCComponentItemType; -import com.teamcenter.rac.kernel.TCException; import com.teamcenter.rac.kernel.TCSession; -import com.teamcenter.rac.kernel.TCTypeService; import com.teamcenter.rac.kernel.TCUserService; import com.teamcenter.rac.util.MessageBox; -import com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSData; +@SuppressWarnings("deprecation") public class DbomToECommand extends KCommand { - private boolean top = true; +// private boolean top = true; private TCComponentItemRevision rev; public DbomToECommand(AbstractAIFApplication app, String commandId, String actionInfo) { super(app, commandId, actionInfo); @@ -47,8 +37,7 @@ public class DbomToECommand extends KCommand { if(targetComponent instanceof TCComponentBOMLine) { rev = ((TCComponentBOMLine)targetComponent).getItemRevision(); }else if(targetComponent instanceof TCComponentItemRevision) { - TCComponentItemRevision rev = (TCComponentItemRevision) targetComponent; - this.rev = rev; + rev = (TCComponentItemRevision) targetComponent; }else { MessageBox.post("请选择BOM行或者版本对象", "", MessageBox.ERROR); return; @@ -112,11 +101,13 @@ public class DbomToECommand extends KCommand { System.out.println("111"); new SAPMessageUtilFram("", "DBOM转EBOM存在异常物料,请检查:\n" + call.toString()).show(); }else { - MessageBox.post("DBOM转换EBOM完成","提示",2); + rev.refresh(); + MessageBox.post("DBOM转换EBOM完成", "提示", MessageBox.INFORMATION); } - } catch (TCException e1) { - // TODO Auto-generated catch block + } catch (Exception e1) { + // Auto-generated catch block e1.printStackTrace(); + MessageBox.post("错误：" + e1.toString(), "ERROR", MessageBox.ERROR); } if(comp!=null) { comp.setVisible(false); @@ -124,14 +115,16 @@ public class DbomToECommand extends KCommand { } }.start(); - } catch (TCException e1) { - // TODO Auto-generated catch block + } catch (Exception e1) { + // Auto-generated catch block e1.printStackTrace(); + MessageBox.post("错误：" + e1.toString(), "ERROR", MessageBox.ERROR); } } }.start(); }catch(Exception e) { e.printStackTrace(); + MessageBox.post("错误：" + e.toString(), "ERROR", MessageBox.ERROR); } } }