Merge pull request '修改一些bug' (#8) from zouxk into master

Reviewed-on: http://plmserver.cn:3000/jd/com.connor.jd.plm/pulls/8
main
邹旭科 5 years ago
commit 5dc4b591c7

@ -12,7 +12,7 @@
<classpathentry kind="lib" path="lib/commons-math3-3.6.1.jar"/>
<classpathentry kind="lib" path="lib/datepicker.jar"/>
<classpathentry kind="lib" path="lib/fastjson-1.2.9.jar"/>
<classpathentry kind="lib" path="lib/hutool-all-5.0.7.jar"/>
<classpathentry kind="lib" path="lib/hutool-all-5.0.7.jar" sourcepath="C:/Users/5RKB5B~1/AppData/Local/Temp/.org.sf.feeling.decompiler1604022865349/source/hutool-all-5.0.7-sources-1604023924461.jar"/>
<classpathentry kind="lib" path="lib/jaxb-api-2.3.1.jar"/>
<classpathentry kind="lib" path="lib/jaxb-core-2.3.0.1.jar"/>
<classpathentry kind="lib" path="lib/jaxb-impl-2.3.2.jar"/>

@ -202,7 +202,7 @@
<command categoryId="JDProject.commands.category" name="测试项维护" id="JD2_CSXWH"></command>
<command categoryId="JDProject.commands.category" name="DBOM转EBOM" id="dbomtoebom"></command>
<command categoryId="JDProject.commands.category" name="回料BOM新增" id="ADD_HLBOM"></command>
<command categoryId="JDProject.commands.category" name="删除版本" id="deleteItemRevision"></command>
<command categoryId="JDProject.commands.category" name="删除物料 图纸版本" id="deleteItemRevision"></command>
<command categoryId="JDProject.commands.category" name="批量升版" id="batchRevise"></command>
<command categoryId="JDProject.commands.category" name="BOM管理" id="BOMManagement "></command>
@ -696,7 +696,7 @@
<command
commandId="deleteItemRevision"
mnemonic="S"
label="删除版本"
label="删除物料或图纸版本"
id="com.connor.jd.deleteItemRevision">
<visibleWhen>true</visibleWhen>
</command>

@ -11,7 +11,6 @@ import com.teamcenter.rac.aif.kernel.InterfaceAIFComponent;
import com.teamcenter.rac.kernel.TCComponent;
import com.teamcenter.rac.kernel.TCComponentItem;
import com.teamcenter.rac.kernel.TCComponentItemRevision;
import com.teamcenter.rac.kernel.TCException;
import com.teamcenter.rac.kernel.TCProperty;
import com.teamcenter.rac.kernel.TCSession;
import com.teamcenter.rac.util.MessageBox;
@ -30,56 +29,98 @@ public class DeleteItemRevisionAction extends AbstractAIFAction {
// TODO Auto-generated method stub
TCSession session = (TCSession) app.getSession();
InterfaceAIFComponent[] targets = app.getTargetComponents();
String[] allow = JDMethodUtil.getPrefStrArray("jd2_wltz_Revise_allow", session);
System.out.println(Arrays.toString(allow));
String[] allow = JDMethodUtil.getPrefStrArray("connor_wl_type", session);
String[] allow2 = JDMethodUtil.getPrefStrArray("connor_tz_type", session);
String[] allow3 = JDMethodUtil.getPrefStrArray("jd2_wltz_Revise_allow", session);
System.out.println("connor_wl_type===>" + Arrays.toString(allow));
System.out.println("connor_tz_type===>" + Arrays.toString(allow2));
System.out.println("jd2_wltz_Revise_allow===>" + Arrays.toString(allow3));
List<String> pref = Arrays.asList(allow);
List<String> pref2 = Arrays.asList(allow2);
List<String> pref3 = Arrays.asList(allow3);
for (InterfaceAIFComponent target : targets) {
System.out.println(target.getType());
if (target instanceof TCComponentItemRevision && pref.contains(target.getType())) {
if (target instanceof TCComponentItemRevision) {
if (!pref.contains(target.getType()) && !pref2.contains(target.getType())
&& !pref3.contains(target.getType())) {
try {
MessageBox.post(target.getProperty("object_string") + "既不是物料也不是图纸,不执行删除", "提示",
MessageBox.WARNING);
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
return;
}
TCComponentItemRevision rev = (TCComponentItemRevision) target;
try {
String loginUser = session.getUser().getProperty("object_string");
String owningUser = rev.getProperty("owning_user");
System.out.println("loginUser===>" + loginUser);
System.out.println("owningUser===>" + owningUser);
if (loginUser.equals(owningUser)) {
// String owningUser = rev.getProperty("owning_user");
// System.out.println("loginUser===>" + loginUser);
// System.out.println("owningUser===>" + owningUser);
boolean[] isAccess = session.getTCAccessControlService().checkPrivileges(rev.getItem(),
new String[] { "WRITE", "DELETE" });
if (isAccess[0] && isAccess[1]) {
TCComponentItem item = rev.getItem();
TCComponent[] released = item.getReleasedItemRevisions();
for (TCComponent comp : released) {
if (comp.getUid().equals(rev.getUid())) {
MessageBox.post("无法删除,物料已经发布", "提示", MessageBox.WARNING);
MessageBox.post(target.getProperty("object_string") + "无法删除,物料已经发布", "提示",
MessageBox.WARNING);
return;
}
}
if (!loginUser.equals(item.getProperty("owning_user"))) {
session.getUserService().call("bs_bypass", new Object[] { true });
System.out.println("rev uid===>" + rev.getUid());
AIFComponentContext[] aifs = rev.whereReferenced();
for (AIFComponentContext aif : aifs) {
if (aif.getComponent() instanceof TCComponentItemRevision) {
TCComponentItemRevision temp = (TCComponentItemRevision) aif.getComponent();
if (aif.getComponent() instanceof TCComponent) {
TCComponent temp = (TCComponent) aif.getComponent();
if (temp.getUid().equals(rev.getItem().getUid())) {
System.out.println("跳过对象");
continue;
}
System.out.println("引用者===>" + temp.getProperty("onject_string"));
TCProperty[] tcProps = temp.getAllTCProperties();
for (TCProperty tcProp : tcProps) {
if (tcProp.isReferenceType()) {
if (tcProp.isNotArray()) {
if (tcProp.getReferenceValue() != null
&& tcProp.getReferenceValue().getUid().equals(rev.getUid())) {
System.out.println("关系===>" + tcProp.getPropertyName());
temp.cutOperation(tcProp.getPropertyName(), new TCComponent[] { rev });
}
} else {
TCComponent[] comps = tcProp.getReferenceValueArray();
for (TCComponent comp : comps) {
if (comp.getUid().equals(rev.getUid())) {
temp.cutOperation(tcProp.getPropertyName(), new TCComponent[] { rev });
System.out.println("关系===>" + tcProp.getPropertyName());
temp.cutOperation(tcProp.getPropertyName(),
new TCComponent[] { rev });
}
}
}
} else {
rev.delete();
}
}
session.getUserService().call("bs_bypass", new Object[] { false });
}
}
} catch (TCException e) {
// if (pref.contains(target.getType())) {
// rev.cutOperation("TC_Is_Represented_By", rev.getRelatedComponents("TC_Is_Represented_By"));
// } else {
// rev.cutOperation("representation_for", rev.getRelatedComponents("representation_for"));
// }
rev.delete();
session.getUserService().call("bs_bypass", new Object[] { false });
MessageBox.post("删除成功", "提示", MessageBox.WARNING);
} else {
MessageBox.post(target.getProperty("object_string") + "无修改和删除权限", "提示", MessageBox.WARNING);
}
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
}
}
}

@ -123,12 +123,23 @@ public class WLTZReviseAction extends AbstractAIFAction {
// break;
// }
// }
boolean isAccess = session.getTCAccessControlService().checkPrivilege(rev.getItem(), "WRITE");
if (!isAccess) {
MessageBox.post("ÎÞȨÏÞ", "Ìáʾ", MessageBox.WARNING);
// boolean isAccess = session.getTCAccessControlService().checkPrivilege(rev.getItem(), "WRITE");
// if (!isAccess) {
// MessageBox.post("无权限", "提示", MessageBox.WARNING);
// return;
// }
String loginUser = session.getUser().getProperty("object_string");
String owningUser = rev.getProperty("owning_user");
System.out.println("loginUser===>" + loginUser);
System.out.println("owningUser===>" + owningUser);
TCComponentItemRevision newRev = null;
if (!loginUser.equals(owningUser)) {
System.out.println("非所有者请走升版审批流程!");
MessageBox.post("非所有者请走升版审批流程!", "提示", MessageBox.WARNING);
return;
}
TCComponentItemRevision newRev = rev.saveAs(rev.getItem().getNewRev());
} else {
session.getUserService().call("bs_bypass", new Object[] { true });
newRev = rev.saveAs(rev.getItem().getNewRev());
if (target instanceof TCComponentBOMLine) {
TCComponentBOMLine bomLine = (TCComponentBOMLine) target;
if (bomLine.parent() != null) {
@ -140,6 +151,8 @@ public class WLTZReviseAction extends AbstractAIFAction {
new InterfaceAIFComponent[] { newRev });
}
}
session.getUserService().call("bs_bypass", new Object[] { false });
}
if (rev.getClassificationClass() == null || "".equals(rev.getClassificationClass())) {
MessageBox.post("Éý°æ³É¹¦", "Ìáʾ", MessageBox.WARNING);
// if (getPrivilege) {
@ -159,6 +172,10 @@ public class WLTZReviseAction extends AbstractAIFAction {
System.out.println("success");
return;
}
if (newRev == null) {
MessageBox.post("未知异常", "错误", MessageBox.ERROR);
return;
}
TCComponentICO ico = rev.getClassificationObjects()[0];
ICSProperty[] oldICSProps = ico.getICSProperties(true);
int[] ids = new int[oldICSProps.length];

@ -22,6 +22,7 @@ import javax.swing.JTextField;
import com.connor.jd.plm.beans.ClassPropBean;
import com.connor.jd.plm.utils.ExcelInfoScanner;
import com.connor.jd.plm.utils.JDMethodUtil;
import com.connor.jd.plm.utils.StringCreateUtil;
import com.teamcenter.rac.aif.AbstractAIFApplication;
import com.teamcenter.rac.aif.AbstractAIFDialog;
import com.teamcenter.rac.aifrcp.AIFUtility;
@ -40,11 +41,11 @@ import com.teamcenter.rac.util.MessageBox;
import cn.hutool.json.JSONObject;
public class EditClassificationDialog extends AbstractAIFDialog {
/**
*
*
*/
public class EditClassificationDialog extends AbstractAIFDialog {
private static final long serialVersionUID = 1L;
private AbstractAIFApplication app;
private TCSession session;
@ -56,6 +57,7 @@ public class EditClassificationDialog extends AbstractAIFDialog {
private int[] ids;
private String[] values;
private String[] names;
private boolean finished;
public EditClassificationDialog(AbstractAIFApplication app) throws TCException {
this.app = app;
@ -209,8 +211,25 @@ public class EditClassificationDialog extends AbstractAIFDialog {
@Override
public void actionPerformed(ActionEvent e) {
// TODO Auto-generated method stub
((JButton) e.getSource()).setEnabled(false);
rev = (TCComponentItemRevision) target;
new Thread(new Runnable() {
@Override
public void run() {
// TODO Auto-generated method stub
int i = 1;
while (!DIALOG.finished) {
try {
DIALOG.setTitle("正在修改分类属性 " + StringCreateUtil.createPoint(i++ % 3));
Thread.sleep(200);
} catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
}
}).start();
saveClassification(rev);
// try {
// System.out.println(rev.getProperty("object_string"));
@ -229,7 +248,6 @@ public class EditClassificationDialog extends AbstractAIFDialog {
// // TODO Auto-generated catch block
// e1.printStackTrace();
// }
DIALOG.disposeDialog();
}
};
}
@ -349,6 +367,7 @@ public class EditClassificationDialog extends AbstractAIFDialog {
rev.setProperty("jd2_flfh", temp);
rev.save();
rev.unlock();
rev.refresh();
// session.getUserService().call("bs_bypass", new Object[] { false });
break;
}
@ -360,6 +379,8 @@ public class EditClassificationDialog extends AbstractAIFDialog {
JOptionPane.WARNING_MESSAGE);
return;
}
DIALOG.finished = true;
DIALOG.disposeDialog();
JOptionPane.showMessageDialog(null, "Ð޸ķÖÀà³É¹¦", "Ìáʾ", JOptionPane.WARNING_MESSAGE);
System.out.println("success");
}

@ -74,7 +74,7 @@ public class CSJHForm extends AbstractRendering {
private JLabel label3;
private List<Integer> editable = new ArrayList<Integer>();
private Map<String, JG> res;
private Map<Integer, String> rowNo;
private Map<Integer, String> rowNo;// 真实编号
private JTable table;
private boolean againAllow;
@ -724,9 +724,11 @@ public class CSJHForm extends AbstractRendering {
temp[15] = (String) model.getValueAt(table.getSelectedRow(), 15);
model.insertRow(table.getSelectedRow() + 1, temp);
for (int i = table.getSelectedRow() + 1; i < model.getRowCount(); i++) {
model.setValueAt(String.valueOf(num++), i, 0);
}
for (int i = model.getRowCount(); i > table.getSelectedRow(); i--) {
rowNo.put(i, rowNo.get(i - 1));
}
Double allcost2 = 0.0;
for (int i = 0; i < model.getRowCount(); i++) {
String value = (String) model.getValueAt(i, 7);
@ -746,8 +748,6 @@ public class CSJHForm extends AbstractRendering {
res.get(entry.getKey()).setRow(entry.getValue().getRow() + 1);
}
}
rowNo.put(table.getSelectedRow() + 1, rowNo.get(table.getSelectedRow()));
});
table.addMouseListener(new MouseAdapter() {

@ -10,7 +10,11 @@ import java.awt.ScrollPane;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import javax.swing.BorderFactory;
import javax.swing.JButton;
@ -28,6 +32,7 @@ import com.connor.jd.plm.table.MyCellEditor4;
import com.connor.jd.plm.table.TCTableUtil;
import com.connor.jd.plm.utils.DBUtil;
import com.teamcenter.rac.aifrcp.AIFUtility;
import com.teamcenter.rac.kernel.TCComponent;
import com.teamcenter.rac.kernel.TCComponentForm;
import com.teamcenter.rac.kernel.TCComponentItem;
import com.teamcenter.rac.kernel.TCComponentItemRevision;
@ -36,35 +41,27 @@ import com.teamcenter.rac.kernel.TCException;
import com.teamcenter.rac.kernel.TCSession;
import com.teamcenter.rac.util.MessageBox;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.db.Db;
import cn.hutool.db.Entity;
public class ComponentTestFrame extends JFrame {
private CTMap model;
private CTable table;
private List<Entity> list;
private int bottom;
private Container container;
private TCComponentForm form;
private TCSession session;
private MyCallBack callBack;
private String itemId;
private String[] colNames = new String[] { "jd2_no", "jd2_wtry", "jd2_syxm", "jd2_syzq", "jd2_syts", "jd2_syfy",
"jd2_sycs" };
private TCComponentForm testForm;
private static ComponentTestFrame instance;
public static ComponentTestFrame getInstance(TCComponentForm form, MyCallBack callBack) {
if (instance == null) {
instance = new ComponentTestFrame(form);
instance.callBack = callBack;
} else {
instance.bottom = 0;
instance.form = form;
instance.callBack = callBack;
instance.init();
}
return instance;
}
private ComponentTestFrame(TCComponentForm form) {
public ComponentTestFrame(Object itemId, TCComponentForm form, MyCallBack callBack) {
this.itemId = StrUtil.toString(itemId);
this.callBack = callBack;
this.form = form;
this.session = (TCSession) AIFUtility.getCurrentApplication().getSession();
this.init();
@ -82,7 +79,7 @@ public class ComponentTestFrame extends JFrame {
container.setPreferredSize(new Dimension(600, 400));
model = new CTMap(10, 7);
model.setValueAt("ÐòºÅ", 0, 0);
model.setValueAt("编号", 0, 0);
model.setValueAt("部品类型", 0, 1);
model.setValueAt("试验项目", 0, 2);
model.setValueAt("试验时间", 0, 3);
@ -142,23 +139,18 @@ public class ComponentTestFrame extends JFrame {
table.getColumnModel().getColumn(6).setCellEditor(new MyCellEditor4(new JTextField()));
// 填写数据
Map<String, String[]> dataMap = new LinkedHashMap<>();
try {
list = Db.use(DBUtil.getDataSource(session)).findAll("JD2_COMPONENT");
bottom = list.size();
for (int i = 0; i < bottom; i++) {
if (i > model.getRowCount() - 2) {
model.addRow();
}
int row = i + 1;
model.setValueAt(row, row, 0);
model.setValueAt(list.get(i).getStr("TEST_TYPE"), row, 1);
model.setValueAt(list.get(i).getStr("TEST_PROJECT"), row, 2);
model.setValueAt(list.get(i).getStr("TEST_TIME"), row, 3);
model.setValueAt(list.get(i).getInt("TEST_NUM"), row, 4);
model.setValueAt(list.get(i).getInt("TEST_COST"), row, 5);
model.setValueAt(new JCheckBox(), row, 6);
System.out.println(list.get(i).toString());
List<Entity> list = Db.use(DBUtil.getDataSource(session)).findAll("JD2_COMPONENT");
for (int i = 0; i < list.size(); i++) {
String[] rowData = new String[6];
rowData[0] = list.get(i).getStr("TEST_ID");
rowData[1] = list.get(i).getStr("TEST_TYPE");
rowData[2] = list.get(i).getStr("TEST_PROJECT");
rowData[3] = list.get(i).getStr("TEST_TIME");
rowData[4] = list.get(i).getInt("TEST_NUM") + "";
rowData[5] = list.get(i).getInt("TEST_COST") == null ? "0" : list.get(i).getInt("TEST_COST") + "";
dataMap.put(rowData[0], rowData);
}
} catch (Exception e) {
// TODO Auto-generated catch block
@ -166,10 +158,57 @@ public class ComponentTestFrame extends JFrame {
e.printStackTrace();
return;
}
List<String> checkedId = new ArrayList<>();
if (StrUtil.isNotBlank(itemId)) {
try {
TCComponent[] res = session.search("Item ID", new String[] { "零组件 ID" }, new String[] { itemId });
if (ArrayUtil.isNotEmpty(res) && "JD2_GTCSJH".equals(res[0].getType())) {
TCComponentItemRevision resRev = ((TCComponentItem) res[0]).getLatestItemRevision();
TCComponent[] forms = resRev.getRelatedComponents("IMAN_master_form_rev");
testForm = (TCComponentForm) forms[0];
String[][] rowDatas = TCTableUtil.getTableRows(testForm, "jd2_csjh", colNames);
for (int i = 0; i < rowDatas.length; i++) {
checkedId.add(rowDatas[i][0]);
String[] rowData = new String[6];
rowData[0] = rowDatas[i][0];
rowData[1] = "自定义测试项";
rowData[2] = rowDatas[i][2];
rowData[3] = rowDatas[i][3];
rowData[4] = rowDatas[i][4];
rowData[5] = rowDatas[i][5];
dataMap.put(rowDatas[i][0], rowData);
}
}
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
bottom = dataMap.size();
int row = 1;
for (Entry<String, String[]> entry : dataMap.entrySet()) {
if (row > model.getRowCount() - 1) {
model.addRow();
}
model.setValueAt(entry.getValue()[0], row, 0);
model.setValueAt(entry.getValue()[1], row, 1);
model.setValueAt(entry.getValue()[2], row, 2);
model.setValueAt(entry.getValue()[3], row, 3);
model.setValueAt(entry.getValue()[4], row, 4);
model.setValueAt(entry.getValue()[5], row, 5);
if (checkedId.contains(entry.getValue()[0])) {
JCheckBox tempCheck = new JCheckBox();
tempCheck.setSelected(true);
model.setValueAt(tempCheck, row, 6);
} else {
model.setValueAt(new JCheckBox(), row, 6);
}
row++;
}
// 按钮
JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
JButton createTest = new JButton("´´½¨²âÊԼƻ®");
JButton createTest = new JButton("创建/更新测试计划");
createTest.addActionListener(createTest());
JButton addTestItem = new JButton("新增测试项");
addTestItem.addActionListener(addTestItem());
@ -195,31 +234,77 @@ public class ComponentTestFrame extends JFrame {
public void actionPerformed(ActionEvent e) {
// TODO Auto-generated method stub
try {
TCComponentItemRevision rev = (TCComponentItemRevision) form.whereReferenced()[0].getComponent();
if (testForm != null) {// 更新
String[] propNames = new String[] { "jd2_no", "jd2_syxh", "jd2_symd", "jd2_wtry", "jd2_syxm",
"jd2_syts", "jd2_syzq", "jd2_syfy", "jd2_jhrc", "jd2_jhrc1", "jd2_sjrc", "jd2_sjrc1",
"jd2_syzt", "jd2_syjg", "jd2_sycs", "jd2_syry", "jd2_csbg", "jd2_bz" };
List<Map<String, String>> oldRowData = TCTableUtil.getTableMapList(testForm, "jd2_csjh",
propNames);
List<String> selectedNo = new ArrayList<>();
for (int i = 1; i <= bottom; i++) {
JCheckBox jb = (JCheckBox) model.getValueAt(i, 6);
if (jb.isSelected()) {
String no = model.getValueAt(i, 0).toString();
selectedNo.add(no);
boolean isInclude = false;
for (int ii = 0; ii < oldRowData.size(); ii++) {// 修改
if (no.equals(oldRowData.get(ii).get("jd2_no"))) {
isInclude = true;
oldRowData.get(ii).put("jd2_syxm", model.getValueAt(i, 2).toString());
oldRowData.get(ii).put("jd2_syzq", model.getValueAt(i, 3).toString());
oldRowData.get(ii).put("jd2_syts", model.getValueAt(i, 4).toString());
oldRowData.get(ii).put("jd2_syfy", model.getValueAt(i, 5).toString());
}
}
if (!isInclude) {// 新增
Map<String, String> tempMap = new HashMap<String, String>();
tempMap.put("jd2_no", no);
tempMap.put("jd2_wtry", form.getTCProperty("owning_user").getUIFValue());
tempMap.put("jd2_syxm", model.getValueAt(i, 2).toString());
tempMap.put("jd2_syzq", model.getValueAt(i, 3).toString());
tempMap.put("jd2_syts", model.getValueAt(i, 4).toString());
tempMap.put("jd2_syfy", model.getValueAt(i, 5).toString());
oldRowData.add(tempMap);
}
}
}
for (int i = 0; i < oldRowData.size(); i++) {// 删除
if (!selectedNo.contains(oldRowData.get(i).get("jd2_no"))) {
oldRowData.remove(i);
i--;
}
}
TCTableUtil.setTableMapList(testForm, "jd2_csjh", "JD2_CSJHTABLE", oldRowData);
callBack.execute(itemId);
} else {// 创建
TCComponentItemRevision rev = (TCComponentItemRevision) form.whereReferenced()[0]
.getComponent();
TCComponentItemType type = (TCComponentItemType) session.getTypeComponent("Item");
TCComponentItem item = type.create(null, null, "JD2_GTCSJH", "测试计划", "", null);
rev.add("JD2_CSJH", item);
TCComponentItemRevision rev1 = item.getLatestItemRevision();
TCComponentForm form1 = (TCComponentForm) rev1.getRelatedComponents("IMAN_master_form_rev")[0];
String[] colNames = new String[] { "jd2_no", "jd2_wtry", "jd2_syxm", "jd2_syts", "jd2_syzq",
"jd2_syfy", "jd2_sycs" };
List<String[]> list = new ArrayList<String[]>();
String[] row = new String[7];
for (int i = 1; i <= bottom; i++) {
JCheckBox jb = (JCheckBox) model.getValueAt(i, 6);
if (jb.isSelected()) {
for (int ii = 2; ii < 6; ii++) {
row[ii - 2] = model.getValueAt(i, ii) == null ? "" : model.getValueAt(i, ii).toString();
row[ii - 2] = model.getValueAt(i, ii) == null ? ""
: model.getValueAt(i, ii).toString();
}
// TCComponentPerson p = (TCComponentPerson) session.getUser().getUserInformation().get(0);
list.add(new String[] { i + "", form.getTCProperty("owning_user").getUIFValue(), row[0],
row[2], row[1], row[3], "1" });
list.add(new String[] { model.getValueAt(i, 0).toString(),
form.getTCProperty("owning_user").getUIFValue(), row[0], row[1], row[2], row[3],
"1" });
}
}
String[][] data = list.toArray(new String[list.size()][7]);
TCTableUtil.setTableRows(form1, "jd2_csjh", "JD2_CSJHTABLE", colNames, data);
callBack.execute(item.getProperty("item_id"));
}
dispose();
} catch (TCException e1) {
// TODO Auto-generated catch block
@ -238,10 +323,7 @@ public class ComponentTestFrame extends JFrame {
if (bottom > model.getRowCount() - 2) {
model.addRow();
}
int num = 1;
if (bottom > 0) {
num = Integer.parseInt(model.getValueAt(bottom, 0).toString());
}
int num = Math.max(Integer.parseInt(model.getValueAt(bottom, 0).toString()), 10000);
model.setValueAt(num + 1, ++bottom, 0);
model.setValueAt(new JCheckBox(), bottom, 6);
}

@ -30,6 +30,7 @@ import com.connor.jd.plm.table.CTable;
import com.connor.jd.plm.table.JCheckPanel;
import com.connor.jd.plm.table.MyCellEditor3;
import com.connor.jd.plm.table.TCTableUtil;
import com.teamcenter.rac.aif.kernel.AIFComponentContext;
import com.teamcenter.rac.kernel.TCComponent;
import com.teamcenter.rac.kernel.TCComponentForm;
import com.teamcenter.rac.kernel.TCException;
@ -261,8 +262,12 @@ public class ExperimentalPowerOfAttorneyForm extends AbstractRendering implement
// ÊôÐÔÓ³Éä
try {
model.setValueAt(form.whereReferencedByTypeRelation(new String[] { "ItemRevision" },
new String[] { "IMAN_master_form_rev" })[0].getComponent().getProperty("item_id"), 0, 9);
AIFComponentContext[] refs = form.whereReferenced();
for (AIFComponentContext aif : refs) {
if (aif.getComponent().getType().equals("JD2_GTSYWTSRevision")) {
model.setValueAt(aif.getComponent().getProperty("item_id"), 0, 9);
}
}
model.setValueAt(form.getProperty("creation_date"), 1, 9);
} catch (Exception e) {
// TODO Auto-generated catch block
@ -547,7 +552,14 @@ public class ExperimentalPowerOfAttorneyForm extends AbstractRendering implement
@Override
public void actionPerformed(ActionEvent e) {
// TODO Auto-generated method stub
ComponentTestFrame.getInstance(form, $this);
new Thread(new Runnable() {
@Override
public void run() {
// TODO Auto-generated method stub
new ComponentTestFrame(model.getValueAt(table.getSelectedRow(), 9), form, $this);
}
}).start();
}
};

@ -630,13 +630,25 @@ public class SampleConfirmationForm extends AbstractRendering {
model2.setValueAt(tableRows[i][ii], i + 1, ii + 2);
if (i == 1) {
if (!"".equals(tableRows[i][ii])) {
if (tableRows[i][ii].contains("%")) {
String temp = tableRows[i][ii].replace("%", "");
editor1[ii + 2].setLow(Double.parseDouble(temp) / 100);
} else {
editor1[ii + 2].setLow(Double.parseDouble(tableRows[i][ii]));
}
editor1[ii + 2].setCnt(editor1[ii + 2].getCnt() + 1);
}
}
if (i == 2) {
if (!"".equals(tableRows[i][ii])) {
if (tableRows[i][ii].contains("%")) {
String temp = tableRows[i][ii].replace("%", "");
editor1[ii + 2].setUp(Double.parseDouble(temp) / 100);
} else {
editor1[ii + 2].setUp(Double.parseDouble(tableRows[i][ii]));
}
editor1[ii + 2].setCnt(editor1[ii + 2].getCnt() + 1);
}
}
@ -749,11 +761,11 @@ public class SampleConfirmationForm extends AbstractRendering {
model.setValueAt("滚筒研发", 2, 2);
disableEdit.add("2,2");
general.put("jd2_bz", new int[] { 2, 14 });
disableEdit.add("2,14");
// disableEdit.add("2,14");
general.put("jd2_sh", new int[] { 2, 16 });
disableEdit.add("2,16");
// disableEdit.add("2,16");
general.put("jd2_pz", new int[] { 2, 18 });
disableEdit.add("2,18");
// disableEdit.add("2,18");
model.setValueAt("创建日期", 4, 0);
disableEdit.add("4,0");
general.put("creation_date", new int[] { 4, 2 });
@ -763,11 +775,11 @@ public class SampleConfirmationForm extends AbstractRendering {
general.put("owning_user", new int[] { 4, 7 });
disableEdit.add("4,7");
general.put("jd2_bzrq", new int[] { 4, 14 });
disableEdit.add("4,14");
// disableEdit.add("4,14");
general.put("jd2_shrq", new int[] { 4, 16 });
disableEdit.add("4,16");
// disableEdit.add("4,16");
general.put("jd2_pzrq", new int[] { 4, 18 });
disableEdit.add("4,18");
// disableEdit.add("4,18");
model.setValueAt("零件名", 6, 0);
disableEdit.add("6,0");
general.put("jd2_ljm", new int[] { 6, 2 });

@ -75,7 +75,7 @@ public class MyCellEditor1 extends DefaultCellEditor {
public Object getCellEditorValue() {
// TODO Auto-generated method stub
Object obj = super.getCellEditorValue();
if (obj != null && !"".equals(obj.toString().trim()) && row >= top && row <= bottom) {
if (obj != null && !"".equals(obj.toString().trim()) && row >= top - 3 && row <= bottom) {
try {
Double.parseDouble(obj.toString().trim());
} catch (Exception e) {

@ -657,10 +657,12 @@ public class OpenCommand extends com.teamcenter.rac.aif.commands.open.OpenComman
}
String loginGroup = tcSession.getUser().getProperty("login_group");
System.out.println("loginGroup===>" + loginGroup);
System.out.println("pre===>" + flag);
if (loginGroup.contains("dba")) {
System.out.println("dba");
flag = true;
}
System.out.println("behind===>" + flag);
if (!flag) {
AIFComponentContext[] revs = dataset.whereReferenced();
for (AIFComponentContext aif1 : revs) {

Loading…
Cancel
Save