From 25a0a7e3c059c7a5cd9cea8cd0daa84e21c13e8d Mon Sep 17 00:00:00 2001 From: "lidy@connor.net.cn" Date: Tue, 16 Apr 2024 15:42:34 +0800 Subject: [PATCH] =?UTF-8?q?BOM=E4=BC=A0=E9=80=92P=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=8F=96=E6=9C=80=E6=96=B0=E5=8F=91=E5=B8=83=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateBOMDifference_DYController.java | 3 +++ .../chint/yunpi/command/BomSendSapController.java | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/com.connor.chint.wuhan/src/com/chint/plm/createbomdifference/CreateBOMDifference_DYController.java b/com.connor.chint.wuhan/src/com/chint/plm/createbomdifference/CreateBOMDifference_DYController.java index e891fb3..00784b1 100644 --- a/com.connor.chint.wuhan/src/com/chint/plm/createbomdifference/CreateBOMDifference_DYController.java +++ b/com.connor.chint.wuhan/src/com/chint/plm/createbomdifference/CreateBOMDifference_DYController.java @@ -256,6 +256,7 @@ public class CreateBOMDifference_DYController { } // BOM展开比较 if (oldRev != null && newRev != null) { + System.out.println("比较:" + bean); // 比较 win.setWindowTopLine(item, bean.getOldRev(), null, null); win2.setWindowTopLine(item, bean.getNewRev(), null, null); @@ -277,6 +278,7 @@ public class CreateBOMDifference_DYController { for (Entry entry : map_item_beans.entrySet()) { bean = entry.getValue(); + System.out.println("1getOldBOMLine：" + bean.getOldBOMLine() + " getNewBOMLine:" + bean.getNewBOMLine()); oldRev = bean.getOldRev(); newRev = bean.getNewRev(); if (oldRev != newRev) {//lidy 20240411 oldRev != null && newRev != null && @@ -301,6 +303,7 @@ public class CreateBOMDifference_DYController { bean.setZt2_MaterialNo_Parent(zt2_MaterialNo); bean.setObject_desc_Parent(object_desc); bean.setParentPartRev(newRev); + System.out.println("2getOldBOMLine：" + bean.getOldBOMLine() + " getNewBOMLine:" + bean.getNewBOMLine()); bomCompare_M030(bean, session, 1, 1, beans, list_items, child); } diff --git a/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/BomSendSapController.java b/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/BomSendSapController.java index 44d3017..ad28ab6 100644 --- a/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/BomSendSapController.java +++ b/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/BomSendSapController.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -148,7 +149,7 @@ public class BomSendSapController { return soapXML; } - public TCComponentItemRevision getPRevision(TCComponentItemRevision rev2) throws TCException { + public TCComponentItemRevision getPRevision(TCComponentItemRevision rev2) throws Exception { String zt2_MaterialNo = rev2.getStringProperty("zt2_MaterialNo"); if (rev2.getType().equals("Part Revision")) { @@ -162,7 +163,12 @@ public class BomSendSapController { for (TCComponent matnr : matnrs) { String[] properties = matnr.getProperties(new String[] { "zt2_ifpbom", "zt2_MaterialNo" }); if (properties[1].equals(zt2_MaterialNo) && properties[0].equals("P")) { - return (TCComponentItemRevision) matnr; + TCComponentItemRevision[] revs = ((TCComponentItemRevision) matnr).getItem().getReleasedItemRevisions(); + System.out.println("getPRevision:" + matnr + " ==> " + Arrays.toString(revs)); + if(revs.length > 0)//lidy20240415 + return revs[0]; +// else +// return (TCComponentItemRevision) matnr; } } } @@ -172,7 +178,7 @@ public class BomSendSapController { } - public String getUserName(TCSession session) throws TCException { + public String getUserName(TCSession session) throws Exception { TCComponentUser user = session.getUser(); session.getUserName(); return user.getTCProperty("user_name").getDisplayValue(); -- 2.36.3