From 7703cba46b9516413eae7e9821c55b8888598633 Mon Sep 17 00:00:00 2001 From: "lidy@connor.net.cn" Date: Mon, 15 Apr 2024 10:18:59 +0800 Subject: [PATCH] =?UTF-8?q?20240415=E4=BB=A3=E7=A0=81=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- com.connor.chint.sap2/plugin.xml | 2 +- .../StandardBOM/DYStandardBOMController.java | 90 +++++++++++-- .../sap2/StandardBOM/DYStandardBomBean.java | 18 ++- .../chint/sap2/bean/BatchReviewBean.java | 4 +- .../sap2/commands/BatchReviewCommand.java | 17 ++- .../chint/sap2/commands/SAPZYCommandzt.java | 18 +-- .../sap2/commands/ZYApplyCodeCommandzt.java | 2 - .../CreateBOMDifferenceController.java | 8 +- .../CreateBOMDifferenceDialog.java | 19 +-- .../chint/sap2/general/BatchReviewDialog.java | 75 ++++++----- .../material_query/SearchMaterialDialog.java | 34 +++-- .../SearchMaterialDialogController.java | 71 +++++----- .../operation/SelfMPartNoBatchOperation.java | 40 +++--- .../connor/chint/sap2/sap/SAPXBDialog.java | 30 +++-- .../chint/sap2/sap_dy/SAPDYCCDialog.java | 22 +-- .../connor/chint/sap2/sap_gy/SAPGYDialog.java | 48 +++---- .../chint/sap2/sap_jyz/SAPJYZDialog.java | 32 +++-- .../sap2/sap_zy/CcpApplyCodeController.java | 39 +++--- .../chint/sap2/sap_zy/CcpApplyCodeDialog.java | 126 +++++++++--------- .../connor/chint/sap2/sap_zy/SAPZYDialog.java | 22 +-- .../sap2/sap_zy/SAPZYDialogControllerzt.java | 115 +++++++--------- .../chint/sap2/sap_zy/SAPZYDialogzt.java | 23 ++-- .../chint/sap2/sap_zy/SAPZYGG2Operation.java | 52 ++++---- .../sap2/sap_zy/ZYApplyCodeControllerzt.java | 24 ++-- .../sap2/sap_zy/ZYApplyCodeDialogzt.java | 116 ++++++++-------- .../chint/sap2/sap_zykg/SAPZYKGDialog.java | 30 +++-- .../com/connor/chint/sap2/util/SAPUtil.java | 62 +++++---- .../com/connor/chint/sap2/util/SqlUtil.java | 37 +++++ .../connor/chint/sap2/util/TableBuilder.java | 17 ++- 29 files changed, 678 insertions(+), 515 deletions(-) diff --git a/com.connor.chint.sap2/plugin.xml b/com.connor.chint.sap2/plugin.xml index c0a90df..7d64888 100644 --- a/com.connor.chint.sap2/plugin.xml +++ b/com.connor.chint.sap2/plugin.xml @@ -2544,7 +2544,7 @@ + value="com.connor.chint.sap2.commands.SAPZYCommandzt#ztdz"> diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/StandardBOM/DYStandardBOMController.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/StandardBOM/DYStandardBOMController.java index edb3dba..ddf605b 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/StandardBOM/DYStandardBOMController.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/StandardBOM/DYStandardBOMController.java @@ -17,6 +17,9 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.Statement; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -48,12 +51,14 @@ import org.apache.ibatis.session.SqlSession; import com.chint.plm.common.util.tc.TCItemRevisionUtils; import com.connor.chint.sap2.mybatis.CcemVW_Cgd; import com.connor.chint.sap2.mybatis.dao.CcemVW_CgdDao; +import com.connor.chint.sap2.sap_zy.CodeBean; import com.connor.chint.sap2.util.ChintPreferenceUtil; import com.connor.chint.sap2.util.DBMybatisUtil; 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.SAPUtil; +import com.connor.chint.sap2.util.SqlUtil; import com.connor.chint.sap2.util.WriteNumberUtil; import com.teamcenter.rac.aif.AbstractAIFApplication; import com.teamcenter.rac.aif.AbstractAIFDialog; @@ -613,20 +618,83 @@ public class DYStandardBOMController { TCComponentBOMLine topLine; List paths = new ArrayList<>(); TreePath path; + + + try { + Connection connection2 = SqlUtil.getConnection2(); + Statement state = connection2.createStatement(); for (int i = 0, len = revs.size(); i < len; i++) { rev = revs.get(i); win.setWindowTopLine(rev.getItem(), rev, null, null); topLine = win.getTopBOMLine(); topBean = new DYStandardBomBean(rev, topLine, 1); - if (KUtil.isTCM(rev)) { - topBean.setIsTCM("已发布"); - } - factoryNos = rev.getRelatedComponents("ZT2_FactoryNumber"); - if (factoryNos != null && factoryNos.length > 0) { - for (int j = 0, len2 = factoryNos.length; j < len2; j++) { - topBean.addFactoryID(factoryNos[j].getProperty("item_id")); +// if (KUtil.isTCM(rev)) { +// topBean.setIsTCM("已发布"); +// } + + //20240401优化速度 用sql查询id + + +// factoryNos = rev.getRelatedComponents("ZT2_FactoryNumber"); +// if (factoryNos != null && factoryNos.length > 0) { +// for (int j = 0, len2 = factoryNos.length; j < len2; j++) { +// topBean.addFactoryID(factoryNos[j].getProperty("item_id")); +// } +// } + + String uid = rev.getUid(); + + + //表创建了视图 +// CREATE VIEW CHINT_FACTORY_NUMBER_VIEW AS +// (Select R.RPRIMARY_OBJECTU,R.RSECONDARY_OBJECTU,T.PTYPE_NAME,I.PITEM_ID,R2.PZT2_WEBNO,W.PDATE_RELEASED from PIMANRELATION R +// INNER JOIN PIMANTYPE T +// ON R.RRELATION_TYPEU = T.PUID AND T.PTYPE_NAME = 'ZT2_FactoryNumber' AND R.RPRIMARY_OBJECTU = 'BAmV5Bsjpof3PC' +// INNER JOIN PITEM I +// ON I.PUID = R.RSECONDARY_OBJECTU +// INNER JOIN PPART_0_REVISION_ALT R2 +// ON R.RPRIMARY_OBJECTU = R2.PUID +// INNER JOIN PWORKSPACEOBJECT W +// ON W.PUID = RPRIMARY_OBJECTU) + + +// String sql = "Select I.PITEM_ID from 'PIMANRELATION' R\r\n" + +// " INNER JOIN 'PIMANTYPE' T\r\n" + +// " ON R.RRELATION_TYPEU = T.PUID AND T.PTYPE_NAME = 'ZT2_FactoryNumber' AND R.RPRIMARY_OBJECTU = '"; +// sql += uid+"'\r\n" + +// " INNER JOIN PITEM I\r\n" + +// " ON I.PUID = R.RSECONDARY_OBJECTU"; + + String sql = "SELECT PITEM_ID,PZT2_WEBNO,PDATE_RELEASED FROM CHINT_FACTORY_NUMBER_VIEW WHERE PTYPE_NAME = 'ZT2_FactoryNumber' AND RPRIMARY_OBJECTU = '"; + sql += uid+"'"; + + System.out.println("查询语句:" + sql.toString()); + ResultSet rs = SqlUtil.read(sql.toString()); + + while (rs.next()) { + String itemId = rs.getString(1); + String webNo = rs.getString(2); + String release = rs.getString(3); +// if(release != null && !release.isEmpty()) { +// topBean.setIsTCM("已发布"); +// } +// + topBean.setIsTCM(release == null ? "":release); + topBean.setStatus_BOM(webNo == null ? "":webNo); + topBean.addFactoryID(itemId == null ? "":itemId); + } - } + + if(rs != null) { + rs.close(); + rs = null; + System.out.println("111111111111111111111111111111111111111111111111111111111111111111111"); + } + if(state != null) { + state.close(); + } + + topBean.getFactoryNo(); topTreeNode = new DefaultMutableTreeNode(topBean); if (topLine.hasChildren()) { @@ -640,7 +708,11 @@ public class DYStandardBOMController { dialog.rev_nodes.put(rev, topTreeNode); dialog.node_status.put(topTreeNode, "0"); } - + }catch(Exception e) { + e.printStackTrace(); + }finally { + SqlUtil.freeAll(); + } for (int i = 0; i < paths.size(); i++) { dialog.tree.collapsePath(paths.get(i)); } diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/StandardBOM/DYStandardBomBean.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/StandardBOM/DYStandardBomBean.java index d06f37c..3279643 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/StandardBOM/DYStandardBomBean.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/StandardBOM/DYStandardBomBean.java @@ -46,12 +46,20 @@ public class DYStandardBomBean { public DYStandardBomBean(TCComponentItemRevision rev, TCComponentBOMLine line, int index) { this.rev = rev; this.index = index; - try { - status_BOM = rev.getProperty("zt2_WebNo"); - } catch (TCException e) { - e.printStackTrace(); - } +// try { +// status_BOM = rev.getProperty("zt2_WebNo"); +// } catch (TCException e) { +// e.printStackTrace(); +// } + + } + + public String getStatus_BOM() { + return status_BOM; + } + public void setStatus_BOM(String status_BOM) { + this.status_BOM = status_BOM; } public void getFactoryNo() { diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/bean/BatchReviewBean.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/bean/BatchReviewBean.java index f6737f0..06a4922 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/bean/BatchReviewBean.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/bean/BatchReviewBean.java @@ -9,7 +9,7 @@ public class BatchReviewBean { private String drawNo; // 对象为图纸类型 图样代号;对象为物料 物料编码 private String owning_user; // public boolean isHaveProcess = false; // 是否发起流程或者已在流程中 - public static int model_isTCM_INDEX = 3; + public int model_isTCM_INDEX = 3; private int index = 0; private TCComponent comp; private String factoryNo; @@ -89,7 +89,7 @@ public class BatchReviewBean { @Override public String toString() { - // TODO Auto-generated method stub + // Auto-generated method stub return object_name; } diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/commands/BatchReviewCommand.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/commands/BatchReviewCommand.java index 278fc12..0ce6447 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/commands/BatchReviewCommand.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/commands/BatchReviewCommand.java @@ -3,6 +3,7 @@ package com.connor.chint.sap2.commands; import com.connor.chint.sap2.KCommand; import com.connor.chint.sap2.general.BatchReviewDialog; import com.teamcenter.rac.aif.AbstractAIFApplication; +import com.teamcenter.rac.aif.kernel.InterfaceAIFComponent; import com.teamcenter.rac.kernel.TCComponentFolder; import com.teamcenter.rac.util.MessageBox; @@ -17,10 +18,22 @@ public class BatchReviewCommand extends KCommand { public BatchReviewCommand(AbstractAIFApplication app, String commandId, String actionInfo) { super(app, commandId, actionInfo); - if (app.getTargetComponent() == null || !(app.getTargetComponent() instanceof TCComponentFolder)) { - MessageBox.post("请选择文件夹", "", 2); +// if (app.getTargetComponent() == null || !(app.getTargetComponent() instanceof TCComponentFolder)) { +// MessageBox.post("请选择文件夹", "", 2); +// return; +// } + InterfaceAIFComponent[] folders = app.getTargetComponents(); + if(folders == null || folders.length == 0) { + MessageBox.post("请选择文件夹", "", MessageBox.ERROR); return; } + for(InterfaceAIFComponent f : folders) { + if(!(f instanceof TCComponentFolder)) { + MessageBox.post("请选择文件夹", "", MessageBox.ERROR); + return; + } + } + this.setRunnable(new BatchReviewDialog(app)); } diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/commands/SAPZYCommandzt.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/commands/SAPZYCommandzt.java index bb2fc09..06cf4ae 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/commands/SAPZYCommandzt.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/commands/SAPZYCommandzt.java @@ -1,18 +1,12 @@ package com.connor.chint.sap2.commands; import com.connor.chint.sap2.KCommand; -import com.connor.chint.sap2.sap_by.SAPBYOperation; -import com.connor.chint.sap2.sap_by.SAPZZDialog; import com.connor.chint.sap2.sap_gy.SAPGYDialog; -import com.connor.chint.sap2.sap_gy.SAPGYGGOperation; import com.connor.chint.sap2.sap_zy.SAPZYDialogzt; -import com.connor.chint.sap2.sap_zy.SAPZYGGOperation; import com.connor.chint.sap2.util.ChintPreferenceUtil; import com.connor.chint.sap2.util.SAPUtil; import com.teamcenter.rac.aif.AbstractAIFApplication; -import com.teamcenter.rac.kernel.TCException; import com.teamcenter.rac.kernel.TCSession; -import com.teamcenter.rac.util.MessageBox; public class SAPZYCommandzt extends KCommand { @@ -22,8 +16,8 @@ public class SAPZYCommandzt extends KCommand { String groupID = ""; try { groupID = SAPUtil.getGroupID(session); - } catch (TCException e1) { - // TODO Auto-generated catch block + } catch (Exception e1) { + // Auto-generated catch block e1.printStackTrace(); } // TCSession session = (TCSession) app.getSession(); @@ -31,8 +25,8 @@ public class SAPZYCommandzt extends KCommand { // String groupID = ""; try { groupID = SAPUtil.getGroupID(session); - } catch (TCException e1) { - // TODO Auto-generated catch block + } catch (Exception e1) { + // Auto-generated catch block e1.printStackTrace(); } String fa = ""; @@ -58,7 +52,7 @@ public class SAPZYCommandzt extends KCommand { // try { // new SAPZYGGOperation(app).executeOperation(); // } catch (Exception e) { -// // TODO Auto-generated catch block +// // Auto-generated catch block // e.printStackTrace(); // } //中压工厂 // } @@ -70,7 +64,7 @@ public class SAPZYCommandzt extends KCommand { this.setRunnable(new SAPGYDialog(app)); // new SAPGYGGOperation(app).executeOperation(); //高压工厂 } catch (Exception e) { - // TODO Auto-generated catch block + // Auto-generated catch block e.printStackTrace(); } } diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/commands/ZYApplyCodeCommandzt.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/commands/ZYApplyCodeCommandzt.java index 4f5c3b1..2697fc5 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/commands/ZYApplyCodeCommandzt.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/commands/ZYApplyCodeCommandzt.java @@ -2,8 +2,6 @@ package com.connor.chint.sap2.commands; import com.connor.chint.sap2.KCommand; import com.connor.chint.sap2.bean.ApplyMeBean; -import com.connor.chint.sap2.programm.KTApplyCodeDialog; -import com.connor.chint.sap2.sap_dycc.DYApplyCodeDialog; import com.connor.chint.sap2.sap_gy.GYApplyCodeDialogzt; import com.connor.chint.sap2.sap_zy.CcpApplyCodeDialog; import com.connor.chint.sap2.sap_zy.ZYApplyCodeDialogzt; diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/dy/createBOMDifference/CreateBOMDifferenceController.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/dy/createBOMDifference/CreateBOMDifferenceController.java index d7b8f21..1d0a938 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/dy/createBOMDifference/CreateBOMDifferenceController.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/dy/createBOMDifference/CreateBOMDifferenceController.java @@ -89,6 +89,7 @@ public class CreateBOMDifferenceController { if (part_child_new == null) { continue; } + System.out.println("line_child_new:" + line_child_new); bl_sequence_no = line_child_new.getProperty("bl_sequence_no"); if ("自制".equals(rev_child_new.getProperty("zt2_Source")) && !line_child_new.hasChildren()) { if (map_BOM_Materials.containsKey(part_child_new)) { @@ -130,6 +131,7 @@ public class CreateBOMDifferenceController { if (part_child_old == null) { continue; } + System.out.println("line_child_old:" + line_child_old); if ("自制".equals(rev_child_old.getProperty("zt2_Source")) && !line_child_old.hasChildren()) { if (map_BOM_Materials.containsKey(part_child_old)) { bean = map_BOM_Materials.get(part_child_old); @@ -162,7 +164,7 @@ public class CreateBOMDifferenceController { @Override public int compare(BOMCoutBean o1, BOMCoutBean o2) { - // TODO Auto-generated method stub + // Auto-generated method stub return o1.getIndex_num() - o2.getIndex_num(); } }); @@ -173,7 +175,7 @@ public class CreateBOMDifferenceController { String num_new, num_old; String zt2_MaterialNo; String object_desc; - System.out.println("原材料比较"); + System.out.println("原材料比较" + list_cout_beans.size()); for (int i = 0, len = list_cout_beans.size(); i < len; i++) { bean = list_cout_beans.get(i); System.out.println(i + ":" + bean); @@ -389,7 +391,7 @@ public class CreateBOMDifferenceController { @Override public int compare(BOMCoutBean o1, BOMCoutBean o2) { - // TODO Auto-generated method stub + // Auto-generated method stub return o1.getIndex_num() - o2.getIndex_num(); } }); diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/dy/createBOMDifference/CreateBOMDifferenceDialog.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/dy/createBOMDifference/CreateBOMDifferenceDialog.java index 9c1ba01..daced21 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/dy/createBOMDifference/CreateBOMDifferenceDialog.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/dy/createBOMDifference/CreateBOMDifferenceDialog.java @@ -220,13 +220,13 @@ public class CreateBOMDifferenceDialog extends AbstractAIFDialog { String groupID = group.getTCProperty("name").getStringValue(); System.out.println("groupID:" + groupID); String codeRemark = ""; - System.out.println("codeRemark:" + codeRemark); if (map_material.containsKey(groupID)) { codeRemark = map_material.get(groupID); icsId = SAPUtil.getIcsId(codeRemark, "材料标记", session); map_Materials = new HashMap<>(); } + System.out.println("codeRemark:" + codeRemark); initUI(); TCComponentBOMWindowType bomWinType; pb = new ProgressBar(new Dimension(250, 50)); @@ -238,6 +238,7 @@ public class CreateBOMDifferenceDialog extends AbstractAIFDialog { StringBuffer errBuff = new StringBuffer(); List childRevs = new ArrayList<>(); String type; + System.out.println("groupID:" + groupID + "=" + "M030".equals(groupID) + "=" + "M033".equals(groupID)); if ("M006".equals(groupID)) { KUtil.setByPass(true); CreateBOMDifference_GKController.getRevMap(session, oldComponents, newComponents, compares); @@ -250,9 +251,9 @@ public class CreateBOMDifferenceDialog extends AbstractAIFDialog { type = oldRev.getType(); if ("ZT2_Design3DRevision".equals(type) || "Part Revision".equals(type)) { TCComponentBOMWindow win = bomWinType.create(null); - win.lock(); +// win.lock(); TCComponentBOMWindow win2 = bomWinType.create(null); - win2.lock(); +// win2.lock(); List ccps = new ArrayList<>(); for (TCComponent newComponent : newComponents) { TCComponentItemRevision newRev = (TCComponentItemRevision) newComponent; @@ -499,7 +500,7 @@ public class CreateBOMDifferenceDialog extends AbstractAIFDialog { @Override public int compare(BOMCoutBean o1, BOMCoutBean o2) { - // TODO Auto-generated method stub + // Auto-generated method stub return o1.getIndex_num() - o2.getIndex_num(); } }); @@ -675,7 +676,7 @@ public class CreateBOMDifferenceDialog extends AbstractAIFDialog { @Override public boolean isCellEditable(int row, int column) { - // TODO Auto-generated method stub + // Auto-generated method stub if (column > 9) { return true; } @@ -699,7 +700,7 @@ public class CreateBOMDifferenceDialog extends AbstractAIFDialog { Collections.sort(list, new Comparator>() { @Override public int compare(Entry o1, Entry o2) { - // TODO Auto-generated method stub + // Auto-generated method stub return o1.getValue().compareTo(o2.getValue()); } @@ -766,7 +767,7 @@ public class CreateBOMDifferenceDialog extends AbstractAIFDialog { @Override public void actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub + // Auto-generated method stub disposeDialog(); } }); @@ -965,10 +966,10 @@ public class CreateBOMDifferenceDialog extends AbstractAIFDialog { } System.out.println("设置值:" + "zt2_property" + (i + 1) + ";" + Arrays.toString(values)); KUtil.setProperty(form, "zt2_property" + (i + 1), values); - form.unlock(); +// form.unlock(); } - tar.unlock(); +// tar.unlock(); return form; } diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/general/BatchReviewDialog.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/general/BatchReviewDialog.java index 1836621..68943b3 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/general/BatchReviewDialog.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/general/BatchReviewDialog.java @@ -34,10 +34,8 @@ import com.teamcenter.rac.aif.AbstractAIFDialog; 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.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; import com.teamcenter.rac.workflow.commands.newprocess.NewProcessDialog; @@ -49,13 +47,17 @@ import com.teamcenter.rac.workflow.commands.newprocess.NewProcessDialog; */ public class BatchReviewDialog extends AbstractAIFDialog { + /** + * + */ + private static final long serialVersionUID = 1L; private List targets; private List beans; private AbstractAIFApplication app; - private TCSession session; +// private TCSession session; protected ModelAudiTableModel tm_part; protected JTable t_part; - private CheckBoxTableHeaderRenderer tableHeaderRenderer; +// private CheckBoxTableHeaderRenderer tableHeaderRenderer; public final String[] HEADER = new String[] { "", "名 称", "图样代号\\物料编码", "流程状态" }; public final int[] HEADERWIDTH = new int[] { 50, 280, 180, 100 }; @@ -63,16 +65,16 @@ public class BatchReviewDialog extends AbstractAIFDialog { private JButton btn_audit; // 审核 private JButton btn_cel; // 取消 - private BatchReviewController controler; +// private BatchReviewController controler; private Timer timer = null; private TimerTask thread = null; public BatchReviewDialog(AbstractAIFApplication app) { - // TODO Auto-generated constructor stub + // Auto-generated constructor stub super(false); this.app = app; - this.session = (TCSession) app.getSession(); +// this.session = (TCSession) app.getSession(); } @Override @@ -85,7 +87,7 @@ public class BatchReviewDialog extends AbstractAIFDialog { @Override public void run() { - // TODO Auto-generated method stub + // Auto-generated method stub ProgressBar pb = new ProgressBar(BatchReviewDialog.this, new Dimension(250, 50)); try { @@ -130,7 +132,7 @@ public class BatchReviewDialog extends AbstractAIFDialog { @Override public int compare(BatchReviewBean o1, BatchReviewBean o2) { - // TODO Auto-generated method stub + // Auto-generated method stub return o1.getDrawNo().compareTo(o2.getDrawNo()); } @@ -144,11 +146,17 @@ public class BatchReviewDialog extends AbstractAIFDialog { // 获取未发布及未在流程中的对象 public boolean getTarget() throws Exception { - TCComponentFolder folder = (TCComponentFolder) app.getTargetComponent(); - AIFComponentContext[] childs = folder.getChildren(); +// TCComponentFolder folder = (TCComponentFolder) app.getTargetComponent(); +// AIFComponentContext[] childs = folder.getChildren(); + InterfaceAIFComponent[] folders = app.getTargetComponents(); + ArrayList childs = new ArrayList<>(); + for(InterfaceAIFComponent folder : folders) { + for(AIFComponentContext c : folder.getChildren()) { + childs.add(c); + } + } TCComponentItem item = null; TCComponentItemRevision rev = null; - TCComponent comp = null; targets = new ArrayList<>(64); beans = new ArrayList<>(64); boolean flag = false; @@ -156,23 +164,24 @@ public class BatchReviewDialog extends AbstractAIFDialog { String drawNo = ""; String isTCM = ""; String type = ""; - for (int i = 0, len = childs.length; i < len; i++) { - - type = childs[i].getComponent().getType(); - if (childs[i].getComponent().getType().equals("ZT2_ProjectItem")) { + for (AIFComponentContext c : childs) { + InterfaceAIFComponent child = c.getComponent(); + type = child.getType(); + if (child.getType().equals("ZT2_ProjectItem")) { continue; } flag = true; + TCComponent comp = null; if ("ZT2_Change".equals(type) || "ZT2_SCXXCDTZD".equals(type)) { - comp = (TCComponent) childs[i].getComponent(); + comp = (TCComponent) child; } else { - if (childs[i].getComponent() instanceof TCComponentItem) { - item = (TCComponentItem) childs[i].getComponent(); + if (child instanceof TCComponentItem) { + item = (TCComponentItem) child; rev = item.getLatestItemRevision(); // rev.isValid() comp = rev == null ? item : rev; - } else if (childs[i].getComponent() instanceof TCComponentItemRevision) { - rev = (TCComponentItemRevision) childs[i].getComponent(); + } else if (child instanceof TCComponentItemRevision) { + rev = (TCComponentItemRevision) child; comp = rev; } else { continue; @@ -203,12 +212,12 @@ public class BatchReviewDialog extends AbstractAIFDialog { @Override protected void processWindowEvent(WindowEvent e) { - // TODO Auto-generated method stub + // Auto-generated method stub if (e.getID() == WindowEvent.WINDOW_CLOSING) { try { stopTimerTask(); } catch (Exception e1) { - // TODO Auto-generated catch block + // Auto-generated catch block e1.printStackTrace(); } } @@ -247,7 +256,7 @@ public class BatchReviewDialog extends AbstractAIFDialog { } } catch (Exception e) { - // TODO Auto-generated catch block + // Auto-generated catch block e.printStackTrace(); } } @@ -322,12 +331,12 @@ public class BatchReviewDialog extends AbstractAIFDialog { } private void addListeners() { - // TODO Auto-generated method stub + // Auto-generated method stub btn_cel.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub + // Auto-generated method stub stopTimerTask(); disposeDialog(); } @@ -336,16 +345,16 @@ public class BatchReviewDialog extends AbstractAIFDialog { @Override public void actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub + // Auto-generated method stub SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - // TODO Auto-generated method stub + // Auto-generated method stub try { modelAudit(); } catch (Exception e1) { - // TODO: handle exception + // : handle exception e1.printStackTrace(); MessageBox.post("异常:" + e1.getMessage(), "", MessageBox.INFORMATION); } @@ -370,6 +379,11 @@ public class BatchReviewDialog extends AbstractAIFDialog { JPanel panel = new JPanel(new BorderLayout()); tm_part = new ModelAudiTableModel(); t_part = new JTable(tm_part) { + /** + * + */ + private static final long serialVersionUID = 1L; + @Override public Class getColumnClass(int column) { // 设置选择列（第三列）类型 if (column == 0) { @@ -390,8 +404,7 @@ public class BatchReviewDialog extends AbstractAIFDialog { colModel.getColumn(i).setPreferredWidth(HEADERWIDTH[i]); } - this.t_part.getTableHeader() - .setDefaultRenderer(this.tableHeaderRenderer = new CheckBoxTableHeaderRenderer(t_part, 0, false)); + this.t_part.getTableHeader().setDefaultRenderer(new CheckBoxTableHeaderRenderer(t_part, 0, false)); this.t_part.getTableHeader().setBackground(Color.WHITE); JScrollPane scroll = new JScrollPane(t_part); diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/material_query/SearchMaterialDialog.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/material_query/SearchMaterialDialog.java index 0009ad0..74a563a 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/material_query/SearchMaterialDialog.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/material_query/SearchMaterialDialog.java @@ -3,7 +3,6 @@ package com.connor.chint.sap2.material_query; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Dimension; -import java.awt.FlowLayout; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.GridLayout; @@ -14,7 +13,6 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; import java.util.Map; import javax.swing.BorderFactory; @@ -34,15 +32,12 @@ import javax.swing.SwingUtilities; import com.connor.chint.sap2.util.KUtil; 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.AbstractAIFDialog; import com.teamcenter.rac.common.lov.view.components.LOVDisplayer; import com.teamcenter.rac.commonclient.date.DateComponent; -import com.teamcenter.rac.kernel.TCAccessControlService; import com.teamcenter.rac.kernel.TCComponent; import com.teamcenter.rac.kernel.TCComponentGroup; -import com.teamcenter.rac.kernel.TCComponentUser; import com.teamcenter.rac.kernel.TCException; import com.teamcenter.rac.kernel.TCSession; import com.teamcenter.rac.util.HorizontalLayout; @@ -71,10 +66,11 @@ public class SearchMaterialDialog extends AbstractAIFDialog { protected JCheckBox isAllCompany; protected JCheckBox jcb_material; + protected JCheckBox showStop; private JButton b_query; // 库存查询 protected String groupNmae = ""; - private SearchDialog s_dialog = null; +// private SearchDialog s_dialog = null; private TCSession session; private int GoodsFullInfo_index = -1; @@ -153,7 +149,7 @@ public class SearchMaterialDialog extends AbstractAIFDialog { @Override public void actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub + // Auto-generated method stub try { getGroupID(session); controller.inventoryQuery(); @@ -167,7 +163,7 @@ public class SearchMaterialDialog extends AbstractAIFDialog { @Override public void actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub + // Auto-generated method stub SwingUtilities.invokeLater(new Runnable() { @Override public void run() { @@ -292,19 +288,19 @@ public class SearchMaterialDialog extends AbstractAIFDialog { @Override public void keyTyped(KeyEvent e) { - // TODO Auto-generated method stub + // Auto-generated method stub } @Override public void keyReleased(KeyEvent e) { - // TODO Auto-generated method stub + // Auto-generated method stub } @Override public void keyPressed(KeyEvent e) { - // TODO Auto-generated method stub + // Auto-generated method stub stopEd(); if (e.getKeyChar() == KeyEvent.VK_ENTER) // 按回车键执行相应操作; @@ -343,12 +339,12 @@ public class SearchMaterialDialog extends AbstractAIFDialog { @Override public void actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub + // Auto-generated method stub new Thread(new Runnable() { @Override public void run() { - // TODO Auto-generated method stub + // Auto-generated method stub try { stopEd(); controller.replace(); @@ -511,19 +507,19 @@ public class SearchMaterialDialog extends AbstractAIFDialog { @Override public void keyTyped(KeyEvent e) { - // TODO Auto-generated method stub + // Auto-generated method stub } @Override public void keyReleased(KeyEvent e) { - // TODO Auto-generated method stub + // Auto-generated method stub } @Override public void keyPressed(KeyEvent e) { - // TODO Auto-generated method stub + // Auto-generated method stub if (e.getKeyChar() == KeyEvent.VK_ENTER) // 按回车键执行相应操作; { b_search.doClick(); @@ -538,14 +534,14 @@ public class SearchMaterialDialog extends AbstractAIFDialog { private JPanel initBtnPanel() { // JPanel panel = new JPanel(new FlowLayout(FlowLayout.CENTER,5,7)); - JPanel panel = new JPanel(new GridLayout(2, 2, 5, 5)); + JPanel panel = new JPanel(new GridLayout(0, 2, 5, 5)); panel.setMinimumSize(new Dimension(300, 50)); this.b_search = new JButton("查询"); this.isTranslate = new JCheckBox("模糊查询"); isTranslate.setSelected(true); JPanel panel2 = new JPanel(); - BoxLayout layout = new BoxLayout(panel2, BoxLayout.Y_AXIS); + new BoxLayout(panel2, BoxLayout.Y_AXIS); panel2.add(isTranslate); this.isAllCompany = new JCheckBox("全工厂"); panel2.add(isAllCompany); @@ -555,10 +551,12 @@ public class SearchMaterialDialog extends AbstractAIFDialog { this.b_add = new JButton("添加"); b_add.setPreferredSize(new Dimension(80, 25)); jcb_material = new JCheckBox("一次性物料"); + showStop = new JCheckBox("停用"); panel.add(isAllCompany); panel.add(isTranslate); panel.add(jcb_material); + panel.add(showStop); panel.add(b_search); return panel; diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/material_query/SearchMaterialDialogController.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/material_query/SearchMaterialDialogController.java index 8a0d473..c5baba5 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/material_query/SearchMaterialDialogController.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/material_query/SearchMaterialDialogController.java @@ -5,7 +5,6 @@ import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.sql.ResultSet; -import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -21,7 +20,6 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableColumnModel; import com.connor.chint.sap2.bean.CHINTMaterialBean; -import com.connor.chint.sap2.bean.ProjectProductBean; import com.connor.chint.sap2.util.ConfirmDialogUtil; import com.connor.chint.sap2.util.HttpUtil; import com.connor.chint.sap2.util.KUtil; @@ -40,7 +38,6 @@ import com.teamcenter.rac.aif.kernel.InterfaceAIFComponent; import com.teamcenter.rac.aifrcp.AIFUtility; import com.teamcenter.rac.commands.open.OpenCommand; import com.teamcenter.rac.kernel.ListOfValuesInfo; -import com.teamcenter.rac.kernel.TCAccessControlService; import com.teamcenter.rac.kernel.TCComponent; import com.teamcenter.rac.kernel.TCComponentBOMLine; import com.teamcenter.rac.kernel.TCComponentContextList; @@ -65,7 +62,6 @@ import mes.xi.com.chintelectric.DT_INVENTORY_QUERY_REQ; import mes.xi.com.chintelectric.DT_INVENTORY_QUERY_REQBASEINFO; import mes.xi.com.chintelectric.DT_INVENTORY_QUERY_REQHEAD; import mes.xi.com.chintelectric.DT_INVENTORY_QUERY_RSP; -import mes.xi.com.chintelectric.DT_INVENTORY_QUERY_RSPRSP_BASEINFO; import mes.xi.com.chintelectric.DT_INVENTORY_QUERY_RSPZTABLE_RETURN; import mes.xi.com.chintelectric.SI_INVENTORY_QUERY_MES_OUT_SYN; import mes.xi.com.chintelectric.SI_INVENTORY_QUERY_MES_OUT_SYNService; @@ -73,6 +69,7 @@ import mes.xi.com.chintelectric.SI_INVENTORY_QUERY_MES_OUT_SYNServiceLocator; import net.sf.json.JSONArray; import net.sf.json.JSONObject; +@SuppressWarnings("deprecation") public class SearchMaterialDialogController { protected TCSession session; @@ -88,7 +85,7 @@ public class SearchMaterialDialogController { private static String itemProps[] = { "\"GoodsUnitCode\"" }; private static String itemPropsValue[] = { "zt2_unit" }; - private static String PSEID = "com.teamcenter.rac.pse.PSEPerspective"; +// private static String PSEID = "com.teamcenter.rac.pse.PSEPerspective"; protected List tableBeans = new ArrayList(); // 真实值-显示值 private Map key_values = new HashMap(100); @@ -134,8 +131,8 @@ public class SearchMaterialDialogController { if (unitLov != null) { ListOfValuesInfo listOfValues = unitLov.getListOfValues(); String[] realval = listOfValues.getStringListOfValues(); - String value = ""; - boolean flag = false; +// String value = ""; +// boolean flag = false; for (int i = 0; i < realval.length; i++) { String disval = listOfValues.getDisplayableValue(realval[i]); @@ -160,7 +157,7 @@ public class SearchMaterialDialogController { } } catch (Exception e) { - // TODO Auto-generated catch block + // Auto-generated catch block e.printStackTrace(); } } @@ -174,7 +171,7 @@ public class SearchMaterialDialogController { boolean isAllCompany = dialog.isAllCompany.isSelected(); boolean flag2 = dialog.jcb_material.isSelected(); tableBeans = tableBuilder.queryData(session, dialog.queryfields, flag, isAllCompany, dialog.groupNmae, - key_values, flag2); + key_values, flag2, dialog.showStop.isSelected()); tableBuilder.refreshData(tableBeans); } @@ -186,9 +183,9 @@ public class SearchMaterialDialogController { return; } - TCAccessControlService accessService = session.getTCAccessControlService(); - String[] grantedPrives = new String[] { "READ", "WRITE" }; - TCComponentUser user = session.getUser(); +// TCAccessControlService accessService = session.getTCAccessControlService(); +// String[] grantedPrives = new String[] { "READ", "WRITE" }; +// TCComponentUser user = session.getUser(); if (!(comp instanceof TCComponentBOMLine)) { KUtil.info(dialog, "请选中要添加子项的BOMLine"); @@ -308,7 +305,7 @@ public class SearchMaterialDialogController { StringBuffer errMess = new StringBuffer(); for (int i = 0; i < len; i++) { String zt2_MaterailNo = ""; - boolean flag = false; +// boolean flag = false; try { TableBean bean = tableBeans.get(cnt[i]); // System.out.println("单位:"+bean.getZt2_unit()); @@ -337,14 +334,14 @@ public class SearchMaterialDialogController { if (KUtil.isEmpty(puid)) { puid = rs.getString(1); } - flag = true; +// flag = true; } SqlUtil.free(); zt2_MaterailNo = String.valueOf(obj2); // System.out.println("item_id:"+item_id); Map fields = new HashMap(); fields.put("ID", item_id); - TCComponent comp = null; +// TCComponent comp = null; TCComponentContextList materials = KUtil.query(session, "chint_query_material", fields); Map revPros = new HashMap(); Map itemPros = new HashMap(); @@ -723,7 +720,7 @@ public class SearchMaterialDialogController { int index2 = -1; for (int i = 0, len = rows.length; i < len; i++) { if (index2 == -1) { - TableBean bean = tableBeans.get(rows[i]); +// TableBean bean = tableBeans.get(rows[i]); List querys = tableBuilder.queryLists; index2 = querys.indexOf("\"GoodsCode\""); } @@ -748,7 +745,7 @@ public class SearchMaterialDialogController { System.out.println("无返回信息"); return; } - DT_INVENTORY_QUERY_RSPRSP_BASEINFO baseInfo2 = resp.getRSP_BASEINFO(); +// DT_INVENTORY_QUERY_RSPRSP_BASEINFO baseInfo2 = resp.getRSP_BASEINFO(); DT_INVENTORY_QUERY_RSPZTABLE_RETURN[] zTables = resp.getZTABLE_RETURN(); if (zTables == null) return; @@ -790,7 +787,7 @@ public class SearchMaterialDialogController { String zt2_MaterialNo = ""; String desc = ""; String zt2_unit = ""; - String partNr = ""; +// String partNr = ""; List querys = tableBuilder.queryLists; int index_p = querys.indexOf("\"GoodsCode\""); if (index_p != -1) { @@ -843,20 +840,24 @@ public class SearchMaterialDialogController { private class AddBOMDialog extends AbstractAIFDialog { + /** + * + */ + private static final long serialVersionUID = 1L; public boolean isAdd = false; private JButton btn_add; private TCComponentBOMLine line; private List beans; public AddBOMDialog(SearchMaterialDialog parent, TCComponentBOMLine line, List beans) { - // TODO Auto-generated constructor stub + // Auto-generated constructor stub super(parent, true); this.line = line; this.beans = beans; initUI(); } - private List lists; +// private List lists; protected JTable t_table; protected DefaultTableModel tm_table; @@ -871,21 +872,22 @@ public class SearchMaterialDialogController { this.add(BorderLayout.CENTER, getTablePanel()); this.add(BorderLayout.SOUTH, getQuerySouth()); addListener(); - CHINTMaterialBean bean; +// CHINTMaterialBean bean; for (int i = 0, len = beans.size(); i < len; i++) { - bean = beans.get(i); - tm_table.addRow(beans.get(i).getRowData()); + CHINTMaterialBean bean = beans.get(i); + tm_table.addRow(bean.getRowData()); } new Thread(new Runnable() { @Override public void run() { - // TODO Auto-generated method stub + // Auto-generated method stub try { - new Thread().sleep(500); +// new Thread(); + Thread.sleep(500); KUtil.setTableEditting(0, 3, t_table); - } catch (InterruptedException e) { - // TODO Auto-generated catch block + } catch (Exception e) { + // Auto-generated catch block e.printStackTrace(); } @@ -900,12 +902,12 @@ public class SearchMaterialDialogController { @Override public void actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub + // Auto-generated method stub KUtil.stopTableEditing(t_table); int rowCount = t_table.getRowCount(); - int zt2_Quantity = 1; +// int zt2_Quantity = 1; boolean flag = false; - String qty = ""; +// String qty = ""; String dh = ""; try { String value; @@ -962,8 +964,8 @@ public class SearchMaterialDialogController { line.save(); line.unlock(); line.refresh(); - } catch (TCException e1) { - // TODO Auto-generated catch block + } catch (Exception e1) { + // Auto-generated catch block e1.printStackTrace(); } @@ -979,6 +981,11 @@ public class SearchMaterialDialogController { JPanel panel = new JPanel(new BorderLayout()); tm_table = new DefaultTableModel(); t_table = new JTable(tm_table) { + /** + * + */ + private static final long serialVersionUID = 1L; + @Override public boolean isCellEditable(int row, int column) { // 选择列（第三列）设置可编辑 if (column >= 3) { diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/operation/SelfMPartNoBatchOperation.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/operation/SelfMPartNoBatchOperation.java index c9d0ff2..45bd4df 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/operation/SelfMPartNoBatchOperation.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/operation/SelfMPartNoBatchOperation.java @@ -26,13 +26,10 @@ import com.connor.chint.sap2.util.ProgressBar; import com.connor.chint.sap2.util.SAPMessageUtil; import com.connor.chint.sap2.util.SAPUtil; import com.connor.chint.sap2.util.SqlUtil; -import com.connor.chint.sap2.util.TXTUtil; 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.InterfaceAIFComponent; import com.teamcenter.rac.kernel.ListOfValuesInfo; -import com.teamcenter.rac.kernel.ServiceData; import com.teamcenter.rac.kernel.TCComponent; import com.teamcenter.rac.kernel.TCComponentBOMLine; import com.teamcenter.rac.kernel.TCComponentBOMWindow; @@ -91,18 +88,18 @@ public class SelfMPartNoBatchOperation extends AbstractAIFOperation { private static String S_CODE = "220103001"; private List applyRevs = new ArrayList(); private List generalRevs = new ArrayList(); - private List s_Revs = new ArrayList(); +// private List s_Revs = new ArrayList(); private List gens = new ArrayList(); - private List revs = new ArrayList(50); - private List codes = new ArrayList(50); +// private List revs = new ArrayList(50); +// private List codes = new ArrayList(50); private List mess = new ArrayList(); private TCComponentUser dcproxy; private Map> general_maps = new HashMap>(); private Map> apply_maps = new HashMap>(); - private Map rev_objs = new HashMap(); +// private Map rev_objs = new HashMap(); // private String INSERT_SQL = "insert into infodba.CHINT_MATERIAL // values(?,?,?,?,?,?,?,?,?,?,?,?,to_date(?,'yyyyMMdd HH24:mi:ss'),?,?)"; public static String INSERT_SQL = "insert into chint_material(\"Code\",\"PUID\",\"PmpcCode\",\"GoodsCode\",\"GoodsName\",\"UnitCode\",\"CompanyCode\",\"BpNo\",\"Spec\",\"TeRe\",\"State\",\"User\",\"Time\",\"Condition\",\"Info\")" @@ -131,8 +128,8 @@ public class SelfMPartNoBatchOperation extends AbstractAIFOperation { try { itemType = (TCComponentItemType) this.session.getTypeComponent("Part"); groupID = SAPUtil.getGroupID(session); - } catch (TCException e) { - // TODO Auto-generated catch block + } catch (Exception e) { + // Auto-generated catch block e.printStackTrace(); } this.actionInfo = actionInfo; @@ -497,11 +494,11 @@ public class SelfMPartNoBatchOperation extends AbstractAIFOperation { System.out.println("===============开始创建物料==============="); System.out.println("共需要创建"+self_lists.size()+"个物料！"); - long time45 = System.nanoTime(); +// long time45 = System.nanoTime(); List itemList = new ArrayList(); // tzList.clear(); //批量创建和批量搭关系 - List cIList = new ArrayList(); + List cIList = new ArrayList<>(); for (int i = 0; i < self_lists.size(); i++) { int t = i+1; System.out.println("正在创建第"+t+"个物料！"); @@ -694,7 +691,7 @@ public class SelfMPartNoBatchOperation extends AbstractAIFOperation { // List tzList = new ArrayList(); public CreateIn createMaterialYH(SelfMPartBean bean, String companyCode, String zt2_Specifications, String code) throws TCException, ServiceException { - Object[] result = new Object[2]; +// Object[] result = new Object[2]; // TCComponentItem item = null; // 自动按照编码规则获取ID @@ -843,7 +840,7 @@ public class SelfMPartNoBatchOperation extends AbstractAIFOperation { try { bomWinType = (TCComponentBOMWindowType) session.getTypeComponent("BOMWindow"); TCComponentBOMWindow win = bomWinType.create(null); - win.lock(); +// win.lock(); win.setWindowTopLine(itemR.getItem(), itemR, null, null); TCComponentBOMLine componentbomline = win.getTopBOMLine(); return componentbomline; @@ -913,8 +910,8 @@ public class SelfMPartNoBatchOperation extends AbstractAIFOperation { String zt2_ProductModel = properties[4];//rev.getProperty("zt2_ProductModel"); String teRe = ""; String state = ""; // 申请时为空 - String wbs = ""; - String product = ""; +// String wbs = ""; +// String product = ""; String user = userID; String time = now; String condition = "审核中";// 默认审核中 @@ -1068,8 +1065,8 @@ public class SelfMPartNoBatchOperation extends AbstractAIFOperation { String zt2_ProductModel = properties[4];//rev.getProperty("zt2_ProductModel"); String teRe = ""; String state = ""; // 申请时为空 - String wbs = ""; - String product = ""; +// String wbs = ""; +// String product = ""; String user = userID; String time = now; String condition = "审核中";// 默认审核中 @@ -1364,7 +1361,7 @@ public class SelfMPartNoBatchOperation extends AbstractAIFOperation { // 获取单位 long time1 = System.nanoTime(); TCComponentUnitOfMeasureType uomType = (TCComponentUnitOfMeasureType) session.getTypeComponent("UnitOfMeasure"); - TCComponent[] uoms = uomType.extent(); + uomType.extent(); String object_name = tzRev.getProperty("object_name"); String uom = tzRev.getItem().getTCProperty("zt2_unit").getStringValue(); long time2 = System.nanoTime(); @@ -1478,7 +1475,7 @@ public class SelfMPartNoBatchOperation extends AbstractAIFOperation { System.out.println(item_id.substring(0, 8)); } - private List listBOM(TCComponentBOMLine bomlineObj) { + private List listBOM(TCComponentBOMLine bomlineObj) throws Exception { com.teamcenter.services.rac.cad._2007_01.StructureManagement structureService = com.teamcenter.services.rac.cad.StructureManagementService.getService(session); com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsInfo levelInfo = new com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsInfo(); com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsPref levelPref = new com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsPref(); @@ -1506,6 +1503,11 @@ public class SelfMPartNoBatchOperation extends AbstractAIFOperation { //获取所有的BOMLine对象 if(obj instanceof TCComponentBOMLine){ bomline = (TCComponentBOMLine) obj ; + if(groupID.equals("M046") && bomline.toString().equals(bomlineObj.toString())) { + //TODO M046组织下，图纸名称包含“总装”跳过-物料批量申请 + if(bomline.getProperty("bl_item_object_name").contains("总装")) + continue; + } bomlineList.add(bomline); } else if (obj instanceof TCComponentItemRevision){ diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap/SAPXBDialog.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap/SAPXBDialog.java index f9f4c63..6564a3c 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap/SAPXBDialog.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap/SAPXBDialog.java @@ -21,8 +21,6 @@ import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableColumnModel; -import com.connor.chint.sap2.sap_by.SAPZZDialog; -import com.connor.chint.sap2.sap_by.ZZPartBean; import com.connor.chint.sap2.util.CheckBoxTableHeaderRenderer; import com.connor.chint.sap2.util.ConfirmDialogUtil; import com.connor.chint.sap2.util.KUtil; @@ -55,6 +53,11 @@ import plm.xi.com.chintelectric.SI_PUSH_BOM_PLM_OUT_SYNServiceLocator; */ public class SAPXBDialog extends AbstractAIFDialog { + /** + * + */ + private static final long serialVersionUID = 1L; + private SAPXBController controller; protected DefaultTableModel tm_part; @@ -68,7 +71,7 @@ public class SAPXBDialog extends AbstractAIFDialog { "确认时间" }; public static final int[] HEADERWIDTH = new int[] { 50, 60, 60, 60, 300, 180, 180, 100, 100, 150 }; protected JButton pushBOM_btn; // BOM确认 - private CheckBoxTableHeaderRenderer tableHeaderRenderer; +// private CheckBoxTableHeaderRenderer tableHeaderRenderer; private JButton btn_SAP; private TCSession session; @@ -154,13 +157,13 @@ public class SAPXBDialog extends AbstractAIFDialog { String now = sdf.format(time); String user = session.getUser().getUserId(); String userName = session.getUserName(); - for (int i = 0; i < len; i++) { - bean = beans.get(i); - if ("已确认".equals(bean.getZt2_SapBomState())) { - MessageBox.post(SAPXBDialog.this, "BOM已确认,不能重复确认", "", 2); - return; - } - } +// for (int i = 0; i < len; i++) {//2024-03-29逻辑调整 确认不再限制次数 +// bean = beans.get(i); +// if ("已确认".equals(bean.getZt2_SapBomState())) { +// MessageBox.post(SAPXBDialog.this, "BOM已确认,不能重复确认", "", 2); +// return; +// } +// } if (new ConfirmDialogUtil(SAPXBDialog.this, "BOM确认", "此操作在BOM完整下发后确认一次,是否确认BOM？", new Dimension(500, 200)).getResult()) { @@ -271,6 +274,11 @@ public class SAPXBDialog extends AbstractAIFDialog { JPanel panel = new JPanel(new BorderLayout()); tm_part = new DefaultTableModel(); t_part = new JTable(tm_part) { + /** + * + */ + private static final long serialVersionUID = 1L; + @Override public boolean isCellEditable(int row, int column) { // 选择列（第三列）设置可编辑 if (column == 0) @@ -296,7 +304,7 @@ public class SAPXBDialog extends AbstractAIFDialog { colModel.getColumn(i).setPreferredWidth(HEADERWIDTH[i]); } this.t_part.getTableHeader() - .setDefaultRenderer(this.tableHeaderRenderer = new CheckBoxTableHeaderRenderer(t_part, 0, false)); + .setDefaultRenderer(new CheckBoxTableHeaderRenderer(t_part, 0, false)); this.t_part.getTableHeader().setBackground(Color.blue); JScrollPane scroll = new JScrollPane(t_part); panel.add(BorderLayout.CENTER, scroll); diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_dy/SAPDYCCDialog.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_dy/SAPDYCCDialog.java index a07ab51..530bf67 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_dy/SAPDYCCDialog.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_dy/SAPDYCCDialog.java @@ -79,16 +79,16 @@ public class SAPDYCCDialog extends AbstractAIFDialog { public static final String[] HEADER = new String[] { "", "序号", "站点", "柜号", "物料名称", "物料编码", "出厂编号", "BOM确认状态", "确认人", "确认时间" }; public static final int[] HEADERWIDTH = new int[] { 50, 60, 60, 60, 120, 180, 180, 100, 100, 100 }; - private CheckBoxTableHeaderRenderer tableHeaderRenderer; +// private CheckBoxTableHeaderRenderer tableHeaderRenderer; private TCSession session; - private AbstractAIFApplication app; +// private AbstractAIFApplication app; protected JButton pushBOM_btn; // BOM确认 public SAPDYCCDialog(AbstractAIFApplication app) { super(false); this.controller = new SAPDYCCDialogController(this, app); - this.app = app; +// this.app = app; this.session = (TCSession) app.getSession(); } @@ -196,13 +196,13 @@ public class SAPDYCCDialog extends AbstractAIFDialog { String now = sdf.format(time); String user = session.getUser().getUserId(); String userName = session.getUserName(); - for (int i = 0; i < len; i++) { - bean = beans.get(i); - if ("已确认".equals(bean.getZt2_SapBomState())) { - MessageBox.post(SAPDYCCDialog.this, "BOM已确认,不能重复确认", "", 2); - return; - } - } +// for (int i = 0; i < len; i++) {//2024-03-29逻辑调整 确认不再限制次数 +// bean = beans.get(i); +// if ("已确认".equals(bean.getZt2_SapBomState())) { +// MessageBox.post(SAPDYCCDialog.this, "BOM已确认,不能重复确认", "", 2); +// return; +// } +// } if (new ConfirmDialogUtil(SAPDYCCDialog.this, "BOM确认", "此操作在BOM完整下发后确认一次,是否确认BOM？", new Dimension(500, 200)).getResult()) { @@ -381,7 +381,7 @@ public class SAPDYCCDialog extends AbstractAIFDialog { colModel.getColumn(i).setPreferredWidth(HEADERWIDTH[i]); } this.t_part.getTableHeader() - .setDefaultRenderer(this.tableHeaderRenderer = new CheckBoxTableHeaderRenderer(t_part, 0, false)); + .setDefaultRenderer(new CheckBoxTableHeaderRenderer(t_part, 0, false)); this.t_part.getTableHeader().setBackground(Color.blue); JScrollPane scroll = new JScrollPane(t_part); panel.add(BorderLayout.CENTER, scroll); diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_gy/SAPGYDialog.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_gy/SAPGYDialog.java index e79bc4e..21d9a34 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_gy/SAPGYDialog.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_gy/SAPGYDialog.java @@ -6,13 +6,9 @@ import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.io.FileOutputStream; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Map; - import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JLabel; @@ -22,16 +18,8 @@ import javax.swing.JTable; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableColumnModel; -import org.apache.poi.xssf.usermodel.XSSFCell; -import org.apache.poi.xssf.usermodel.XSSFRow; -import org.apache.poi.xssf.usermodel.XSSFSheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; - import com.connor.chint.sap2.create_proc.CreateProcBean; import com.connor.chint.sap2.create_proc.CreateProcController; -import com.connor.chint.sap2.sap_zy.PartBean; -import com.connor.chint.sap2.sap_zy.SAPZYDialog; -import com.connor.chint.sap2.sap_zy.SAPZYDialogController; import com.connor.chint.sap2.util.CheckBoxTableHeaderRenderer; import com.connor.chint.sap2.util.ConfirmDialogUtil; import com.connor.chint.sap2.util.KUtil; @@ -39,17 +27,12 @@ import com.connor.chint.sap2.util.MyProgressBarCompent; import com.connor.chint.sap2.util.SAPUtil; import com.teamcenter.rac.aif.AbstractAIFApplication; import com.teamcenter.rac.aif.AbstractAIFDialog; -import com.teamcenter.rac.kernel.TCComponent; -import com.teamcenter.rac.kernel.TCComponentContextList; import com.teamcenter.rac.kernel.TCComponentItemRevision; -import com.teamcenter.rac.kernel.TCComponentUser; -import com.teamcenter.rac.kernel.TCProperty; import com.teamcenter.rac.kernel.TCSession; import com.teamcenter.rac.util.MessageBox; import net.sf.json.JSONArray; import net.sf.json.JSONObject; -import oracle.net.aso.w; import plm.xi.com.chintelectric.DT_JSON_REQ; import plm.xi.com.chintelectric.DT_JSON_REQBASEINFO; import plm.xi.com.chintelectric.DT_JSON_REQJSONINFO; @@ -60,6 +43,10 @@ import plm.xi.com.chintelectric.SI_PUSH_BOM_PLM_OUT_SYNServiceLocator; public class SAPGYDialog extends AbstractAIFDialog { + /** + * + */ + private static final long serialVersionUID = 1L; private SAPGYController controller; private JButton b_ok; protected DefaultTableModel tm_part; @@ -72,15 +59,15 @@ public class SAPGYDialog extends AbstractAIFDialog { public static final String[] HEADER = new String[] { "", "序号", "站点", "柜号", "物料名称", "物料编码", "出厂编号", "BOM确认状态", "确认人", "确认时间" }; public static final int[] HEADERWIDTH = new int[] { 50, 60, 60, 60, 120, 180, 180, 100, 100, 100 }; - private CheckBoxTableHeaderRenderer tableHeaderRenderer; +// private CheckBoxTableHeaderRenderer tableHeaderRenderer; private TCSession session; - private AbstractAIFApplication app; +// private AbstractAIFApplication app; protected JButton pushBOM_btn; // BOM确认 public SAPGYDialog(AbstractAIFApplication app) { super(false); this.controller = new SAPGYController(this, app); - this.app = app; +// this.app = app; this.session = (TCSession) app.getSession(); } @@ -172,13 +159,13 @@ public class SAPGYDialog extends AbstractAIFDialog { String now = sdf.format(time); String user = session.getUser().getUserId(); String userName = session.getUserName(); - for (int i = 0; i < len; i++) { - bean = beans.get(i); - if ("已确认".equals(bean.getZt2_SapBomState())) { - MessageBox.post(SAPGYDialog.this, "BOM已确认,不能重复确认", "", 2); - return; - } - } +// for (int i = 0; i < len; i++) {//2024-03-29逻辑调整 确认不再限制次数 +// bean = beans.get(i); +// if ("已确认".equals(bean.getZt2_SapBomState())) { +// MessageBox.post(SAPGYDialog.this, "BOM已确认,不能重复确认", "", 2); +// return; +// } +// } if (new ConfirmDialogUtil(SAPGYDialog.this, "BOM确认", "此操作在BOM完整下发后确认一次,是否确认BOM？", new Dimension(500, 200)).getResult()) { @@ -306,6 +293,11 @@ public class SAPGYDialog extends AbstractAIFDialog { JPanel panel = new JPanel(new BorderLayout()); tm_part = new DefaultTableModel(); t_part = new JTable(tm_part) { + /** + * + */ + private static final long serialVersionUID = 1L; + @Override public boolean isCellEditable(int row, int column) { // 选择列（第三列）设置可编辑 if (column == 0) @@ -331,7 +323,7 @@ public class SAPGYDialog extends AbstractAIFDialog { colModel.getColumn(i).setPreferredWidth(HEADERWIDTH[i]); } this.t_part.getTableHeader() - .setDefaultRenderer(this.tableHeaderRenderer = new CheckBoxTableHeaderRenderer(t_part, 0, false)); + .setDefaultRenderer(new CheckBoxTableHeaderRenderer(t_part, 0, false)); this.t_part.getTableHeader().setBackground(Color.blue); JScrollPane scroll = new JScrollPane(t_part); panel.add(BorderLayout.CENTER, scroll); diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_jyz/SAPJYZDialog.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_jyz/SAPJYZDialog.java index 400392f..91642d4 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_jyz/SAPJYZDialog.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_jyz/SAPJYZDialog.java @@ -22,7 +22,6 @@ import javax.swing.table.TableColumnModel; import com.connor.chint.sap2.create_proc.CreateProcBean; import com.connor.chint.sap2.create_proc.CreateProcController; import com.connor.chint.sap2.sap_zy.PartBean; -import com.connor.chint.sap2.sap_zy.SAPZYDialog; import com.connor.chint.sap2.util.CheckBoxTableHeaderRenderer; import com.connor.chint.sap2.util.ConfirmDialogUtil; import com.connor.chint.sap2.util.KUtil; @@ -45,6 +44,10 @@ import plm.xi.com.chintelectric.SI_PUSH_BOM_PLM_OUT_SYNService; import plm.xi.com.chintelectric.SI_PUSH_BOM_PLM_OUT_SYNServiceLocator; public class SAPJYZDialog extends AbstractAIFDialog { + /** + * + */ + private static final long serialVersionUID = 1L; private SAPJYZDialogController controller; private JButton b_ok; private JButton b_cel; @@ -59,14 +62,14 @@ public class SAPJYZDialog extends AbstractAIFDialog { public static final int[] HEADERWIDTH = new int[] { 50, 60, 60, 60, 120, 180, 100, 100, 100 }; protected JButton pushBOM_btn; // BOM确认 - private CheckBoxTableHeaderRenderer tableHeaderRenderer; +// private CheckBoxTableHeaderRenderer tableHeaderRenderer; private TCSession session; - private AbstractAIFApplication app; +// private AbstractAIFApplication app; public SAPJYZDialog(AbstractAIFApplication app) { super(false); this.controller = new SAPJYZDialogController(this, app); - this.app = app; +// this.app = app; this.session = (TCSession) app.getSession(); } @@ -160,13 +163,13 @@ public class SAPJYZDialog extends AbstractAIFDialog { String now = sdf.format(time); String user = session.getUser().getUserId(); String userName = session.getUserName(); - for (int i = 0; i < len; i++) { - bean = beans.get(i); - if ("已确认".equals(bean.getZt2_SapBomState())) { - MessageBox.post(SAPJYZDialog.this, "BOM已确认,不能重复确认", "", 2); - return; - } - } +// for (int i = 0; i < len; i++) {//2024-03-29逻辑调整 确认不再限制次数 +// bean = beans.get(i); +// if ("已确认".equals(bean.getZt2_SapBomState())) { +// MessageBox.post(SAPJYZDialog.this, "BOM已确认,不能重复确认", "", 2); +// return; +// } +// } if (new ConfirmDialogUtil(SAPJYZDialog.this, "BOM确认", "此操作在BOM完整下发后确认一次,是否确认BOM？", new Dimension(500, 200)).getResult()) { @@ -301,6 +304,11 @@ public class SAPJYZDialog extends AbstractAIFDialog { JPanel panel = new JPanel(new BorderLayout()); tm_part = new DefaultTableModel(); t_part = new JTable(tm_part) { + /** + * + */ + private static final long serialVersionUID = 1L; + @Override public boolean isCellEditable(int row, int column) { // 选择列（第三列）设置可编辑 if (column == 0) @@ -326,7 +334,7 @@ public class SAPJYZDialog extends AbstractAIFDialog { colModel.getColumn(i).setPreferredWidth(HEADERWIDTH[i]); } this.t_part.getTableHeader() - .setDefaultRenderer(this.tableHeaderRenderer = new CheckBoxTableHeaderRenderer(t_part, 0, false)); + .setDefaultRenderer(new CheckBoxTableHeaderRenderer(t_part, 0, false)); this.t_part.getTableHeader().setBackground(Color.blue); JScrollPane scroll = new JScrollPane(t_part); panel.add(BorderLayout.CENTER, scroll); diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/CcpApplyCodeController.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/CcpApplyCodeController.java index 158eebd..069bd4a 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/CcpApplyCodeController.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/CcpApplyCodeController.java @@ -10,8 +10,6 @@ import java.util.List; import java.util.Map; import java.util.Vector; -import javax.swing.table.DefaultTableModel; - import com.connor.chint.sap2.bean.ApplyCodeCcpBean; import com.connor.chint.sap2.bean.ApplyCodeFactoryBean; import com.connor.chint.sap2.util.KUtil; @@ -51,9 +49,9 @@ public class CcpApplyCodeController { protected Vector p_Applys = new Vector(); // 待申请 // protected String type = ""; protected String name = ""; - private String query_name = ""; +// private String query_name = ""; protected TCComponentFolder folder; - private static String QUERY_NAMES[] = { "%一次规范书%", "%二次规范书%", "%结构方案%" }; +// private static String QUERY_NAMES[] = { "%一次规范书%", "%二次规范书%", "%结构方案%" }; // private static String SQL_QUERY_ALL = "select t.CompanyCodeStr,t.GoodsCode,t.GoodsName,t.GoodsBpNo,t.GoodsFullInfo,t.GoodsTeRe,t.GoodsUnitCode,t.GoodsPmpcCode from ccemvw_cgd t where "; private static String SQL_QUERY_ALL = "select t.\"CompanyCodeStr\",t.\"GoodsCode\",t.\"GoodsName\",t.\"GoodsBpNo\"," @@ -69,12 +67,12 @@ public class CcpApplyCodeController { private List revs = new ArrayList(); private String txtPath; - private String txtName; +// private String txtName; Map getFolders; // private List code_factoryNos = new ArrayList<>(); public CcpApplyCodeController(CcpApplyCodeDialog dialog, AbstractAIFApplication app, String actionInfo,Map folders) { - // TODO Auto-generated constructor stub + // Auto-generated constructor stub this.app = app; this.dialog = dialog; this.session = (TCSession) app.getSession(); @@ -101,6 +99,7 @@ public class CcpApplyCodeController { // } } + @SuppressWarnings("deprecation") public void syn() throws Exception { TXTUtil.writeTXT(txtPath, "开始同步wbs号"); for (int i = 0; i < revs.size(); i++) { @@ -171,20 +170,20 @@ public class CcpApplyCodeController { return false; } - public boolean checkTargets(String nameLab, String code) throws Exception { +protected boolean checkTargets(String nameLab, String mtCode, String code) throws Exception { if(nameLab.contains("一次")) { type = FOLDER_NAME[0]; name = PART_NAME[0]; - query_name = QUERY_NAMES[0]; +// query_name = QUERY_NAMES[0]; }else if(nameLab.contains("二次")) { type = FOLDER_NAME[1]; name = PART_NAME[1]; - query_name = QUERY_NAMES[1]; +// query_name = QUERY_NAMES[1]; }else if(nameLab.contains("结构方案")) { type = FOLDER_NAME[2]; name = PART_NAME[2]; - query_name = QUERY_NAMES[2]; +// query_name = QUERY_NAMES[2]; } // String foldName = getFolders.get(nameLab); if(nameLab.contains("-")) { @@ -193,14 +192,17 @@ public class CcpApplyCodeController { name = split[1]; } } - System.out.println("query："); + h_Applys.clear(); Map field = new HashMap(); field.clear(); // String[] split = name.split("-"); - field.put("名称", name + "*"); + //查询时由搜索名称改成搜索物料号，后加*，前不需要加* + //field.put("名称", "*"+name + "*"); + field.put("materialno", mtCode + "*"); field.put("WBS号", wbsNo); + TCComponentContextList contexts = KUtil.query(session, "chint_query_material", field); if (contexts != null) { int size = contexts.getListCount(); @@ -418,6 +420,7 @@ public class CcpApplyCodeController { // // } + @SuppressWarnings("deprecation") public void applyPart(CodeBean bean) throws TCException { TCComponentItem item = null; @@ -450,7 +453,7 @@ public class CcpApplyCodeController { item.unlock(); bean.setRev(rev); TCComponentUser user = session.getUser(); - TCComponent target = (TCComponent) app.getTargetComponent(); +// TCComponent target = (TCComponent) app.getTargetComponent(); // if (folder == null) { @@ -463,6 +466,7 @@ public class CcpApplyCodeController { } // 新的方案编码申请 + @SuppressWarnings("deprecation") public void applyPart(CodeBean bean, List ccpIsUpdate, List codeBeans) throws TCException { @@ -503,7 +507,7 @@ public class CcpApplyCodeController { bean.folder.add("contents", item); } addChildToCcp(rev,bean); - TCComponent target = (TCComponent) app.getTargetComponent(); +// TCComponent target = (TCComponent) app.getTargetComponent(); List factosyNos = new ArrayList<>(); for (CodeBean codeBean : codeBeans) { @@ -528,6 +532,7 @@ public class CcpApplyCodeController { } + @SuppressWarnings("deprecation") public void addChildToCcp(TCComponentItemRevision rev,CodeBean bean) { try { // List selects = getSelectedParts(); @@ -548,7 +553,7 @@ public class CcpApplyCodeController { } } catch (Exception e) { - // TODO Auto-generated catch block + // Auto-generated catch block e.printStackTrace(); } } @@ -653,8 +658,8 @@ public class CcpApplyCodeController { } return zt2_MaterialNo.compareTo(zt2_MaterialNo2); - } catch (TCException e) { - // TODO Auto-generated catch block + } catch (Exception e) { + // Auto-generated catch block e.printStackTrace(); } diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/CcpApplyCodeDialog.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/CcpApplyCodeDialog.java index ef5e39e..ff9da7c 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/CcpApplyCodeDialog.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/CcpApplyCodeDialog.java @@ -51,9 +51,9 @@ public class CcpApplyCodeDialog extends AbstractAIFDialog { * */ private static final long serialVersionUID = 1L; - private AbstractAIFApplication app; +// private AbstractAIFApplication app; private CcpApplyCodeController controller; - private CheckBoxTableHeaderRenderer tableHeaderRenderer; +// private CheckBoxTableHeaderRenderer tableHeaderRenderer; private JButton addBtn; private JButton removeBtn; @@ -100,10 +100,10 @@ public class CcpApplyCodeDialog extends AbstractAIFDialog { protected List factoryNosIsAPPLY = new ArrayList(); private TCSession session; public CcpApplyCodeDialog(AbstractAIFApplication app, String actionInfo,ApplyMeBean bean) { - // TODO Auto-generated constructor stub + // Auto-generated constructor stub super(false); KUtil.setByPass(true); - this.app = app; +// this.app = app; this.session = (TCSession) app.getSession(); this.controller = new CcpApplyCodeController(this, app, actionInfo,bean.getFolders()); @@ -114,7 +114,7 @@ public class CcpApplyCodeDialog extends AbstractAIFDialog { @Override public void run() { - // TODO Auto-generated method stub + // Auto-generated method stub try { if (!controller.checkProject()) { MessageBox.post(this, "请选择项目文件夹对象", "", MessageBox.INFORMATION); @@ -151,57 +151,57 @@ public class CcpApplyCodeDialog extends AbstractAIFDialog { @Override public void itemStateChanged(ItemEvent e) { - // TODO Auto-generated method stub + // Auto-generated method stub if (e.getStateChange() == ItemEvent.SELECTED) { - new Thread(new Runnable() { + String val = (String) jcm_types.getSelectedItem(); - @Override - public void run() { - // TODO Auto-generated method stub - - String val = (String) jcm_types.getSelectedItem(); + try { + if (!controller.checkFolder(val)) { + MessageBox.post("请检查是否存在对应的方案文件夹", "", MessageBox.INFORMATION); + return; + } + } catch (Exception e1) { + // Auto-generated catch block + e1.printStackTrace(); + } + if (!KUtil.isEmpty(val)) { - try { - if (!controller.checkFolder(val)) { - MessageBox.post("请检查是否存在对应的方案文件夹", "", MessageBox.INFORMATION); - return; - } - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); + list_jl2.clear(); + list_jl4.clear(); + apply_lists.clear(); + model4.removeAllElements(); + String code = codes.get(val); + try { + System.out.println("checkTargets："); + controller.checkTargets(val, bean.getCodes().get(val), code); + System.out.println("apply_lists==>"+apply_lists); + for (int i = 0; i < apply_lists.size(); i++) { + model4.addElement(apply_lists.get(i)); } - if (!KUtil.isEmpty(val)) { - - list_jl2.clear(); - list_jl4.clear(); - apply_lists.clear(); - model4.removeAllElements(); - String code = codes.get(val); - try { - System.out.println("checkTargets："); - controller.checkTargets(val, code); - System.out.println("apply_lists==>"+apply_lists); - for (int i = 0; i < apply_lists.size(); i++) { - model4.addElement(apply_lists.get(i)); - } - model2.removeAllElements(); - for (int i = 0; i < controller.h_Applys.size(); i++) { - model2.addElement(controller.h_Applys.get(i)); - } - list_jl2.addAll(controller.h_Applys); - list_jl4.addAll(apply_lists); - } catch (Exception e1) { - // TODO Auto-generated catch block - MessageBox.post("获取方案编码时发生异常:" + e1.getMessage(), "", MessageBox.INFORMATION); - e1.printStackTrace(); - } + model2.removeAllElements(); + for (int i = 0; i < controller.h_Applys.size(); i++) { + model2.addElement(controller.h_Applys.get(i)); } -// jl1.setModel(model1); - jl2.setModel(model2); - jl3.setModel(model3); - jl4.setModel(model4); + list_jl2.addAll(controller.h_Applys); + list_jl4.addAll(apply_lists); + } catch (Exception e1) { + // Auto-generated catch block + MessageBox.post("获取方案编码时发生异常:" + e1.getMessage(), "", MessageBox.INFORMATION); + e1.printStackTrace(); } - }).start(); + } +// jl1.setModel(model1); +// jl2.setModel(model2); +// jl3.setModel(model3); +// jl4.setModel(model4); +// new Thread(new Runnable() { +// +// @Override +// public void run() { +// // Auto-generated method stub +// +// } +// }).start(); } } }); @@ -210,7 +210,7 @@ public class CcpApplyCodeDialog extends AbstractAIFDialog { @Override public void actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub + // Auto-generated method stub try { KUtil.setByPass(true); controller.syn(); @@ -318,7 +318,7 @@ public class CcpApplyCodeDialog extends AbstractAIFDialog { // // // } catch (Exception e1) { -// // TODO: handle exception +// // : handle exception // e1.printStackTrace(); // } // } @@ -421,8 +421,8 @@ public class CcpApplyCodeDialog extends AbstractAIFDialog { jl3.setModel(model3); } else { for (int j = 0; j < sels2.length; j++) { - CodeBean cloneBean = model3.get(sels2[j]); - CodeBean bean = value_keys.get(cloneBean); +// CodeBean cloneBean = model3.get(sels2[j]); +// CodeBean bean = value_keys.get(cloneBean); // if (selects.size() > 0) { // for (int i = 0; i < selects.size(); i++) { // ApplyCodeFactoryBean codeBean = selects.get(i); @@ -450,7 +450,7 @@ public class CcpApplyCodeDialog extends AbstractAIFDialog { } } catch (Exception e1) { - // TODO: handle exception + // : handle exception e1.printStackTrace(); } } @@ -460,12 +460,12 @@ public class CcpApplyCodeDialog extends AbstractAIFDialog { @Override public void actionPerformed(ActionEvent e) { int sels[] = jl3.getSelectedIndices(); - boolean flag = false; +// boolean flag = false; for (int i = sels.length - 1; i > -1; i--) { CodeBean cloneBean = model3.get(sels[i]); // 需要加入到可申请物料里的codeBean CodeBean bean = value_keys.get(cloneBean); - ApplyCodeFactoryBean applyCodeBean = cloneBean.getApplyCodeBean(); +// ApplyCodeFactoryBean applyCodeBean = cloneBean.getApplyCodeBean(); // if (applyCodeBean != null) { // factoryNosIsAPPLY.add(applyCodeBean); // flag = true; @@ -508,13 +508,13 @@ public class CcpApplyCodeDialog extends AbstractAIFDialog { @Override public void actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub + // Auto-generated method stub new Thread(new Runnable() { @Override public void run() { - // TODO Auto-generated method stub + // Auto-generated method stub MyProgressBarCompent my = null; try { if (model3.getSize() == 0) { @@ -566,7 +566,7 @@ public class CcpApplyCodeDialog extends AbstractAIFDialog { } catch (Exception e1) { KUtil.setByPass(false); my.setVisible(false); - // TODO Auto-generated catch block + // Auto-generated catch block e1.printStackTrace(); MessageBox.post("方案生成异常:" + e1.getMessage(), "", MessageBox.INFORMATION); } @@ -642,7 +642,7 @@ public class CcpApplyCodeDialog extends AbstractAIFDialog { // factoryNosIsAPPLY.removeAll(selects); } catch (Exception e1) { - // TODO Auto-generated catch block + // Auto-generated catch block e1.printStackTrace(); } @@ -663,7 +663,7 @@ public class CcpApplyCodeDialog extends AbstractAIFDialog { jl4.getSelectionModel().clearSelection(); if (e.getClickCount() == 2) { CodeBean cloneBean = model3.get(index); - ApplyCodeFactoryBean applyCodeBean = cloneBean.getApplyCodeBean(); +// ApplyCodeFactoryBean applyCodeBean = cloneBean.getApplyCodeBean(); // if (applyCodeBean != null) { // factoryNosIsAPPLY.add(applyCodeBean); //// controller.refreshTable(factoryNosIsAPPLY); @@ -877,7 +877,7 @@ public class CcpApplyCodeDialog extends AbstractAIFDialog { panel.add(BorderLayout.CENTER, scroll); panel.setBorder(BorderFactory.createLoweredBevelBorder()); this.t_part.getTableHeader() - .setDefaultRenderer(this.tableHeaderRenderer = new CheckBoxTableHeaderRenderer(t_part, 0, false)); + .setDefaultRenderer(new CheckBoxTableHeaderRenderer(t_part, 0, false)); this.t_part.getTableHeader().setBackground(Color.blue); return panel; } diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/SAPZYDialog.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/SAPZYDialog.java index fc0bd65..6f5da1a 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/SAPZYDialog.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/SAPZYDialog.java @@ -57,7 +57,7 @@ public class SAPZYDialog extends AbstractAIFDialog { // public static final int[] HEADERWIDTH = new int[] { 50, 60, 60,60,120, 180, // 180 }; - private CheckBoxTableHeaderRenderer tableHeaderRenderer; +// private CheckBoxTableHeaderRenderer tableHeaderRenderer; protected JButton o_btn; // 一次规范书 protected JButton t_btn; // 二次规范书 protected JButton kt_btn; // 壳体方案传递 @@ -66,7 +66,7 @@ public class SAPZYDialog extends AbstractAIFDialog { protected JButton pushBOM_btn; // BOM确认 private TCSession session; - private AbstractAIFApplication app; +// private AbstractAIFApplication app; // 是否检查产成品母号工艺路线 private boolean isCheckProduct = false; @@ -74,7 +74,7 @@ public class SAPZYDialog extends AbstractAIFDialog { public SAPZYDialog(AbstractAIFApplication app) { super(false); this.controller = new SAPZYDialogController(this, app); - this.app = app; +// this.app = app; this.session = (TCSession) app.getSession(); } @@ -176,13 +176,13 @@ public class SAPZYDialog extends AbstractAIFDialog { String now = sdf.format(time); String user = session.getUser().getUserId(); String userName = session.getUserName(); - for (int i = 0; i < len; i++) { - bean = beans.get(i); - if ("已确认".equals(bean.getZt2_SapBomState())) { - MessageBox.post(SAPZYDialog.this, "BOM已确认,不能重复确认", "", 2); - return; - } - } +// for (int i = 0; i < len; i++) {//2024-03-29逻辑调整 确认不再限制次数 +// bean = beans.get(i); +// if ("已确认".equals(bean.getZt2_SapBomState())) { +// MessageBox.post(SAPZYDialog.this, "BOM已确认,不能重复确认", "", 2); +// return; +// } +// } if (new ConfirmDialogUtil(SAPZYDialog.this, "BOM确认", "此操作在BOM完整下发后确认一次,是否确认BOM？", new Dimension(500, 200)).getResult()) { @@ -409,7 +409,7 @@ public class SAPZYDialog extends AbstractAIFDialog { colModel.getColumn(i).setPreferredWidth(HEADERWIDTH[i]); } this.t_part.getTableHeader() - .setDefaultRenderer(this.tableHeaderRenderer = new CheckBoxTableHeaderRenderer(t_part, 0, false)); + .setDefaultRenderer(new CheckBoxTableHeaderRenderer(t_part, 0, false)); this.t_part.getTableHeader().setBackground(Color.blue); JScrollPane scroll = new JScrollPane(t_part); panel.add(BorderLayout.CENTER, scroll); diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/SAPZYDialogControllerzt.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/SAPZYDialogControllerzt.java index 20a9ccd..f3b0daa 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/SAPZYDialogControllerzt.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/SAPZYDialogControllerzt.java @@ -1,7 +1,6 @@ package com.connor.chint.sap2.sap_zy; import java.io.IOException; -import java.math.BigDecimal; import java.rmi.RemoteException; import java.sql.ResultSet; import java.sql.SQLException; @@ -20,35 +19,22 @@ import java.util.Set; import javax.xml.rpc.ServiceException; -import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.chint.plm.common.pojo.EasyResponse; import com.chint.plm.common.service.BomPasscontrolService; import com.chint.plm.common.util.ArrayUtils; import com.chint.plm.common.util.CollectionUtils; -import com.chint.plm.common.util.StringUtils; import com.connor.chint.sap2.sap.SAPPushBOMBean; -import com.connor.chint.sap2.sap_by.SAPZZDialogController; import com.connor.chint.sap2.sap_by.SAPZZNewOp; -import com.connor.chint.sap2.sap_by.SAPZZOperation; -import com.connor.chint.sap2.sap_by.ZZPartBean; -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.POIUtil; -import com.connor.chint.sap2.util.PartSqlUtil; import com.connor.chint.sap2.util.SAPMessageUtil; import com.connor.chint.sap2.util.SAPUtil; import com.connor.chint.sap2.util.SqlUtil; -import com.connor.chint.sap2.util.SqlUtil2; import com.connor.chint.sap2.util.TXTUtil; -import com.squareup.okhttp.MediaType; -import com.squareup.okhttp.OkHttpClient; -import com.squareup.okhttp.Request; -import com.squareup.okhttp.RequestBody; -import com.squareup.okhttp.Response; import com.teamcenter.rac.aif.AbstractAIFApplication; import com.teamcenter.rac.aif.kernel.AIFComponentContext; import com.teamcenter.rac.aif.kernel.InterfaceAIFComponent; @@ -73,8 +59,6 @@ import com.teamcenter.rac.kernel.TCPreferenceService; import com.teamcenter.rac.kernel.TCSession; import com.teamcenter.rac.kernel.TCUserService; import com.teamcenter.rac.util.MessageBox; -//import com.teamcenter.schemas.cad._2007_01.structuremanagement.ExpandPSData; -import com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsOutput; import com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSData; import nc.itf.chintwebservices.msg.ISendMsgServices.ISendMsgServices; import nc.itf.chintwebservices.msg.ISendMsgServices.ISendMsgServicesLocator; @@ -111,6 +95,7 @@ import plm.xi.com.chintelectric.SI_PROCESSROUTE_PLM_OUT_SYNServiceLocator; * PLM 到ERP 工艺路线接口程序开发/SI_PROCESSROUTE_PLM_OUT_SYN * PLM 到ERP BOM接口程序开发/SI_BOM_PLM_OUT_SYN */ +@SuppressWarnings("deprecation") public class SAPZYDialogControllerzt { public SAPZYDialogzt dialog; @@ -195,7 +180,7 @@ public class SAPZYDialogControllerzt { try { itemType = (TCComponentItemType) session.getTypeService().getTypeComponent("Item"); } catch (TCException e) { - // TODO Auto-generated catch block + // Auto-generated catch block e.printStackTrace(); } getMessageUsers(); @@ -594,8 +579,8 @@ public class SAPZYDialogControllerzt { if (isCheckProduct) { StringBuilder sBuilder = new StringBuilder(); TCComponentItemRevision ccp; - String zt2_MaterialNo; - TCComponentContextList res2; +// String zt2_MaterialNo; +// TCComponentContextList res2; AIFComponentContext[] meops; TCComponent meopRev; StringBuilder noneBuilder = new StringBuilder(); @@ -603,7 +588,7 @@ public class SAPZYDialogControllerzt { for (Entry> entry : cPart_schemes.entrySet()) { ccp = entry.getKey(); - zt2_MaterialNo = ccp.getProperty("zt2_MaterialNo"); +// zt2_MaterialNo = ccp.getProperty("zt2_MaterialNo"); meopRev = null; meopRev = ccp; meops = meopRev.whereReferencedByTypeRelation(new String[] { "MEProcessRevision" }, @@ -611,7 +596,7 @@ public class SAPZYDialogControllerzt { if (meops == null || meops.length == 0) { noneBuilder.append("\n ").append(ccp); } else if (meops.length > 1) { - numsBuilder.append("\n ").append(ccp); + //numsBuilder.append("\n ").append(ccp); } } @@ -897,9 +882,9 @@ public class SAPZYDialogControllerzt { new SAPMessageUtil(dialog, "", "BOM传递发生异常:\n" + endBuff.toString() + "\n" + errMess.toString()); } else { String txtPath = TXTUtil.createTxt("中压BOM传递AM推送记录"); - String xmmc = ""; - String wbs = ""; - String projectNo = ""; +// String xmmc = ""; +// String wbs = ""; +// String projectNo = ""; TCComponent released_comp = null; if (ban.equals("一次")) { released_comp = released_Red; @@ -920,9 +905,9 @@ public class SAPZYDialogControllerzt { project.add("release_status_list", released_comp); } if (project != null && !(groupID.equals("M041")||groupID.equals("M046"))) { - xmmc = project.getProperty("object_name"); +// xmmc = project.getProperty("object_name"); wbs = project.getProperty("zt2_WBSNo"); - projectNo = project.getProperty("zt2_ProjectNo"); +// projectNo = project.getProperty("zt2_ProjectNo"); project.lock(); project.setProperty("zt2_ProjectPhase", ban + "完成"); project.save(); @@ -1015,7 +1000,7 @@ public class SAPZYDialogControllerzt { if (ccp.getType().equals("Part Revision") && ccp.getProperty("zt2_BOMScheme").equals("汇总")) { int quantity = POIUtil.getIntValue(ccp.getProperty("zt2_Quantity")); quantity = quantity == 0 ? 1 : quantity; - int size = list.size(); +// int size = list.size(); head.setBMENG(quantity + ""); // 母线槽制造部特殊处理部分 if ("M041".equals(groupID)) { @@ -1109,7 +1094,7 @@ public class SAPZYDialogControllerzt { String ktSortno = SAPUtil.getFirstSORTFNo(session, (TCComponentItemRevision) mpComp); System.out.println("壳体:" + ktSortno); for (int i = 0; i < schemes.size(); i++) { - boolean isSturct = false; +// boolean isSturct = false; TCComponentItemRevision rev2 = schemes.get(i); String zt2_MaterialNo2 = rev2.getProperty("zt2_MaterialNo"); DT_BOM_PLM_REQLISTITEMSITEM item = new DT_BOM_PLM_REQLISTITEMSITEM(); @@ -1125,7 +1110,7 @@ public class SAPZYDialogControllerzt { bl_seq_no = "0020"; } else if (cName.indexOf(SAPZYDialogControllerzt.BOM_NAMES[2]) != -1) { bl_seq_no = "0030"; - isSturct = true; +// isSturct = true; } else if (cName.indexOf("壳体") != -1) { bl_seq_no = "0030"; item.setSORTF(ktSortno); @@ -1175,7 +1160,7 @@ public class SAPZYDialogControllerzt { else isSends.add(rev2); - boolean isExist = false; +// boolean isExist = false; // sapRevs.add(rev2); // if (!sapLists.contains(rev2)) @@ -1252,9 +1237,9 @@ public class SAPZYDialogControllerzt { if (revs == null) return; StringBuffer sb = new StringBuffer(); - Set sets = new HashSet<>(); +// Set sets = new HashSet<>(); Set set_meops = new HashSet<>(); - String bmeng = "1"; +// String bmeng = "1"; System.out.println("ccp:" + ccp); String zt2_MaterialNo; for (TCComponentItemRevision rev : revs) { @@ -1325,7 +1310,7 @@ public class SAPZYDialogControllerzt { String txtPath = TXTUtil.createTxt(txtName); System.out.println("日志:" + txtPath); List bomISExist = new ArrayList(); - bmeng = SAPUtil.getSAPBMENG(rev); + SAPUtil.getSAPBMENG(rev); SAPUtil.recurZYZZSAP(componentbomline, rev, null, isStruct, session, 1, groupName, now, txtPath, list, proclist, process_jg, errMess, gy_meops, needTCM_meops, bomISExist, codeMark, icsId, by_materiasls, material_revs, set_meops); @@ -1454,10 +1439,10 @@ public class SAPZYDialogControllerzt { TXTUtil.writeTXT(logPath, "返回信息:" + mess2); System.out.println("返回信息:" + mess2); } catch (ServiceException e) { - // TODO Auto-generated catch block + // Auto-generated catch block e.printStackTrace(); } catch (RemoteException e) { - // TODO Auto-generated catch block + // Auto-generated catch block e.printStackTrace(); } TXTUtil.writeTXT(logPath, "AM消息推送结束"); @@ -1649,8 +1634,8 @@ public class SAPZYDialogControllerzt { meops = meopRev.whereReferencedByTypeRelation(new String[] { "MEProcessRevision" }, new String[] { "IMAN_METarget" }); if (meops != null && meops.length == 1) { - mpComp = (TCComponent) meops[0].getComponent(); - SAPUtil.readBopInfo1((TCComponentMEProcessRevision) meops[0].getComponent(), cPart, + mpComp = SAPUtil.getSameGroupProc(meops, session); + SAPUtil.readBopInfo1((TCComponentMEProcessRevision) mpComp, cPart, session, now, txtPath, proclist, groupName, gy_meops, needTCM_meops, false); } } else { @@ -1669,14 +1654,14 @@ public class SAPZYDialogControllerzt { new String[] { "IMAN_METarget" }); if (meops != null && meops.length == 1) { - mpComp = (TCComponent) meops[0].getComponent(); - SAPUtil.readBopInfo1((TCComponentMEProcessRevision) meops[0].getComponent(), cPart, + mpComp = SAPUtil.getSameGroupProc(meops, session); + SAPUtil.readBopInfo1((TCComponentMEProcessRevision) mpComp, cPart, session, now, txtPath, proclist, groupName, gy_meops, needTCM_meops, false); } } } else { - mpComp = (TCComponent) meops[0].getComponent(); - SAPUtil.readBopInfo1((TCComponentMEProcessRevision) meops[0].getComponent(), cPart, session, + mpComp = SAPUtil.getSameGroupProc(meops, session); + SAPUtil.readBopInfo1((TCComponentMEProcessRevision) mpComp, cPart, session, now, txtPath, proclist, groupName, gy_meops, needTCM_meops, true); } } @@ -1687,7 +1672,7 @@ public class SAPZYDialogControllerzt { try { return o1.getProperty("zt2_MaterialNo").compareTo(o2.getProperty("zt2_MaterialNo")); } catch (TCException e) { - // TODO Auto-generated catch block + // Auto-generated catch block e.printStackTrace(); } return 0; @@ -1702,7 +1687,7 @@ public class SAPZYDialogControllerzt { if (cPart.getType().equals("Part Revision") && cPart.getProperty("zt2_BOMScheme").equals("汇总")) { int quantity = POIUtil.getIntValue(cPart.getProperty("zt2_Quantity")); quantity = quantity == 0 ? 1 : quantity; - int size = list.size(); +// int size = list.size(); head.setBMENG(quantity + ""); // 母线槽制造部特殊处理部分 if ("M041".equals(groupID)) { @@ -1733,8 +1718,8 @@ public class SAPZYDialogControllerzt { new String[] { "MEProcessRevision" }, new String[] { "IMAN_METarget" }); String sortno = ""; if (meops != null && meops.length > 0) { - TCComponent temp = SAPUtil.getNewBOMLine((TCComponentItemRevision) meops[0].getComponent(), - session); + mpComp = SAPUtil.getSameGroupProc(meops, session); + TCComponent temp = SAPUtil.getNewBOMLine((TCComponentItemRevision) mpComp, session); AIFComponentContext[] contexts3 = temp.getChildren(); for (int k = 0; k < contexts3.length; k++) { if (contexts3[k].getComponent().getProperty("bl_rev_object_name").contains("二次元件装配")) { @@ -1865,11 +1850,11 @@ public class SAPZYDialogControllerzt { @Override public int compare(TCComponentItemRevision o1, TCComponentItemRevision o2) { - // TODO Auto-generated method stub + // Auto-generated method stub try { return o1.getProperty("object_string").compareTo(o2.getProperty("object_string")); } catch (TCException e) { - // TODO Auto-generated catch block + // Auto-generated catch block e.printStackTrace(); } return 0; @@ -1886,11 +1871,11 @@ public class SAPZYDialogControllerzt { @Override public int compare(TCComponentItemRevision o1, TCComponentItemRevision o2) { - // TODO Auto-generated method stub + // Auto-generated method stub try { return o1.getProperty("object_string").compareTo(o2.getProperty("object_string")); } catch (TCException e) { - // TODO Auto-generated catch block + // Auto-generated catch block e.printStackTrace(); } return 0; @@ -1910,10 +1895,10 @@ public class SAPZYDialogControllerzt { "BOM传递发生异常:\n" + endBuff.toString() + "\n" + errMess.toString() + "\n,ERROR:" + errMess.toString()); } else { - String txtPath = TXTUtil.createTxt("中压BOM传递AM推送记录"); - String xmmc = ""; - String wbs = ""; - String projectNo = ""; + TXTUtil.createTxt("中压BOM传递AM推送记录"); +// String xmmc = ""; +// String wbs = ""; +// String projectNo = ""; TCComponent released_comp = released_Green; if (released_comp != null) { @@ -1946,7 +1931,7 @@ public class SAPZYDialogControllerzt { public int getCode() throws SQLException { String sql = "select Tab_SendBom_Sequence.nextval as sid from dual"; ResultSet rs = SqlUtil.read(sql); - Object objs[] = new Object[1]; +// Object objs[] = new Object[1]; int code = 0; if (rs.next()) { code = rs.getInt(1); @@ -2134,6 +2119,7 @@ public class SAPZYDialogControllerzt { // my.setVisible(false); // } } + /* private void sendSapYH(String ban, MyProgressBarCompent my, boolean isCheckProduct) throws Exception { process_boms.clear(); // process_jg.clear(); @@ -2316,7 +2302,7 @@ public class SAPZYDialogControllerzt { List proclist = new ArrayList(); List isSends = new ArrayList(); - StringBuffer errMess = new StringBuffer(); +// StringBuffer errMess = new StringBuffer(); // StringBuffer userIDs = new StringBuffer(); my.setShowLabel("正在向SAP传递BOM、工艺信息。。。。。。"); @@ -2349,7 +2335,7 @@ public class SAPZYDialogControllerzt { // sapLists.clear(); //读BOM信息 产成品 电气BOM BOM信息 工艺信息 是否传递 readBomInfoYH(ccp, schemes, list, proclist, isSends, txtPath); - List matnrs = null; +// List matnrs = null; TXTUtil.writeTXT(txtPath, "-------------BOM数据传递开始--------"); System.out.println("-------------BOM数据传递开始----------"); StringBuffer errMessage = new StringBuffer(); @@ -2357,9 +2343,9 @@ public class SAPZYDialogControllerzt { try { TXTUtil.writeTXT(txtPath, "BOM数据传递开始"); SI_BOM_PLM_OUT_SYNService service = new SI_BOM_PLM_OUT_SYNServiceLocator(); - SI_BOM_PLM_OUT_SYN stub = service.getHTTP_Port(); + service.getHTTP_Port(); String REQ_TRACE_ID = "123456"; - DT_BOM_PLM_REQBASEINFO baseInfo = new DT_BOM_PLM_REQBASEINFO(REQ_TRACE_ID); + new DT_BOM_PLM_REQBASEINFO(REQ_TRACE_ID); for (DT_BOM_PLM_REQLIST l : list) { System.out.println(l); TXTUtil.writeTXT(txtPath, l.toString()); @@ -2390,10 +2376,10 @@ public class SAPZYDialogControllerzt { if (proclist.size() > 0) { try { SI_PROCESSROUTE_PLM_OUT_SYNService service = new SI_PROCESSROUTE_PLM_OUT_SYNServiceLocator(); - SI_PROCESSROUTE_PLM_OUT_SYN stub = service.getHTTP_Port(); + service.getHTTP_Port(); String REQ_TRACE_ID = "123456"; - DT_PROCESSROUTE_S4_REQBASEINFO baseInfo = new DT_PROCESSROUTE_S4_REQBASEINFO(REQ_TRACE_ID); + new DT_PROCESSROUTE_S4_REQBASEINFO(REQ_TRACE_ID); DT_PROCESSROUTE_S4_REQLIST[] request = proclist.toArray(new DT_PROCESSROUTE_S4_REQLIST[] {}); for (DT_PROCESSROUTE_S4_REQLIST r : request) { System.out.println(r); @@ -2576,7 +2562,7 @@ public class SAPZYDialogControllerzt { TCComponentItemRevision ccp) { if (revs == null) return; - StringBuffer sb = new StringBuffer(); +// StringBuffer sb = new StringBuffer(); // Set sets = new HashSet<>(); Set set_meops = new HashSet<>(); // String bmeng = "1"; @@ -2678,7 +2664,7 @@ public class SAPZYDialogControllerzt { }finally { SqlUtil.freeAll(); } - } + }*/ // 中压传递 public void recurZYZZSAPYH(TCComponentBOMLine line, TCComponentItemRevision rev, TCComponentItem part, boolean isStruct, TCSession session, int level, String groupName, String now, String txtPath, @@ -2716,7 +2702,7 @@ public class SAPZYDialogControllerzt { } else { if (meops.length > 0 && partRev != null) { - TCComponent mpComp = (TCComponent) meops[0].getComponent(); + TCComponent mpComp = SAPUtil.getSameGroupProc(meops, session); if (!KUtil.isTCM(mpComp)) { set_meops.add(mpComp); } @@ -2821,6 +2807,7 @@ public class SAPZYDialogControllerzt { } list.add(new DT_BOM_PLM_REQLIST(head, items)); } + /* private void readBomInfoYH(TCComponentItemRevision ccp, List schemes, List list, List proclist, List isSends, String txtPath) throws Exception { @@ -3050,7 +3037,7 @@ public class SAPZYDialogControllerzt { SqlUtil.free(); } return wlflmMap; - } + }*/ public static String getFLMDb2(String zt2_MaterialNo2, TCSession session,String groupName) { String mes = zt2_MaterialNo2.split("-")[0]; String sortno = ""; diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/SAPZYDialogzt.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/SAPZYDialogzt.java index bda1ea2..acf98fb 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/SAPZYDialogzt.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/SAPZYDialogzt.java @@ -7,7 +7,6 @@ import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -22,7 +21,6 @@ import javax.swing.table.TableColumnModel; import com.connor.chint.sap2.create_proc.CreateProcBean; import com.connor.chint.sap2.create_proc.CreateProcController; -import com.connor.chint.sap2.sap_by.SAPZZNewOp; import com.connor.chint.sap2.util.CheckBoxTableHeaderRenderer; import com.connor.chint.sap2.util.ChintPreferenceUtil; import com.connor.chint.sap2.util.ConfirmDialogUtil; @@ -32,7 +30,6 @@ import com.connor.chint.sap2.util.SAPMessageUtil; import com.connor.chint.sap2.util.SAPUtil; import com.teamcenter.rac.aif.AbstractAIFApplication; import com.teamcenter.rac.aif.AbstractAIFDialog; -import com.teamcenter.rac.kernel.TCComponent; import com.teamcenter.rac.kernel.TCComponentItemRevision; import com.teamcenter.rac.kernel.TCSession; import com.teamcenter.rac.util.MessageBox; @@ -66,7 +63,7 @@ public class SAPZYDialogzt extends AbstractAIFDialog { // public static final int[] HEADERWIDTH = new int[] { 50, 60, 60,60,120, 180, // 180 }; - private CheckBoxTableHeaderRenderer tableHeaderRenderer; +// private CheckBoxTableHeaderRenderer tableHeaderRenderer; // protected JButton o_btn; // 一次规范书 // protected JButton t_btn; // 二次规范书 // protected JButton kt_btn; // 壳体方案传递 @@ -285,7 +282,7 @@ public class SAPZYDialogzt extends AbstractAIFDialog { try { controller.sendToSapYH(selectedItem.replaceAll("方案传递", ""), isCheckProduct); } catch (Exception e) { - // TODO Auto-generated catch block + // Auto-generated catch block e.printStackTrace(); } } @@ -303,7 +300,7 @@ public class SAPZYDialogzt extends AbstractAIFDialog { try { controller.sendToSapYHAsyn(selectedItem.replaceAll("方案传递", ""), isCheckProduct); } catch (Exception e) { - // TODO Auto-generated catch block + // Auto-generated catch block e.printStackTrace(); } } @@ -328,7 +325,7 @@ public class SAPZYDialogzt extends AbstractAIFDialog { try { controller.sendToSapBy("C"); } catch (Exception e) { - // TODO Auto-generated catch block + // Auto-generated catch block e.printStackTrace(); } @@ -389,7 +386,7 @@ public class SAPZYDialogzt extends AbstractAIFDialog { List selectedParts = controller.getSelectedParts(); new SAPZYGG2Operation(app, selectedParts, controller.project).executeOperation(); } catch (Exception e) { - // TODO Auto-generated catch block + // Auto-generated catch block e.printStackTrace(); } @@ -407,7 +404,7 @@ public class SAPZYDialogzt extends AbstractAIFDialog { MessageBox.post("传递结束", "", MessageBox.INFORMATION); } } catch (Exception e) { - // TODO Auto-generated catch block + // Auto-generated catch block e.printStackTrace(); } @@ -421,7 +418,7 @@ public class SAPZYDialogzt extends AbstractAIFDialog { // try { // controller.sendToSapYH(selectedItem.replaceAll("方案传递", ""), isCheckProduct); // } catch (Exception e) { -// // TODO Auto-generated catch block +// // Auto-generated catch block // e.printStackTrace(); // } // } @@ -429,7 +426,7 @@ public class SAPZYDialogzt extends AbstractAIFDialog { controller.sendToSap(selectedItem.replaceAll("方案传递", ""), isCheckProduct, "B"); } } catch (Exception e) { - // TODO Auto-generated catch block + // Auto-generated catch block e.printStackTrace(); } } else if (fa.equals("F")) { @@ -437,7 +434,7 @@ public class SAPZYDialogzt extends AbstractAIFDialog { try { controller.sendToSapYH(selectedItem.replaceAll("方案传递", ""), isCheckProduct); } catch (Exception e) { - // TODO Auto-generated catch block + // Auto-generated catch block e.printStackTrace(); } } else { @@ -640,7 +637,7 @@ public class SAPZYDialogzt extends AbstractAIFDialog { colModel.getColumn(i).setPreferredWidth(HEADERWIDTH[i]); } this.t_part.getTableHeader() - .setDefaultRenderer(this.tableHeaderRenderer = new CheckBoxTableHeaderRenderer(t_part, 0, false)); + .setDefaultRenderer(new CheckBoxTableHeaderRenderer(t_part, 0, false)); this.t_part.getTableHeader().setBackground(Color.blue); JScrollPane scroll = new JScrollPane(t_part); panel.add(BorderLayout.CENTER, scroll); diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/SAPZYGG2Operation.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/SAPZYGG2Operation.java index bbc1cda..61f9fc7 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/SAPZYGG2Operation.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/SAPZYGG2Operation.java @@ -21,7 +21,6 @@ import com.connor.chint.sap2.util.TXTUtil; 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.InterfaceAIFComponent; import com.teamcenter.rac.kernel.ListOfValuesInfo; import com.teamcenter.rac.kernel.TCComponent; import com.teamcenter.rac.kernel.TCComponentBOMLine; @@ -61,7 +60,7 @@ import plm.xi.com.chintelectric.SI_PROCESSROUTE_PLM_OUT_SYNServiceLocator; public class SAPZYGG2Operation extends AbstractAIFOperation { - private AbstractAIFApplication app; +// private AbstractAIFApplication app; private TCSession session; private TCComponentItemRevision degignRev; @@ -89,8 +88,8 @@ public class SAPZYGG2Operation extends AbstractAIFOperation { private TCComponent project; //互感器的传递 public SAPZYGG2Operation(AbstractAIFApplication app,List selectedParts,TCComponent project) { - // TODO Auto-generated constructor stub - this.app = app; + // Auto-generated constructor stub +// this.app = app; this.session = (TCSession) app.getSession(); now = format.format(new Date()); this.project = project; @@ -120,9 +119,10 @@ public class SAPZYGG2Operation extends AbstractAIFOperation { return user.getTCProperty("user_name").getDisplayValue(); } + @SuppressWarnings("deprecation") @Override public void executeOperation() throws Exception { - // TODO Auto-generated method stub + // Auto-generated method stub MyProgressBarCompent comp = null; try { groupName = SAPUtil.getGroupID(session); @@ -160,7 +160,7 @@ public class SAPZYGG2Operation extends AbstractAIFOperation { boolean flag = true; // String bmeng = "1"; - for(int tt=0;tt list = new ArrayList<>(); List proclist = new ArrayList<>(); Map material_revs = new HashMap<>(); @@ -170,28 +170,24 @@ public class SAPZYGG2Operation extends AbstractAIFOperation { if(relatedComponent!=null && relatedComponent.length>0) { List copmList = new ArrayList(Arrays.asList(relatedComponent)); - Collections.sort(copmList, new Comparator() - { - public int compare(TCComponent a1, TCComponent a2) - { - + Collections.sort(copmList, new Comparator() { + public int compare(TCComponent a1, TCComponent a2) { try { String i1 = a1.getProperty("item_id"); String i2 = a2.getProperty("item_id"); return i1.compareTo(i2); - } catch (TCException e) { - // TODO Auto-generated catch block + } catch (Exception e) { + // Auto-generated catch block e.printStackTrace(); } return 0; - } }); // copmList.addAll(relatedComponent); SAPUtil.getFactoryNoList2(degignRev, copmList, project.getProperty("zt2_ProjectNo"), groupName, - list_Factorys, project.getProperty("zt2_WBSNo")); - AIFComponentContext[] whereReferencedByTypeRelation = relatedComponent[0].whereReferencedByTypeRelation(new String[] { "ZT2_Design3DRevision" }, - new String[] { "ZT2_FactoryNumber" }); + list_Factorys, project.getProperty("zt2_WBSNo")); + AIFComponentContext[] whereReferencedByTypeRelation = + relatedComponent[0].whereReferencedByTypeRelation(new String[] { "ZT2_Design3DRevision" }, new String[] { "ZT2_FactoryNumber" }); if(whereReferencedByTypeRelation.length>0) { degignRev = (TCComponentItemRevision) whereReferencedByTypeRelation[0].getComponent(); } @@ -204,8 +200,8 @@ public class SAPZYGG2Operation extends AbstractAIFOperation { SI_FACTORY_NUMBER_PLM_OUT_SYN stub = services.getHTTP_Port(); String REQ_TRACE_ID2 = "123456"; DT_FACTORY_NUMBER_REQBASEINFO baseInfo = new DT_FACTORY_NUMBER_REQBASEINFO(REQ_TRACE_ID2); - DT_FACTORY_NUMBER_REQITEMSITEM[] request = list_Factorys - .toArray(new DT_FACTORY_NUMBER_REQITEMSITEM[list_Factorys.size()]); + DT_FACTORY_NUMBER_REQITEMSITEM[] request = + list_Factorys.toArray(new DT_FACTORY_NUMBER_REQITEMSITEM[list_Factorys.size()]); // System.out.println("出厂编号------->记录开始"); TXTUtil.writeTXT(txtPath, "出厂编号------->记录开始"); for (DT_FACTORY_NUMBER_REQITEMSITEM l : request) { @@ -236,16 +232,20 @@ public class SAPZYGG2Operation extends AbstractAIFOperation { partRev = selectedParts.get(tt).getPart(); } if (partRev != null && meops.length > 0) { - SAPUtil.readBopInfo1((TCComponentMEProcessRevision) meops[0].getComponent(), partRev, session, now, + TCComponent mpComp = SAPUtil.getSameGroupProc(meops, session); + SAPUtil.readBopInfo1((TCComponentMEProcessRevision) mpComp, partRev, session, now, txtPath, proclist, groupName, gy_meops, needTCM_meops, false); }else if(meops.length==0 && groupName.equals("M040")) { String property = selectedParts.get(tt).getPart().getProperty("zt2_MaterialNo"); - TCComponentItem find = itemType.find(property.split("-")[0]); - if(find!=null) { - TCComponentMEProcessRevision glMeop = KUtil.getGlMeop(find.getLatestItemRevision(),session); - if(glMeop!=null) { - SAPUtil.readBopInfo1(glMeop, partRev, session, now, - txtPath, proclist, groupName, gy_meops, needTCM_meops, false); + TCComponentItem[] items = itemType.findItems(property.split("-")[0]); + if(items != null && items.length > 0) { + TCComponentItem find = items[0]; + if(find!=null) { + TCComponentMEProcessRevision glMeop = KUtil.getGlMeop(find.getLatestItemRevision(),session); + if(glMeop!=null) { + SAPUtil.readBopInfo1(glMeop, partRev, session, now, + txtPath, proclist, groupName, gy_meops, needTCM_meops, false); + } } } } diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/ZYApplyCodeControllerzt.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/ZYApplyCodeControllerzt.java index 3953694..50b63e2 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/ZYApplyCodeControllerzt.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/ZYApplyCodeControllerzt.java @@ -204,6 +204,7 @@ public class ZYApplyCodeControllerzt { TCComponentContextList contexts = KUtil.query(session, "chint_query_material_test", field); if (contexts != null) { int size = contexts.getListCount(); + System.out.println("contexts==>" + size); for (int i = 0; i < size; i++) { TCComponent comp = (TCComponent) contexts.get(i).getComponent(); String material = comp.getProperty("zt2_MaterialNo"); @@ -239,6 +240,7 @@ public class ZYApplyCodeControllerzt { System.out.println("查询语句:" + sql.toString()); System.out.println("参数:" + Arrays.toString(obj)); ResultSet rs = SqlUtil.read(sql.toString(),obj); + System.out.println("rs==>" + rs.getFetchSize()); while (rs.next()) { String companyCode = rs.getString(1); @@ -462,9 +464,7 @@ public class ZYApplyCodeControllerzt { // 新的方案编码申请 @SuppressWarnings("deprecation") - public void applyPart(CodeBean bean, List ccpIsUpdate, List codeBeans) - throws TCException { - + public void applyPart(CodeBean bean, List ccpIsUpdate, List codeBeans) throws Exception { TCComponentItem item = null; TCComponentItemRevision rev = null; TCComponentItemType itemType = (TCComponentItemType) this.session.getTypeComponent("Part"); @@ -487,8 +487,12 @@ public class ZYApplyCodeControllerzt { rev = item.getLatestItemRevision(); item.setProperties(item_props); rev.setProperties(rev_props); - rev.save(); - item.save(); + try { + rev.save(); + item.save(); + }catch(Exception e) { + e.printStackTrace(); + } bean.setRev(rev); TCComponentUser user = session.getUser(); if (bean.folder == null) { @@ -506,20 +510,20 @@ public class ZYApplyCodeControllerzt { factosyNos.add(applyCodeBean.getFactoryItem()); TCComponentItemRevision ccp = applyCodeBean.getCcp(); if (ccp != null && !ccpIsUpdate.contains(ccp)) { - ccp.lock(); ccp.setProperty("zt2_TankNo", applyCodeBean.getZt2_Tanko()); - ccp.save(); - ccp.unlock(); + try { + ccp.save(); + }catch(Exception e) { + e.printStackTrace(); + } ccp.refresh(); ccpIsUpdate.add(ccp); } - } } if (factosyNos.size() > 0) rev.add("ZT2_FactoryNumber", factosyNos); // - } public void checkFactoryNos() throws Exception { diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/ZYApplyCodeDialogzt.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/ZYApplyCodeDialogzt.java index 6ed9306..4d6aa21 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/ZYApplyCodeDialogzt.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zy/ZYApplyCodeDialogzt.java @@ -151,55 +151,55 @@ public class ZYApplyCodeDialogzt extends AbstractAIFDialog { public void itemStateChanged(ItemEvent e) { // Auto-generated method stub if (e.getStateChange() == ItemEvent.SELECTED) { - new Thread(new Runnable() { + String val = (String) jcm_types.getSelectedItem(); - @Override - public void run() { - // Auto-generated method stub - - String val = (String) jcm_types.getSelectedItem(); + try { + if (!controller.checkFolder(val)) { + MessageBox.post("请检查是否存在对应的方案文件夹", "", MessageBox.INFORMATION); + return; + } + } catch (Exception e1) { + // Auto-generated catch block + e1.printStackTrace(); + } + if (!KUtil.isEmpty(val)) { - try { - if (!controller.checkFolder(val)) { - MessageBox.post("请检查是否存在对应的方案文件夹", "", MessageBox.INFORMATION); - return; - } - } catch (Exception e) { - // Auto-generated catch block - e.printStackTrace(); + list_jl2.clear(); + list_jl4.clear(); + apply_lists.clear(); + model4.removeAllElements(); + String code = codes.get(val); + try { + //查询时由搜索名称改成搜索物料号，后加*，前不需要加* + controller.checkTargets(val, bean.getCodes().get(val), code); + System.out.println("apply_lists==>" + apply_lists.size()); + for (int i = 0; i < apply_lists.size(); i++) { + model4.addElement(apply_lists.get(i)); } - if (!KUtil.isEmpty(val)) { - - list_jl2.clear(); - list_jl4.clear(); - apply_lists.clear(); - model4.removeAllElements(); - String code = codes.get(val); - try { - //查询时由搜索名称改成搜索物料号，后加*，前不需要加* - controller.checkTargets(val, bean.getCodes().get(val), code); - for (int i = 0; i < apply_lists.size(); i++) { - model4.addElement(apply_lists.get(i)); - } - model2.removeAllElements(); - - for (int i = 0; i < controller.h_Applys.size(); i++) { - model2.addElement(controller.h_Applys.get(i)); - } - list_jl2.addAll(controller.h_Applys); - list_jl4.addAll(apply_lists); - } catch (Exception e1) { - // Auto-generated catch block - MessageBox.post("获取方案编码时发生异常:" + e1.getMessage(), "", MessageBox.INFORMATION); - e1.printStackTrace(); - } + model2.removeAllElements(); + System.out.println("h_Applys==>" + controller.h_Applys.size()); + for (int i = 0; i < controller.h_Applys.size(); i++) { + model2.addElement(controller.h_Applys.get(i)); } -// jl1.setModel(model1); - jl2.setModel(model2); - jl3.setModel(model3); - jl4.setModel(model4); + list_jl2.addAll(controller.h_Applys); + list_jl4.addAll(apply_lists); + } catch (Exception e1) { + // Auto-generated catch block + MessageBox.post("获取方案编码时发生异常:" + e1.getMessage(), "", MessageBox.INFORMATION); + e1.printStackTrace(); } - }).start(); + } +// jl1.setModel(model1); +// jl2.setModel(model2); +// jl3.setModel(model3); +// jl4.setModel(model4); +// new Thread(new Runnable() { +// @Override +// public void run() { +// // Auto-generated method stub +// +// } +// }).start(); } } }); @@ -294,8 +294,8 @@ public class ZYApplyCodeDialogzt extends AbstractAIFDialog { for (int i = 0, len = list_jl4.size(); i < len; i++) { model4.addElement(list_jl4.get(i)); } - jl4.setModel(model4); - jl3.setModel(model3); +// jl4.setModel(model4); +// jl3.setModel(model3); } catch (Exception e1) { @@ -390,8 +390,8 @@ public class ZYApplyCodeDialogzt extends AbstractAIFDialog { model4.addElement(list_jl4.get(i)); } - jl4.setModel(model4); - jl3.setModel(model3); +// jl4.setModel(model4); +// jl3.setModel(model3); } else { for (int j = 0; j < sels2.length; j++) { CodeBean cloneBean = model3.get(sels2[j]); @@ -418,8 +418,8 @@ public class ZYApplyCodeDialogzt extends AbstractAIFDialog { for (int i = 0, len = list_jl4.size(); i < len; i++) { model4.addElement(list_jl4.get(i)); } - jl4.setModel(model4); - jl3.setModel(model3); +// jl4.setModel(model4); +// jl3.setModel(model3); } } catch (Exception e1) { @@ -477,8 +477,8 @@ public class ZYApplyCodeDialogzt extends AbstractAIFDialog { for (int i = 0, len = list_jl4.size(); i < len; i++) { model4.addElement(list_jl4.get(i)); } - jl4.setModel(model4); - jl3.setModel(model3); +// jl4.setModel(model4); +// jl3.setModel(model3); } }); @@ -530,13 +530,13 @@ public class ZYApplyCodeDialogzt extends AbstractAIFDialog { value_keys.clear(); list_jl3.clear(); model3.removeAllElements(); - jl3.setModel(model3); +// jl3.setModel(model3); model2.removeAllElements(); Collections.sort(list_jl2); for (int i = 0; i < list_jl2.size(); i++) { model2.addElement(list_jl2.get(i)); } - jl2.setModel(model2); +// jl2.setModel(model2); ZYApplyCodeControllerzt.sortFolder(controller.folder); KUtil.setByPass(false); my.setVisible(false); @@ -613,8 +613,8 @@ public class ZYApplyCodeDialogzt extends AbstractAIFDialog { for (int i = 0, len = list_jl4.size(); i < len; i++) { model4.addElement(list_jl4.get(i)); } - jl4.setModel(model4); - jl3.setModel(model3); +// jl4.setModel(model4); +// jl3.setModel(model3); // controller.removeSelectedParts(); // factoryNosIsAPPLY.removeAll(selects); @@ -669,8 +669,8 @@ public class ZYApplyCodeDialogzt extends AbstractAIFDialog { for (int i = 0, len = list_jl4.size(); i < len; i++) { model4.addElement(list_jl4.get(i)); } - jl4.setModel(model4); - jl3.setModel(model3); +// jl4.setModel(model4); +// jl3.setModel(model3); } } diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zykg/SAPZYKGDialog.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zykg/SAPZYKGDialog.java index 75360db..44a6370 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zykg/SAPZYKGDialog.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/sap_zykg/SAPZYKGDialog.java @@ -12,7 +12,6 @@ import java.util.List; import javax.swing.BorderFactory; import javax.swing.JButton; -import javax.swing.JCheckBox; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JScrollPane; @@ -23,7 +22,6 @@ import javax.swing.table.TableColumnModel; import com.connor.chint.sap2.create_proc.CreateProcBean; import com.connor.chint.sap2.create_proc.CreateProcController; import com.connor.chint.sap2.sap_zy.PartBean; -import com.connor.chint.sap2.sap_zy.SAPZYDialog; import com.connor.chint.sap2.util.CheckBoxTableHeaderRenderer; import com.connor.chint.sap2.util.ConfirmDialogUtil; import com.connor.chint.sap2.util.KUtil; @@ -31,7 +29,6 @@ import com.connor.chint.sap2.util.MyProgressBarCompent; import com.connor.chint.sap2.util.SAPUtil; import com.teamcenter.rac.aif.AbstractAIFApplication; import com.teamcenter.rac.aif.AbstractAIFDialog; -import com.teamcenter.rac.aif.kernel.InterfaceAIFComponent; import com.teamcenter.rac.kernel.TCComponentItemRevision; import com.teamcenter.rac.kernel.TCSession; import com.teamcenter.rac.util.MessageBox; @@ -53,6 +50,10 @@ import plm.xi.com.chintelectric.SI_PUSH_BOM_PLM_OUT_SYNServiceLocator; * */ public class SAPZYKGDialog extends AbstractAIFDialog { + /** + * + */ + private static final long serialVersionUID = 1L; private SAPZYKGDialogController controller; private JButton b_ok; private JButton b_cel; @@ -66,7 +67,7 @@ public class SAPZYKGDialog extends AbstractAIFDialog { "确认时间" }; public static final int[] HEADERWIDTH = new int[] { 50, 60, 60, 60, 120, 180, 100, 100, 100 }; protected JButton pushBOM_btn; // BOM确认 - private CheckBoxTableHeaderRenderer tableHeaderRenderer; +// private CheckBoxTableHeaderRenderer tableHeaderRenderer; private TCSession session; public SAPZYKGDialog(AbstractAIFApplication app) { @@ -165,13 +166,13 @@ public class SAPZYKGDialog extends AbstractAIFDialog { String now = sdf.format(time); String user = session.getUser().getUserId(); String userName = session.getUserName(); - for (int i = 0; i < len; i++) { - bean = beans.get(i); - if ("已确认".equals(bean.getZt2_SapBomState())) { - MessageBox.post(SAPZYKGDialog.this, "BOM已确认,不能重复确认", "", 2); - return; - } - } +// for (int i = 0; i < len; i++) {//2024-03-29逻辑调整 确认不再限制次数 +// bean = beans.get(i); +// if ("已确认".equals(bean.getZt2_SapBomState())) { +// MessageBox.post(SAPZYKGDialog.this, "BOM已确认,不能重复确认", "", 2); +// return; +// } +// } if (new ConfirmDialogUtil(SAPZYKGDialog.this, "BOM确认", "此操作在BOM完整下发后确认一次,是否确认BOM？", new Dimension(500, 200)).getResult()) { @@ -306,6 +307,11 @@ public class SAPZYKGDialog extends AbstractAIFDialog { JPanel panel = new JPanel(new BorderLayout()); tm_part = new DefaultTableModel(); t_part = new JTable(tm_part) { + /** + * + */ + private static final long serialVersionUID = 1L; + @Override public boolean isCellEditable(int row, int column) { // 选择列（第三列）设置可编辑 if (column == 0) @@ -331,7 +337,7 @@ public class SAPZYKGDialog extends AbstractAIFDialog { colModel.getColumn(i).setPreferredWidth(HEADERWIDTH[i]); } this.t_part.getTableHeader() - .setDefaultRenderer(this.tableHeaderRenderer = new CheckBoxTableHeaderRenderer(t_part, 0, false)); + .setDefaultRenderer(new CheckBoxTableHeaderRenderer(t_part, 0, false)); this.t_part.getTableHeader().setBackground(Color.blue); JScrollPane scroll = new JScrollPane(t_part); panel.add(BorderLayout.CENTER, scroll); diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/util/SAPUtil.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/util/SAPUtil.java index d3a2e04..effd153 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/util/SAPUtil.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/util/SAPUtil.java @@ -2139,7 +2139,7 @@ public class SAPUtil { meops = partRev.whereReferencedByTypeRelation(new String[] { "MEProcessRevision" }, new String[] { "IMAN_METarget" }); if (meops != null && meops.length > 0) { - TCComponent mpComp = (TCComponent) meops[0].getComponent(); + TCComponent mpComp = getSameGroupProc(meops, session); if (!KUtil.isTCM(mpComp)) { set_meops.add(mpComp); } @@ -3080,8 +3080,9 @@ public class SAPUtil { } TXTUtil.writeTXT(txtPath, "图纸[" + rev + "]无工艺信息"); } else { - TXTUtil.writeTXT(txtPath, "图纸[" + rev + "]工艺信息:" + meops[0].getComponent()); - SAPUtil.readBopInfo1((TCComponentMEProcessRevision) meops[0].getComponent(), partRev, session, now, + TCComponent meop = getSameGroupProc(meops, session); + TXTUtil.writeTXT(txtPath, "图纸[" + rev + "]工艺信息:" + meop); + SAPUtil.readBopInfo1((TCComponentMEProcessRevision) meop, partRev, session, now, txtPath, proclist, groupName, gy_meops, needTCM_meops, true); } } @@ -3261,10 +3262,10 @@ public class SAPUtil { if (o_user != null && o_user.equals(user)) { return; } -// comp.lock(); + comp.lock(); comp.changeOwner(user, group); comp.save(); -// comp.unlock(); + comp.unlock(); } @@ -3886,7 +3887,7 @@ public class SAPUtil { TCComponent mpComp = null; part = partRev.getItem(); if (meops != null && meops.length > 0) { - mpComp = (TCComponent) meops[0].getComponent(); + mpComp = getSameGroupProc(meops, session); if (!KUtil.isTCM(mpComp)) { set_meops.add(mpComp); } @@ -4072,8 +4073,9 @@ public class SAPUtil { } } else { - TXTUtil.writeTXT(txtPath, "图纸[" + rev + "]工艺信息:" + meops[0].getComponent()); - SAPUtil.readBopInfo1((TCComponentMEProcessRevision) meops[0].getComponent(), partRev, session, now, + TCComponent mpComp = getSameGroupProc(meops, session); + TXTUtil.writeTXT(txtPath, "图纸[" + rev + "]工艺信息:" + mpComp); + SAPUtil.readBopInfo1((TCComponentMEProcessRevision) mpComp, partRev, session, now, txtPath, proclist, groupName, gy_meops, needTCM_meops, true); } } @@ -4682,8 +4684,9 @@ public class SAPUtil { } TXTUtil.writeTXT(txtPath, "图纸[" + rev + "]无工艺信息"); } else { - TXTUtil.writeTXT(txtPath, "图纸[" + rev + "]工艺信息:" + meops[0].getComponent()); - SAPUtil.readBopInfo1((TCComponentMEProcessRevision) meops[0].getComponent(), partRev, session, now, + TCComponent mpComp = getSameGroupProc(meops, session); + TXTUtil.writeTXT(txtPath, "图纸[" + rev + "]工艺信息:" + mpComp); + SAPUtil.readBopInfo1((TCComponentMEProcessRevision) mpComp, partRev, session, now, txtPath, proclist, groupName, gy_meops, needTCM_meops, true); } } @@ -4941,8 +4944,9 @@ public class SAPUtil { } TXTUtil.writeTXT(txtPath, "图纸[" + rev + "]无工艺信息"); } else { - TXTUtil.writeTXT(txtPath, "图纸[" + rev + "]工艺信息:" + meops[0].getComponent()); - SAPUtil.readBopInfo1((TCComponentMEProcessRevision) meops[0].getComponent(), partRev, session, now, + TCComponent mpComp = getSameGroupProc(meops, session); + TXTUtil.writeTXT(txtPath, "图纸[" + rev + "]工艺信息:" + mpComp); + SAPUtil.readBopInfo1((TCComponentMEProcessRevision) mpComp, partRev, session, now, txtPath, proclist, groupName, gy_meops, needTCM_meops, true); } } @@ -5182,8 +5186,9 @@ public class SAPUtil { if (meops.length == 0) { TXTUtil.writeTXT(txtPath, "图纸[" + rev + "]无工艺信息"); } else { - TXTUtil.writeTXT(txtPath, "图纸[" + rev + "]工艺信息:" + meops[0].getComponent()); - SAPUtil.readBopInfo1((TCComponentMEProcessRevision) meops[0].getComponent(), partRev, session, now, + TCComponent mpComp = getSameGroupProc(meops, session); + TXTUtil.writeTXT(txtPath, "图纸[" + rev + "]工艺信息:" + mpComp); + SAPUtil.readBopInfo1((TCComponentMEProcessRevision) mpComp, partRev, session, now, txtPath, proclist, groupName, gy_meops, needTCM_meops, true); } } @@ -5426,19 +5431,19 @@ public class SAPUtil { } public static TCComponentMEProcessRevision getMrProcess(String groupId,TCSession session) { -// String[] stringValues = session.getPreferenceService().getStringValues("CHINT_GYLX"); -// TCComponentMEProcessRevision rev = null; -// for(String stringValue:stringValues) { -// if(stringValue.startsWith(groupId)) { -// try { -// rev = (TCComponentMEProcessRevision) session.stringToComponent(stringValue.replaceAll(groupId+":", "")); -// } catch (TCException e) { -// // Auto-generated catch block -// e.printStackTrace(); -// } -// break; -// } -// } + String[] stringValues = session.getPreferenceService().getStringValues("CHINT_GYLX"); + //TCComponentMEProcessRevision rev = null; + for(String stringValue:stringValues) { + if(stringValue.startsWith(groupId)) { + try { + return (TCComponentMEProcessRevision) session.stringToComponent(stringValue.replaceAll(groupId+":", "")); + } catch (TCException e) { + // Auto-generated catch block + e.printStackTrace(); + } + break; + } + } return null; } @@ -5494,8 +5499,7 @@ public class SAPUtil { if (partRev != null) { if (meops != null && meops.length > 0) { - TCComponent mpComp = null; - mpComp = (TCComponent) meops[0].getComponent(); + TCComponent mpComp = getSameGroupProc(meops, session); if (!KUtil.isTCM(mpComp)) { set_meops.add(mpComp); } diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/util/SqlUtil.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/util/SqlUtil.java index 95758dc..cefcc13 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/util/SqlUtil.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/util/SqlUtil.java @@ -831,4 +831,41 @@ public class SqlUtil { } } } + + public static Connection getConnection2() { + System.out.println("getConnection()"); + String driver = reg.getString("SQL.TC.DRIVER"); + String url = reg.getString("SQL.TC.URL"); + String user = reg.getString("SQL.TC.USER"); + String password = reg.getString("SQL.TC.PASSWORD"); + System.out.println("连接数据库信息："); + System.out.println("DRIVER: " + driver); + System.out.println("URL: " + url); + System.out.println("USER: " + user); + if (connection != null) { + try { + connection.close(); + } catch (Exception e1) { + e1.printStackTrace(); + } + connection = null; + } + try { + // 加载驱动程序 + Class.forName(driver); + // 1.getConnection()方法，连接MySQL数据库！！ + connection = DriverManager.getConnection(url, user, password); + connection.setAutoCommit(false); + } catch (ClassNotFoundException e) { + // 数据库驱动类异常处理 + System.out.println("未找到数据库驱动"); + e.printStackTrace(); + } catch (SQLException e) { + // 数据库连接失败异常处理 + e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); + } + return connection; + } } diff --git a/com.connor.chint.sap2/src/com/connor/chint/sap2/util/TableBuilder.java b/com.connor.chint.sap2/src/com/connor/chint/sap2/util/TableBuilder.java index f5a22f0..2a1f6ac 100644 --- a/com.connor.chint.sap2/src/com/connor/chint/sap2/util/TableBuilder.java +++ b/com.connor.chint.sap2/src/com/connor/chint/sap2/util/TableBuilder.java @@ -16,7 +16,6 @@ import javax.swing.JComponent; import javax.swing.JTable; import javax.swing.JTextArea; import javax.swing.JTextField; -import javax.swing.JTextPane; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableColumn; import javax.swing.table.TableColumnModel; @@ -54,7 +53,7 @@ public class TableBuilder { protected Integer[] headerWidth; public List queryLists = new ArrayList(); - private List queryValues = new ArrayList(); +// private List queryValues = new ArrayList(); // 用户数据筛选条件 protected String queryFilter; @@ -156,7 +155,7 @@ public class TableBuilder { } public List queryData(TCSession session, Map queryFields, boolean flag, - boolean isAllCompany, String groupName, Map key_values, boolean isMaterial) + boolean isAllCompany, String groupName, Map key_values, boolean isMaterial, boolean showStop) throws Exception { StringBuilder sql = new StringBuilder(); @@ -259,6 +258,10 @@ public class TableBuilder { } params.add(input); addFilter(sql); + if(!showStop) { + //查询界面增加“停用”勾选项，默认不勾选，进行模糊查询时自动过滤掉“GoodsFullInfo”中包含“停用”的物料，若勾选则不过滤。 + sql.append(" and \"GoodsFullInfo\" not like '%停用%'"); + } System.out.println("SQL:" + sql); ResultSet rs = SqlUtil.read(sql.toString() + " order by \"GoodsUsed\"", params.toArray(new Object[] {})); @@ -293,6 +296,10 @@ public class TableBuilder { return res; } addFilter(sql); + if(!showStop) { + //查询界面增加“停用”勾选项，默认不勾选，进行模糊查询时自动过滤掉“GoodsFullInfo”中包含“停用”的物料，若勾选则不过滤。 + sql.append(" and \"GoodsFullInfo\" not like '%停用%'"); + } System.out.println("SQL:" + sql); System.out.println("PARAMS:" + params); @@ -469,7 +476,7 @@ public class TableBuilder { map.put(header + DATE_TO, end); map.put(header + DATE_FROM, start); } else if (this.ind_Area.containsKey(col)) { - JTextPane panel = new JTextPane(); +// JTextPane panel = new JTextPane(); JTextArea jta = new JTextArea(5, 12); jta.setLineWrap(true); // 设置文本域中的文本为自动换行 jta.setForeground(Color.BLACK); // 设置组件的背景色 @@ -619,7 +626,7 @@ public class TableBuilder { @Override public boolean isCellEditable(int row, int column) { - // TODO Auto-generated method stub + // Auto-generated method stub if (column == 0) return false;