test

com.connor.chint.wuhan/bin/com/chint/plm/createbomdifference/Message_zh_CN.properties

@@ -1,3 +1,7 @@
 ERROR_NOT_CHANGE=\u8BF7\u9009\u62E9\u66F4\u6539\u901A\u77E5\u5355\u5BF9\u8C61
+<<<<<<< HEAD
 ERROR_NO_CHANGE=\u672A\u627E\u5230\u53D8\u66F4\u524D\u540E\u5BF9\u8C61,\u65E0\u6CD5\u63D0\u53D6\u5DEE\u5F02\u9879\uFF01
-SUCC_CHANGE=\u63D0\u53D6\u5B8C\u6210
+SUCC_CHANGE=\u63D0\u53D6\u5B8C\u6210
+=======
+ERROR_NO_CHANGE=\u672A\u627E\u5230\u53D8\u66F4\u524D\u540E\u5BF9\u8C61,\u65E0\u6CD5\u63D0\u53D6\u5DEE\u5F02\u9879\uFF01
+>>>>>>> 65c5903c8f3927b85b3c68d928802214a146ec48

com.connor.chint.wuhan/plugin.xml

@@ -70,7 +70,7 @@
 		
 		 <menuContribution locationURI="menu:com.connor.chint.sap2.menu.whgc?after=additions">
 		 
-		<!-- <command commandId = "com.chint.plm.createbomdifference.ExtractDiffComd" id = "com.chint.plm.createbomdifference.ExtractDiffComd">
+		 <!--<command commandId = "com.chint.plm.createbomdifference.ExtractDiffComd" id = "com.chint.plm.createbomdifference.ExtractDiffComd">
                     <visibleWhen>      
                         <and>
                             <or>

com.connor.chint.wuhan/src/com/chint/plm/createbomdifference/ExtractDiffComd.java

@@ -74,7 +74,11 @@ public class ExtractDiffComd extends KCommand {
                 return;
             }
             readChangeDesign(oldComponents, newComponents, tar);
+<<<<<<< HEAD
             MessageBox.post(resource.getString("SUCC_CHANGE"), "", 2);
+=======
+
+>>>>>>> 65c5903c8f3927b85b3c68d928802214a146ec48
         } catch (TCException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
@@ -150,10 +154,16 @@ public class ExtractDiffComd extends KCommand {
             ChangeDesignBean changeDesignBean = itemChangeMap.get(keyItem);
             TCComponentItemRevision oldDesgin = changeDesignBean.getOldDesgin();
             Map<String, PBomBean> materialOld = getMaterialByDesign(oldDesgin);
+<<<<<<< HEAD
             System.out.println("materialOld===>" + materialOld.toString());
             TCComponentItemRevision newDesgin = changeDesignBean.getNewDesgin();
             Map<String, PBomBean> materialNew = getMaterialByDesign(newDesgin);
            
+=======
+            TCComponentItemRevision newDesgin = changeDesignBean.getNewDesgin();
+            Map<String, PBomBean> materialNew = getMaterialByDesign(newDesgin);
+            System.out.println("materialOld===>" + materialOld.toString());
+>>>>>>> 65c5903c8f3927b85b3c68d928802214a146ec48
             System.out.println("materialNew===>" + materialNew.toString());
             // ±È½Ï±ä¸üÇ°ºóÎïÁÏBOM
             for (String materialNo : materialOld.keySet()) {
@@ -317,8 +327,11 @@ public class ExtractDiffComd extends KCommand {
             if (pbomMap.containsKey(materialNo)) {
                 PBomBean pBomBean = pbomMap.get(materialNo);
                 // ÊÇ·ñPBOM
+<<<<<<< HEAD
                 System.out.println("matnrProps[1]===>" + matnrProps[1]);
                 System.out.println("matnrProps[2]===>" + matnrProps[2] + "pBomBean.getpRevision()"+pBomBean.getpRevision());
+=======
+>>>>>>> 65c5903c8f3927b85b3c68d928802214a146ec48
                 if (matnrProps[1].equals(Util.ZT_VAL_PBOM) && matnrProps[2].compareTo(pBomBean.getpRevision()) > 0) {
                     pBomBean.setpMaterial(represent);
                     pBomBean.setpRevision(matnrProps[2]);

com.connor.chint.wuhan/src/com/chint/plm/createbomdifference/Message_zh_CN.properties

@@ -1,3 +1,7 @@
 ERROR_NOT_CHANGE=\u8BF7\u9009\u62E9\u66F4\u6539\u901A\u77E5\u5355\u5BF9\u8C61
+<<<<<<< HEAD
 ERROR_NO_CHANGE=\u672A\u627E\u5230\u53D8\u66F4\u524D\u540E\u5BF9\u8C61,\u65E0\u6CD5\u63D0\u53D6\u5DEE\u5F02\u9879\uFF01
-SUCC_CHANGE=\u63D0\u53D6\u5B8C\u6210
+SUCC_CHANGE=\u63D0\u53D6\u5B8C\u6210
+=======
+ERROR_NO_CHANGE=\u672A\u627E\u5230\u53D8\u66F4\u524D\u540E\u5BF9\u8C61,\u65E0\u6CD5\u63D0\u53D6\u5DEE\u5F02\u9879\uFF01
+>>>>>>> 65c5903c8f3927b85b3c68d928802214a146ec48

com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/BomSendSapController.java

@@ -191,7 +191,11 @@ public class BomSendSapController {
 			String txtPath = TXTUtil.createTxt(txtName);
 			comp = new MyProgressBarCompent("", "正在进行项目BOM传递......");
 			StringBuffer errMessageAll = new StringBuffer(""); 
-			StringBuffer sendMessageAll = new StringBuffer(""); 
+			StringBuffer sendMessageAll = new StringBuffer("");
+			
+			//2024 1 22新增逻辑往CHINT_BOM_TO_SAP_SUM 
+			project.getProperty("zt2_WBSNo");
+			//产成品BOM组织时除了产成品不同，其他相同 BOM结构是一样的
 			for(PartBean bean : selectedParts) {
 				
 				Document document = DocumentHelper.parseText(getXML());
@@ -230,7 +234,9 @@ public class BomSendSapController {
 					win.close();
 				}else {
 //					new BomSendSapOp(session,document.asXML(),txtPath,gy_meops).executeOperation();
-					sendMessageAll.append(name(txtPath,document.asXML()));
+				    //记录XML信息到CHINT_BOM_TO_SAP_DETIALS
+				    
+					sendMessageAll.append(SendToSap(txtPath,document.asXML()));
 					win.close();	
 				}
 				TCComponentDataset dataset = TXTUtil.createDataset(txtPath, txtName, session);
@@ -276,7 +282,7 @@ public class BomSendSapController {
 		return selectedParts;
 	}
 	
-	public StringBuffer name(String txtPath,String wsdlString) throws IOException {
+	public StringBuffer SendToSap(String txtPath,String wsdlString) throws IOException {
 //		new BomSendSapOp(session,document.asXML(),txtPath,gy_meops).executeOperation();
 		TXTUtil.writeTXT(txtPath, "----------------BOM传递数据--------------");
 		TXTUtil.writeTXT(txtPath, wsdlString);