Merge pull request 'BOM传递P物料取最新发布版' (#5) from ldy into main

Reviewed-on: http://yunpi.tpddns.cn:3000/ZT_CODE/chint_wuhan/pulls/5

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<TCComponentItem, BOMDifferenceBean> 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);
 				}

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();