diff --git a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnController.java b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnController.java index 529d4f4..a12fcd5 100644 --- a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnController.java +++ b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnController.java @@ -831,7 +831,8 @@ public class CreateEcnController extends KFXPanelController { properties = target.getTCProperties( new String[] { "zt2_ChangeDrawingNo", "zt2_Sign", "zt2_PlacesNo", "zt2_Partition", "zt2_ChangeBefore1", "zt2_ChangeAfter1", "zt2_ChangeReason", "zt2_ProcessType1", - "zt2_SZVersionbefore", "zt2_SZRevisedversion", "zt2_SZProduct", "zt2_SZProcess", "zt2_Remark" }); + "zt2_SZVersionbefore", "zt2_SZRevisedversion", "zt2_SZProduct", "zt2_SZProcess", + "zt2_Remark", "zt2_ChangeType" }); } catch (TCException e1) { e1.printStackTrace(); } @@ -848,6 +849,7 @@ public class CreateEcnController extends KFXPanelController { String[] szProduct = properties[10].getStringArrayValue(); String[] szProcess = properties[11].getStringArrayValue(); String zt2_Remark = properties[12].getStringValue(); + String zt2_ChangeType = properties[13].getStringValue(); if (szProcess.length > 0) { rb_Process.setSelected(szProcess[0].equals("N")); } @@ -858,6 +860,11 @@ public class CreateEcnController extends KFXPanelController { markText.setText(fileName); relateEcnText.setText(changRequestNo); remarkArea.setText(zt2_Remark); + if(zt2_ChangeType.startsWith("临时")) { + rb_tempChange.setSelected(true); + }else { + rb_formalChange.setSelected(true); + } // String productName = prodNameComb.getSelectionModel().getSelectedItem(); // String fileName = markText.getText(); // item.setProperty("zt2_FileName", fileName); @@ -1267,6 +1274,15 @@ public class CreateEcnController extends KFXPanelController { } }); } + TextField text = refTableBeans.get(start).getUserText();//填写了名字,没点指派,点到其他地方,提示进行指派 + text.focusedProperty().addListener((obs, wasFocused, isNowFocused) -> { + if (wasFocused && !isNowFocused && !text.getText().isEmpty()) { + if (!refTableBeans.get(start).getUserBtn().isFocused()) { + showAlertBox("进行指派", "提示", AlertType.WARNING); + text.requestFocus(); + } + } + }); setRefEnable(start, end, refTableBeans); } /**