From 670784ab2951fc089f9db563485c9bd66c1c3b0a Mon Sep 17 00:00:00 2001
From: lijh <lijh@connor.net.cn>
Date: Fri, 20 Dec 2024 17:58:08 +0800
Subject: [PATCH] 111

---
 plugin.xml                                  | 66 ++++++++++++++-------
 src/com/langtech/plm/mpart/MpartDialog.java | 25 +++++---
 2 files changed, 63 insertions(+), 28 deletions(-)

diff --git a/plugin.xml b/plugin.xml
index 9df6b01..8495b14 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -11,9 +11,15 @@
       </category>
       
        <command
-            categoryId="com.langtech.plm.project.ProjectECRHandler"
+            categoryId="com.langtech.plm.project.CalculateHandler"
             name="计算材料定额"
-            id="com.langtech.plm.project.ProjectECRHandler">
+            id="com.langtech.plm.project.CalculateHandler">
+      </command>
+      
+      <command
+            categoryId="com.langtech.plm.bg.QDRWHandler"
+            name="变更任务分配表启动任务"
+            id="com.langtech.plm.bg.QDRWHandler">
       </command>
       
        <command
@@ -44,7 +50,7 @@
       </command>
       <command
             categoryId="com.langtech.plm.template.TemplateHandler"
-            name="插入模板"
+            name="生成工序卡"
             id="com.langtech.plm.template.TemplateHandler">
       </command>
       
@@ -57,14 +63,18 @@
 
    <extension
          point="org.eclipse.ui.handlers">
+          <handler
+            class="com.langtech.plm.bg.QDRWHandler"
+            commandId="com.langtech.plm.bg.QDRWHandler">
+      </handler>
           <handler
             class="com.langtech.plm.bg.RWFPHandler"
             commandId="com.langtech.plm.bg.RWFPHandler">
       </handler>
       
          <handler
-            class="com.langtech.plm.project.ProjectECRHandler"
-            commandId="com.langtech.plm.project.ProjectECRHandler">
+            class="com.langtech.plm.project.CalculateHandler"
+            commandId="com.langtech.plm.project.CalculateHandler">
       </handler>
       
       
@@ -100,27 +110,19 @@
             locationURI="menu:org.eclipse.ui.main.menu?after=additions">
          <menu
                id="com.langtech.plm.performancemanagement.menus.sampleMenu"
-               label="二开菜单"
+               label="设计管理"
                mnemonic="M">
             <command
                   commandId="com.langtech.plm.synchronize.SynchronizeHandler"
                   id="com.langtech.plm.synchronize.SynchronizeHandler"
                   mnemonic="S">
             </command>
-            <command
-                  commandId="com.langtech.plm.template.TemplateHandler"
-                  id="com.langtech.plm.template.TemplateHandler"
-                  mnemonic="S">
-            </command>
+
             
-            <command
-                  commandId="com.langtech.plm.project.ProjectECRHandler"
-                  id="com.langtech.plm.project.ProjectECRHandler"
-                  mnemonic="S">
-            </command>
+
          </menu>
          
-         
+      
          
           <menu
                id="com.langtech.plm.performancemanagement.menus.sampleMenu2"
@@ -131,6 +133,12 @@
                   id="com.langtech.plm.bg.RWFPHandler"
                   mnemonic="S">
             </command>
+            
+             <command
+                  commandId="com.langtech.plm.bg.QDRWHandler"
+                  id="com.langtech.plm.bg.QDRWHandler"
+                  mnemonic="S">
+            </command>
          </menu>
          
          
@@ -151,14 +159,30 @@
                   mnemonic="S">
             </command>
             
-            <command
+
+         </menu>
+      </menuContribution>
+      
+	  
+	          <menuContribution locationURI="menu:cn.net.connor.std.processedit.mainmenu?after=additions">
+		
+	              <command
                   commandId="com.langtech.plm.mpart.MpartHandler"
                   id="com.langtech.plm.mpart.MpartHandler"
                   mnemonic="S">
             </command>
-         </menu>
-      </menuContribution>
-      
+				<command
+                  commandId="com.langtech.plm.project.CalculateHandler"
+                  id="com.langtech.plm.project.CalculateHandler"
+                  mnemonic="S">
+            </command>
+	        <command
+                  commandId="com.langtech.plm.template.TemplateHandler"
+                  id="com.langtech.plm.template.TemplateHandler"
+                  mnemonic="S">
+            </command>
+
+        </menuContribution>  
       
        <menuContribution locationURI="popup:org.eclipse.ui.popup.any?after=additions">
 		 <command
diff --git a/src/com/langtech/plm/mpart/MpartDialog.java b/src/com/langtech/plm/mpart/MpartDialog.java
index 730951f..1d38496 100644
--- a/src/com/langtech/plm/mpart/MpartDialog.java
+++ b/src/com/langtech/plm/mpart/MpartDialog.java
@@ -468,15 +468,21 @@ public class MpartDialog extends JFrame implements ActionListener {
 							//����	ly6_homemadeStatus
 							mRev.setProperty("ly6_homemadeStatus", "����");
 							String personId = tm_part.getValueAt(i, 8).toString();
-							System.out.println("personId========"+personId);
-							mRev.setProperty("ly6_assignUser", personId == null || personId.isEmpty() ? "" : personId);
+							String[] split = personId.split("_");
+							System.out.println("personId========"+split[1]);
+							mRev.setProperty("ly6_assignUser", split[1] == null || split[1].isEmpty() ? "" : split[1]);
+							
 							// ��������
 							if (workflowTemplate != null || !workflowTemplate.isEmpty()) {
-								CreateProcess(session, item, workflowTemplate);
+								CreateProcess(session, mRev, workflowTemplate);
 							}
 
 							// �Ѷ���ŵ������ļ�����
 							rev.add("LY6_relatedMPart", item);
+							TCComponent[] relatedComponents = rev.getRelatedComponents("TC_Is_Represented_By");
+							for (int j = 0; j < relatedComponents.length; j++) {
+								relatedComponents[j].add("representation_for",mRev);
+							}
 							item.getLatestItemRevision().refresh();
 						} else {
 							AIFComponentContext[] children = topLine.getChildren();
@@ -711,12 +717,17 @@ public class MpartDialog extends JFrame implements ActionListener {
 							//����	ly6_homemadeStatus
 							mRev.setProperty("ly6_homemadeStatus", "����");
 							String personId = tm_part.getValueAt(i, 8).toString();
-							System.out.println("personId========"+personId);
-							mRev.setProperty("ly6_assignUser", personId == null || personId.isEmpty() ? "" : personId);
+							String[] split = personId.split("_");
+							System.out.println("personId========"+split[1]);
+							mRev.setProperty("ly6_assignUser", split[1] == null || split[1].isEmpty() ? "" : split[1]);
 							
 							
 							// �Ѷ���ŵ������ļ�����
 							rev.add("LY6_relatedMPart", item);
+							TCComponent[] relatedComponents = rev.getRelatedComponents("TC_Is_Represented_By");
+							for (int j = 0; j < relatedComponents.length; j++) {
+								relatedComponents[j].add("representation_for",mRev);
+							}
 							item.getLatestItemRevision().refresh();
 							// �mBOM
 							TCComponentBOMWindowType viewType = (TCComponentBOMWindowType) session
@@ -747,7 +758,7 @@ public class MpartDialog extends JFrame implements ActionListener {
 							view.close();
 							// ��������
 							if (workflowTemplate != null || !workflowTemplate.isEmpty()) {
-								CreateProcess(session, item, workflowTemplate);
+								CreateProcess(session, mRev, workflowTemplate);
 							}
 
 						}
@@ -795,7 +806,7 @@ public class MpartDialog extends JFrame implements ActionListener {
 			//System.out.println("Select User: " + user + "group===" + group);
 			String userName = "";
 			try {
-				userName = user.getUserName();
+				userName = user.getUserName()+"_"+user.getUserId();
 			} catch (TCException e1) {
 				// TODO Auto-generated catch block
 				MessageBox.post("��ѡ���û���", "��ʾ ", MessageBox.INFORMATION);