1、发送分类弹窗调整

2、提取属性值作为码段功能修改

src/cn/com/origin/autocode/common/operations/SendToIcsOperation.java

@@ -6,6 +6,7 @@ import com.teamcenter.rac.kernel.TCSession;
 import com.teamcenter.rac.kernel.TCUserService;
 import com.teamcenter.rac.util.MessageBox;
 
+@SuppressWarnings("deprecation")
 public class SendToIcsOperation {
 	private TCUserService userService;
 	private TCSession session = null;
@@ -38,7 +39,7 @@ public class SendToIcsOperation {
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
-			MessageBox.post("物料创建成功但发送分类出错!", "提示", MessageBox.INFORMATION);
+//			MessageBox.post("物料创建成功但发送分类出错!", "提示", MessageBox.INFORMATION);
 			return false;
 		}
 		return true;

src/cn/com/origin/autocode/newitem/generatcode/NewCodeItemDialog.java

@@ -2220,24 +2220,26 @@ public class NewCodeItemDialog extends Dialog {
 							CNProperty prop = cnpropList.get(j);
 							if(prop.getRealName().equals(vs[i])) {
 								Widget c = generalPropTextList.get(j);
+								String vss = "["+vs[i]+"]";
 								if(c instanceof Combo) {
-									idPattern = idPattern.replace("["+vs[i]+"]", ((Combo)c).getText());
+									idPattern = idPattern.replace(vss, ((Combo)c).getText());
+									finalPattern = finalPattern.replace(vss, ((Combo)c).getText());
 								}else if(c instanceof Text) {
-									idPattern = idPattern.replace("["+vs[i]+"]", ((Text)c).getText());
+									idPattern = idPattern.replace(vss, ((Text)c).getText());
+									finalPattern = finalPattern.replace(vss, ((Text)c).getText());
 								}
 								break;
 							}
 						}
 					}
-					System.out.println("idPattern:"+idPattern);
+					System.out.println("idPattern:" + idPattern);
 					if ((seqIndex == -1)) {
-						codeCounterName = idPattern + "$" + codeSeqLength + "$" + startValue + "$" + endValue + "$"
-								+ increaseStep;
+						codeCounterName = String.format("%s$%s$%s$%s$%s", seqValues, codeSeqLength, startValue, endValue, increaseStep);
 						counterID = seqPattern.replace(" ", "");
 						newID = idPattern.replace(" ", "");
 					} else {
-						codeCounterName = seqPattern + "$" + codeSeqLength + "$" + startValue + "$" + endValue + "$"
-								+ increaseStep;
+						seqPattern = idPattern;
+						codeCounterName = String.format("%s$%s$%s$%s$%s", seqPattern, codeSeqLength, startValue, endValue, increaseStep);
 						String newCodeNum = new GetCodeNumber().getCodeNumber(seqPattern, codeSeqLength, startValue,
 								endValue, increaseStep, excludeStr);
 						counterID = newCodeNum.replace(" ", "");

src/cn/com/origin/autocode/newitem/origin/ORCreateICOObject.java

@@ -121,6 +121,7 @@ public class ORCreateICOObject {
 					if (propComponent instanceof JTextField) {
 						value = ((JTextField) propComponent).getText();
 					} else if (propComponent instanceof JComboBox) {
+						@SuppressWarnings("rawtypes")
 						Object value1 = ((JComboBox) propComponent).getSelectedItem();
 						if (value1 == null) {
 							continue;
@@ -160,7 +161,7 @@ public class ORCreateICOObject {
 				if (flag) {
 					TCComponentICO[] icos = item.getClassificationObjects();
 					if ((icos != null) && (icos.length > 0)) {
-						Map attMap = item.getClassificationAttributes();
+						Map<String, String> attMap = item.getClassificationAttributes();
 						TCComponentICO ico1 = icos[0];
 						StringBuffer sb = new StringBuffer();