1、生成更改差异文件增加过滤类型及类名修改 #14

Merged
lidy merged 1 commits from ldy into main 1 year ago

@ -116,3 +116,4 @@ Bundle-ClassPath: .,
poi/okhttp-2.7.4.jar, poi/okhttp-2.7.4.jar,
json_lib/jfxrt.jar, json_lib/jfxrt.jar,
poi/Spire.Xls.jar poi/Spire.Xls.jar
Export-Package: com.chint.plm.createbomdifference

@ -775,7 +775,7 @@ public class CreateEcnController extends KFXPanelController {
} }
// 初始化选中工厂 // 初始化选中工厂
if (target.getType().equals("ZT2_Change")) { if (target.getType().equals("ZT2_Change")) {
String[] changeUnit1 = target.getProperty("zt2_ChangeUnit1").split(";"); String[] changeUnit1 = target.getProperty("zt2_ChangeUnit1").split(" ");
for (int j = 0; j < changeUnit1.length; j++) { for (int j = 0; j < changeUnit1.length; j++) {
unitList.add(changeUnit1[j]); unitList.add(changeUnit1[j]);
} }

@ -41,6 +41,6 @@ public class BomCompareComd extends KCommand {
*/ */
public BomCompareComd(AbstractAIFApplication app, String commandId, String actionInfo) { public BomCompareComd(AbstractAIFApplication app, String commandId, String actionInfo) {
super(app, commandId, actionInfo); super(app, commandId, actionInfo);
this.setRunnable(new CreateBOMDifferenceDialog(app)); this.setRunnable(new CreateBOMDifferenceDialogWh(app));
} }
} }

@ -35,25 +35,17 @@ import javax.swing.table.TableColumnModel;
import com.chint.plm.createEcn.Util; import com.chint.plm.createEcn.Util;
import com.connor.chint.sap2.util.KUtil; import com.connor.chint.sap2.util.KUtil;
import com.connor.chint.sap2.util.POIUtil;
import com.connor.chint.sap2.util.ProgressBar; import com.connor.chint.sap2.util.ProgressBar;
import com.connor.chint.sap2.util.SAPUtil;
import com.teamcenter.rac.aif.AbstractAIFApplication; import com.teamcenter.rac.aif.AbstractAIFApplication;
import com.teamcenter.rac.aif.AbstractAIFDialog; 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.ListOfValuesInfo; import com.teamcenter.rac.kernel.ListOfValuesInfo;
import com.teamcenter.rac.kernel.TCComponent; import com.teamcenter.rac.kernel.TCComponent;
import com.teamcenter.rac.kernel.TCComponentBOMLine;
import com.teamcenter.rac.kernel.TCComponentBOMWindow;
import com.teamcenter.rac.kernel.TCComponentBOMWindowType;
import com.teamcenter.rac.kernel.TCComponentForm; import com.teamcenter.rac.kernel.TCComponentForm;
import com.teamcenter.rac.kernel.TCComponentFormType; import com.teamcenter.rac.kernel.TCComponentFormType;
import com.teamcenter.rac.kernel.TCComponentGroup; import com.teamcenter.rac.kernel.TCComponentGroup;
import com.teamcenter.rac.kernel.TCComponentItem;
import com.teamcenter.rac.kernel.TCComponentItemRevision; import com.teamcenter.rac.kernel.TCComponentItemRevision;
import com.teamcenter.rac.kernel.TCComponentListOfValues; import com.teamcenter.rac.kernel.TCComponentListOfValues;
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.MessageBox;
@ -61,7 +53,7 @@ import com.teamcenter.rac.util.MessageBox;
* BOM * BOM
* *
*/ */
public class CreateBOMDifferenceDialog extends AbstractAIFDialog { public class CreateBOMDifferenceDialogWh extends AbstractAIFDialog {
private static final long serialVersionUID = 1190944518442503011L; private static final long serialVersionUID = 1190944518442503011L;
public static final String[] HEADER = { "序号", "更改类别", "父件物料编码", "父件物料描述", "旧物料编码", "旧物料描述", "旧物料数量", "新物料编码", public static final String[] HEADER = { "序号", "更改类别", "父件物料编码", "父件物料描述", "旧物料编码", "旧物料描述", "旧物料数量", "新物料编码",
@ -99,7 +91,7 @@ public class CreateBOMDifferenceDialog extends AbstractAIFDialog {
private String selectSubClassItemString = new String(); private String selectSubClassItemString = new String();
private String selectProcessTypeItemString = new String(); private String selectProcessTypeItemString = new String();
public CreateBOMDifferenceDialog(AbstractAIFApplication app) { public CreateBOMDifferenceDialogWh(AbstractAIFApplication app) {
super(false); super(false);
this.app = app; this.app = app;
this.session = (TCSession) app.getSession(); this.session = (TCSession) app.getSession();
@ -267,7 +259,7 @@ public class CreateBOMDifferenceDialog extends AbstractAIFDialog {
@Override @Override
public void run() { public void run() {
try { try {
pb = new ProgressBar(CreateBOMDifferenceDialog.this, new Dimension(250, 50)); pb = new ProgressBar(CreateBOMDifferenceDialogWh.this, new Dimension(250, 50));
pb.startProgress(); pb.startProgress();
pb.setText("正在生成BOM差异数据..."); pb.setText("正在生成BOM差异数据...");
pb.showDialog(); pb.showDialog();
@ -306,11 +298,11 @@ public class CreateBOMDifferenceDialog extends AbstractAIFDialog {
* P * P
* *
* @param oldComponents * @param oldComponents
* @throws TCException * @throws Exception
* @function * @function
*/ */
private TCComponent[] getPMaterial(TCComponent[] oldComponents) throws TCException { private TCComponent[] getPMaterial(TCComponent[] oldComponents) throws Exception {
// TODO Auto-generated method stub // Auto-generated method stub
// Util.ZT_PROP_PBOM; // Util.ZT_PROP_PBOM;
// 物料编码 - E和P物料 // 物料编码 - E和P物料
Map<String, PBomBean> pbomMap = new HashMap<>(); Map<String, PBomBean> pbomMap = new HashMap<>();
@ -370,7 +362,7 @@ public class CreateBOMDifferenceDialog extends AbstractAIFDialog {
@Override @Override
public boolean isCellEditable(int row, int column) { public boolean isCellEditable(int row, int column) {
// TODO Auto-generated method stub // Auto-generated method stub
if (column > 9) { if (column > 9) {
return true; return true;
} }
@ -394,7 +386,7 @@ public class CreateBOMDifferenceDialog extends AbstractAIFDialog {
Collections.sort(list, new Comparator<Entry<String, String>>() { Collections.sort(list, new Comparator<Entry<String, String>>() {
@Override @Override
public int compare(Entry<String, String> o1, Entry<String, String> o2) { public int compare(Entry<String, String> o1, Entry<String, String> o2) {
// TODO Auto-generated method stub // Auto-generated method stub
return o1.getValue().compareTo(o2.getValue()); return o1.getValue().compareTo(o2.getValue());
} }
@ -461,7 +453,7 @@ public class CreateBOMDifferenceDialog extends AbstractAIFDialog {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
// TODO Auto-generated method stub // Auto-generated method stub
disposeDialog(); disposeDialog();
} }
}); });
@ -609,7 +601,8 @@ public class CreateBOMDifferenceDialog extends AbstractAIFDialog {
} }
public TCComponentForm createBOMEC(int rowCout) throws Exception { @SuppressWarnings("deprecation")
public TCComponentForm createBOMEC(int rowCout) throws Exception {
TCComponentForm form = null; TCComponentForm form = null;
TCComponent[] comps = tar.getRelatedComponents("IMAN_reference"); TCComponent[] comps = tar.getRelatedComponents("IMAN_reference");
for (int i = 0, len = comps.length; i < len; i++) { for (int i = 0, len = comps.length; i < len; i++) {

@ -62,6 +62,8 @@ public class CreateBOMDifference_DYController {
for (TCComponent comp : oldComponents) { for (TCComponent comp : oldComponents) {
if (comp instanceof TCComponentItemRevision) { if (comp instanceof TCComponentItemRevision) {
rev = (TCComponentItemRevision) comp; rev = (TCComponentItemRevision) comp;
if(rev.isTypeOf("ZT2_XNZJBRevision"))
continue;
item = rev.getItem(); item = rev.getItem();
bean = map_item_beans.get(item); bean = map_item_beans.get(item);
if (bean == null) { if (bean == null) {
@ -105,6 +107,8 @@ public class CreateBOMDifference_DYController {
for (TCComponent comp : newComponents) { for (TCComponent comp : newComponents) {
if (comp instanceof TCComponentItemRevision) { if (comp instanceof TCComponentItemRevision) {
rev = (TCComponentItemRevision) comp; rev = (TCComponentItemRevision) comp;
if(rev.isTypeOf("ZT2_XNZJBRevision"))
continue;
item = rev.getItem(); item = rev.getItem();
bean = map_item_beans.get(item); bean = map_item_beans.get(item);
if (bean == null) { if (bean == null) {

Loading…
Cancel
Save