From 714d78b02cb1dfa7a385a4763d42c10617bc1250 Mon Sep 17 00:00:00 2001
From: lijh <lijh@connor.net.cn>
Date: Tue, 10 Mar 2026 11:33:01 +0800
Subject: [PATCH] 20260310

---
 .../std/processedit/commands/G4MDialog.java   |  2 +-
 .../std/processedit/ldy/GXDivisionDialog.java |  8 +++++++-
 .../ldy/ProcessDivisionDialog.java            |  9 +++++++++
 .../ldy/ProcessDivisionHandler.java           |  9 +++++++++
 .../ldy/ProcessMultiplexDialog.java           | 19 ++++++++++++++++--
 .../connor/std/processedit/ldy/TCUtil.java    |  6 ++++++
 .../newmeprocess/NewProcessDialog.java        |  6 +++---
 .../newmeprocess/PrefComponent.java           | 20 +++++++++++++++----
 .../std/processedit/util/PrefComponent.java   |  2 +-
 9 files changed, 69 insertions(+), 12 deletions(-)

diff --git a/src/cn/net/connor/std/processedit/commands/G4MDialog.java b/src/cn/net/connor/std/processedit/commands/G4MDialog.java
index c507b13..da0e0cd 100644
--- a/src/cn/net/connor/std/processedit/commands/G4MDialog.java
+++ b/src/cn/net/connor/std/processedit/commands/G4MDialog.java
@@ -186,7 +186,7 @@ public class G4MDialog extends AbstractAIFDialog {
 					
 					
 					
-					MessageBox.post("图纸引用成功！！！", "成功", MessageBox.INFORMATION);
+					MessageBox.post("引用成功！！！", "成功", MessageBox.INFORMATION);
 				} else {
 					MessageBox.post("选择的数据不是ICO对象", "", MessageBox.INFORMATION);
 					//     KUtil.info(G4MDialog.this, "选择的数据不是ICO对象");
diff --git a/src/cn/net/connor/std/processedit/ldy/GXDivisionDialog.java b/src/cn/net/connor/std/processedit/ldy/GXDivisionDialog.java
index 79173d8..5b768ac 100644
--- a/src/cn/net/connor/std/processedit/ldy/GXDivisionDialog.java
+++ b/src/cn/net/connor/std/processedit/ldy/GXDivisionDialog.java
@@ -35,6 +35,8 @@ import com.teamcenter.services.rac.core._2008_06.DataManagement.CreateIn;
 import com.teamcenter.services.rac.core._2008_06.DataManagement.CreateInput;
 import com.teamcenter.services.rac.core._2008_06.DataManagement.CreateResponse;
 
+import cn.net.connor.std.aifrcp.util.KUtil;
+
 public class GXDivisionDialog extends AbstractAIFDialog {
 	
 	/**
@@ -151,6 +153,7 @@ public class GXDivisionDialog extends AbstractAIFDialog {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				try {
+					KUtil.setByPassItk(session, true);
 					for(int i=0; i<table.getRowCount(); i++) {
 						String user = table.getValueAt(i, ld6_resperson).toString();
 						if(user.isEmpty() || !userMap.containsKey(user))
@@ -162,13 +165,16 @@ public class GXDivisionDialog extends AbstractAIFDialog {
 						compList.get(i)[1].setProperty("j6_resperson", user);//TODO  object_desc
 						sendMail("工序分工", "您好，此任务已经分配给您请及时完成", userMap.get(user), compList.get(i));
 					}
-					
+					KUtil.setByPassItk(session, false);
 					MessageBox.post(dialog, "分工完成", "INFO", MessageBox.INFORMATION);
 					dispose();
 				} catch (Exception e1) {
 					e1.printStackTrace();
 					MessageBox.post(dialog, "错误："+e1.getMessage(), "ERROR", MessageBox.ERROR);
+					KUtil.setByPassItk(session, false);
 					return;
+				}finally {
+					KUtil.setByPassItk(session, false);
 				}
 //				dialog.dispose();
 			}
diff --git a/src/cn/net/connor/std/processedit/ldy/ProcessDivisionDialog.java b/src/cn/net/connor/std/processedit/ldy/ProcessDivisionDialog.java
index 0c7e1ce..af834db 100644
--- a/src/cn/net/connor/std/processedit/ldy/ProcessDivisionDialog.java
+++ b/src/cn/net/connor/std/processedit/ldy/ProcessDivisionDialog.java
@@ -35,6 +35,8 @@ import com.teamcenter.services.rac.core._2008_06.DataManagement.CreateIn;
 import com.teamcenter.services.rac.core._2008_06.DataManagement.CreateInput;
 import com.teamcenter.services.rac.core._2008_06.DataManagement.CreateResponse;
 
+import cn.net.connor.std.aifrcp.util.KUtil;
+
 public class ProcessDivisionDialog extends AbstractAIFDialog {
 	
 	/**
@@ -133,6 +135,7 @@ public class ProcessDivisionDialog extends AbstractAIFDialog {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				try {
+					KUtil.setByPassItk(session, true);
 					int[] rows = table.getSelectedRows();
 					if(rows==null || rows.length==0) {
 						MessageBox.post(ProcessDivisionDialog.this, "请选择要分工的行", "ERROR", MessageBox.ERROR);
@@ -143,6 +146,8 @@ public class ProcessDivisionDialog extends AbstractAIFDialog {
 					e1.printStackTrace();
 					MessageBox.post(dialog, "错误："+e1.getMessage(), "ERROR", MessageBox.ERROR);
 					return;
+				}finally {
+					KUtil.setByPassItk(session, false);
 				}
 //				dialog.dispose();
 			}
@@ -151,6 +156,7 @@ public class ProcessDivisionDialog extends AbstractAIFDialog {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				try {
+					KUtil.setByPassItk(session, true);
 					for(int i=0; i<table.getRowCount(); i++) {
 						String user = table.getValueAt(i, ld6_resperson).toString();
 						if(user.isEmpty() || !userMap.containsKey(user))
@@ -169,8 +175,11 @@ public class ProcessDivisionDialog extends AbstractAIFDialog {
 					e1.printStackTrace();
 					MessageBox.post(dialog, "错误："+e1.getMessage(), "ERROR", MessageBox.ERROR);
 					return;
+				}finally {
+					KUtil.setByPassItk(session, false);
 				}
 //				dialog.dispose();
+				
 			}
 		});
 		
diff --git a/src/cn/net/connor/std/processedit/ldy/ProcessDivisionHandler.java b/src/cn/net/connor/std/processedit/ldy/ProcessDivisionHandler.java
index 163c6c4..986de53 100644
--- a/src/cn/net/connor/std/processedit/ldy/ProcessDivisionHandler.java
+++ b/src/cn/net/connor/std/processedit/ldy/ProcessDivisionHandler.java
@@ -14,6 +14,9 @@ import com.teamcenter.rac.aif.kernel.InterfaceAIFComponent;
 import com.teamcenter.rac.aifrcp.AIFUtility;
 import com.teamcenter.rac.kernel.TCComponent;
 import com.teamcenter.rac.kernel.TCComponentBOMLine;
+import com.teamcenter.rac.kernel.TCComponentBOMWindow;
+import com.teamcenter.rac.kernel.TCComponentBOMWindowType;
+import com.teamcenter.rac.kernel.TCComponentItemRevision;
 import com.teamcenter.rac.kernel.TCSession;
 import com.teamcenter.rac.util.MessageBox;
 
@@ -33,6 +36,12 @@ public class ProcessDivisionHandler extends AbstractHandler implements IHandler{
 			for (InterfaceAIFComponent comp : targetComponents) {
 			    if (comp instanceof TCComponentBOMLine) {
 			        tcList.add((TCComponentBOMLine) comp);
+			    }else if(comp instanceof TCComponentItemRevision){
+			    	TCComponentItemRevision revision = (TCComponentItemRevision)comp;
+					TCComponentBOMWindowType bomWinType = (TCComponentBOMWindowType) session.getTypeComponent("BOMWindow");
+					TCComponentBOMWindow window = bomWinType.create(null);
+					TCComponentBOMLine newBom = window.setWindowTopLine(null, revision, null, null);
+					tcList.add(newBom);
 			    }
 			    // 可选：记录非 TCComponent 对象用于调试
 			    // else { System.out.println("跳过非TCComponent对象: " + comp); }
diff --git a/src/cn/net/connor/std/processedit/ldy/ProcessMultiplexDialog.java b/src/cn/net/connor/std/processedit/ldy/ProcessMultiplexDialog.java
index 8b7b280..009fc4e 100644
--- a/src/cn/net/connor/std/processedit/ldy/ProcessMultiplexDialog.java
+++ b/src/cn/net/connor/std/processedit/ldy/ProcessMultiplexDialog.java
@@ -336,8 +336,23 @@ public class ProcessMultiplexDialog extends AbstractAIFDialog {
 							valueV.add(text);
 						}
 					}
-					TCComponent[] result = TCUtil.query(session, queryName, keyV, valueV);
-					System.out.println("result:"+result.length);
+					
+					//keyV.add("active_seq");
+					//valueV.add("0");
+					System.out.println("queryName==="+queryName);
+					System.out.println(keyV.toString());
+					System.out.println(valueV.toString());
+					
+					
+					
+					TCComponent[] result = session.search(queryName, keyV.toArray(new String[0]), valueV.toArray(new String[0]));
+					
+					System.out.println("result=="+result.length);
+					
+					
+					 //result = TCUtil.query(session, queryName, keyV, valueV);
+					//System.out.println("result:"+result.length);
+
 					if(result.length==0) {
 						MessageBox.post(dialog, "没有符合条件的工艺，请检查查询条件", "ERROR", MessageBox.ERROR);
 						return;
diff --git a/src/cn/net/connor/std/processedit/ldy/TCUtil.java b/src/cn/net/connor/std/processedit/ldy/TCUtil.java
index f086dfa..901f37c 100644
--- a/src/cn/net/connor/std/processedit/ldy/TCUtil.java
+++ b/src/cn/net/connor/std/processedit/ldy/TCUtil.java
@@ -10,6 +10,7 @@ import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -225,6 +226,11 @@ public class TCUtil {
 			valueA[i] = Vals.get(i);
 			System.out.println(keyA[i] + ":" + valueA[i]);
 		}
+		
+		
+		System.out.println("keyA=="+Arrays.toString(keyA));
+		System.out.println("valueA=="+Arrays.toString(valueA));
+		
 		TCComponentContextList componentContextList = imancomponentquery.getExecuteResultsList(keyA, valueA);
 		return componentContextList.toTCComponentArray();
 	}
diff --git a/src/cn/net/connor/std/processedit/newmeprocess/NewProcessDialog.java b/src/cn/net/connor/std/processedit/newmeprocess/NewProcessDialog.java
index 8d71dd4..ac7a93a 100644
--- a/src/cn/net/connor/std/processedit/newmeprocess/NewProcessDialog.java
+++ b/src/cn/net/connor/std/processedit/newmeprocess/NewProcessDialog.java
@@ -75,11 +75,11 @@ public class NewProcessDialog extends KDialog {
 	@Override
 	protected void initUI() {
 		this.setTitle(REG.getString("newprocess.TITLE"));
-		this.setPreferredSize(new Dimension(800, 780));
-		this.setMinimumSize(new Dimension(800, 700));
+		this.setPreferredSize(new Dimension(1000, 770));
+		this.setMinimumSize(new Dimension(1000, 770));
 		this.setLayout(new BorderLayout());
 		JSplitPane pane = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
-		pane.setResizeWeight(0.6);
+		pane.setResizeWeight(0.8);
 		pane.setTopComponent(initProcPanel());
 		pane.setBottomComponent(initItemPanel());
 		pane.setBorder(null);
diff --git a/src/cn/net/connor/std/processedit/newmeprocess/PrefComponent.java b/src/cn/net/connor/std/processedit/newmeprocess/PrefComponent.java
index 656bbfc..c38090e 100644
--- a/src/cn/net/connor/std/processedit/newmeprocess/PrefComponent.java
+++ b/src/cn/net/connor/std/processedit/newmeprocess/PrefComponent.java
@@ -53,7 +53,10 @@ import cn.net.connor.std.processedit.util.TwoColumnRenderer;
 
 public class PrefComponent {
 	
-	
+	private static final int INPUT_FIELD_WIDTH = 200; // 像素
+	private static final int INPUT_FIELD_HEIGHT = 30;
+	private static final int TEXT_AREA_ROWS = 8;
+	private static final int TEXT_AREA_COLS = 38; // 约等于 300px 宽度
 	public boolean isLovParent = false;
 	public boolean isLovChild = false;
 	
@@ -517,7 +520,8 @@ public class PrefComponent {
 		        comboBox.insertItemAt(null, 0);
 		       comboBox.setSelectedIndex(0);
 				comboBox.setEditable(true);
-		        
+				comboBox.setPreferredSize(new Dimension(INPUT_FIELD_WIDTH, INPUT_FIELD_HEIGHT));
+				comboBox.setMaximumSize(new Dimension(INPUT_FIELD_WIDTH, INPUT_FIELD_HEIGHT * 2)); // 防止过高
 		        
 		        for (int i = 0; i < len; i++) {
 		            OptionItem optionItem = new OptionItem(displayLov[i], descriptions[i]);
@@ -527,6 +531,8 @@ public class PrefComponent {
 		        }
 		        
 				this.bigJtf = ((JTextField)this.comboBox.getEditor().getEditorComponent());
+				 bigJtf.setPreferredSize(new Dimension(INPUT_FIELD_WIDTH - 20,
+				 INPUT_FIELD_HEIGHT - 4)); 
 			    this.bigJtf.addKeyListener(new KeyListener()
 			    {
 			      public void keyTyped(KeyEvent e) {}
@@ -587,10 +593,15 @@ public class PrefComponent {
 
 		    } else {
 		        if (isTextArea) {
-		            textArea = new iTextArea(8, 18);
-		            textArea.setBorder(BorderFactory.createLineBorder(Color.BLACK));
+		        	textArea = new iTextArea(TEXT_AREA_ROWS, TEXT_AREA_COLS);
+		            textArea.setBorder(BorderFactory.createLineBorder(Color.GRAY));
 		            textArea.setLineWrap(true);
 		            textArea.setWrapStyleWord(true);
+		            
+		        	textArea.setPreferredSize(new Dimension(INPUT_FIELD_WIDTH, 
+			        	    TEXT_AREA_ROWS * INPUT_FIELD_HEIGHT + 10)); // 留点边距
+
+		            
 		            textArea.addFocusListener(new FocusAdapter() {
 		                public void focusGained(FocusEvent e) {
 		                    SwingTextContextActivator.instance().activateContext();
@@ -605,6 +616,7 @@ public class PrefComponent {
 
 		        } else {
 		            textField = new iTextField(textLength > 0 ? textLength : 12);
+		            textField.setPreferredSize(new Dimension(INPUT_FIELD_WIDTH, INPUT_FIELD_HEIGHT));
 		            KUtil.addCol(panel, textField, gbc, 1, 1);
 		        }
 
diff --git a/src/cn/net/connor/std/processedit/util/PrefComponent.java b/src/cn/net/connor/std/processedit/util/PrefComponent.java
index d882f40..895a145 100644
--- a/src/cn/net/connor/std/processedit/util/PrefComponent.java
+++ b/src/cn/net/connor/std/processedit/util/PrefComponent.java
@@ -586,7 +586,7 @@ public class PrefComponent {
 			} else {
 				if (isTextArea) {
 					textArea = new iTextArea(8, 18);
-					 textArea.setBorder(BorderFactory.createLineBorder(Color.BLACK));
+					 textArea.setBorder(BorderFactory.createLineBorder(Color.GRAY));
 					textArea.setLineWrap(true);
 					textArea.addFocusListener(new FocusAdapter() {
 						public void focusGained(FocusEvent param1FocusEvent) {