|
|
|
@ -148,6 +148,9 @@ public class CreateEcnController extends KFXPanelController {
|
|
|
|
|
@FXML
|
|
|
|
|
private TextArea remarkArea;
|
|
|
|
|
|
|
|
|
|
@FXML
|
|
|
|
|
private Button createBtn;
|
|
|
|
|
|
|
|
|
|
private CreateEcnController controller;
|
|
|
|
|
private CreateEcnFrame frame;
|
|
|
|
|
private String[] database;
|
|
|
|
@ -159,6 +162,30 @@ public class CreateEcnController extends KFXPanelController {
|
|
|
|
|
private final int ITEM_ROW_CNT = 1;//每个对象行数
|
|
|
|
|
private final int TITLE_ROW_CNT = 7;//表头行数
|
|
|
|
|
|
|
|
|
|
private String contractNo; // 合同代号
|
|
|
|
|
private String contractName;// 合同名称
|
|
|
|
|
private String productModel; // 产品型号
|
|
|
|
|
private String changeType; // 正式临时
|
|
|
|
|
private String changeTime;// 更改实施日期
|
|
|
|
|
private String changeUnit1; // 属性变更发往部门
|
|
|
|
|
|
|
|
|
|
private int pages = 0;
|
|
|
|
|
private String[] changeDrawingNo; // 属性zt2_ChangeDrawingNo
|
|
|
|
|
private String[] sign; // 属性zt2_Sign
|
|
|
|
|
// private String[] placesNo; //属性zt2_PlacesNo
|
|
|
|
|
private String[] partition; // 属性zt2_Partition
|
|
|
|
|
private String[] changeBefore1; // 属性zt2_ChangeBefore1
|
|
|
|
|
private String[] changeAfter1; // 属性zt2_ChangeAfter1
|
|
|
|
|
private String[] changeReason; // 属性zt2_ChangeReason
|
|
|
|
|
private String[] processType1; // 属性zt2_ProcessType1
|
|
|
|
|
private String[] szVersionBefs; // 变更前版本
|
|
|
|
|
private String[] szVersionAfts; // 变更后版本
|
|
|
|
|
private String[] productSzs; // 变更后版本
|
|
|
|
|
private String[] processSzs; // 变更后版本
|
|
|
|
|
|
|
|
|
|
@FXML
|
|
|
|
|
public TextField relateEcnText;
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public void initData(KFXPanel paramKFXPanel) throws Exception {
|
|
|
|
|
// Auto-generated method stub
|
|
|
|
@ -189,12 +216,8 @@ public class CreateEcnController extends KFXPanelController {
|
|
|
|
|
// 获取选中的对象
|
|
|
|
|
|
|
|
|
|
initText();
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@FXML
|
|
|
|
|
private Button createBtn;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @param event
|
|
|
|
|
* @throws Exception
|
|
|
|
@ -692,13 +715,6 @@ public class CreateEcnController extends KFXPanelController {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private String contractNo; // 合同代号
|
|
|
|
|
private String contractName;// 合同名称
|
|
|
|
|
private String productModel; // 产品型号
|
|
|
|
|
private String changeType; // 正式临时
|
|
|
|
|
private String changeTime;// 更改实施日期
|
|
|
|
|
private String changeUnit1; // 属性变更发往部门
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @param item 对象
|
|
|
|
|
* @param changeName 变更类型
|
|
|
|
@ -817,20 +833,6 @@ public class CreateEcnController extends KFXPanelController {
|
|
|
|
|
item.getTCProperty("zt2_SZProcess").setStringValueArray(processSzs);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private int pages = 0;
|
|
|
|
|
private String[] changeDrawingNo; // 属性zt2_ChangeDrawingNo
|
|
|
|
|
private String[] sign; // 属性zt2_Sign
|
|
|
|
|
// private String[] placesNo; //属性zt2_PlacesNo
|
|
|
|
|
private String[] partition; // 属性zt2_Partition
|
|
|
|
|
private String[] changeBefore1; // 属性zt2_ChangeBefore1
|
|
|
|
|
private String[] changeAfter1; // 属性zt2_ChangeAfter1
|
|
|
|
|
private String[] changeReason; // 属性zt2_ChangeReason
|
|
|
|
|
private String[] processType1; // 属性zt2_ProcessType1
|
|
|
|
|
private String[] szVersionBefs; // 变更前版本
|
|
|
|
|
private String[] szVersionAfts; // 变更后版本
|
|
|
|
|
private String[] productSzs; // 变更后版本
|
|
|
|
|
private String[] processSzs; // 变更后版本
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @param event
|
|
|
|
|
* @function 关闭页面操作
|
|
|
|
@ -941,6 +943,7 @@ public class CreateEcnController extends KFXPanelController {
|
|
|
|
|
EcnBean ecnBean = new EcnBean(rowNum, reasons, wips, ChangeDrawingNo[j], sign[j], placesNo[j],
|
|
|
|
|
ChangeBefore1[j], ChangeAfter1[j], ChangeReason[j], ProcessType1[j], szVersionBef[j],
|
|
|
|
|
szVersionAft[j], products, szProduct[j]);
|
|
|
|
|
ecnBean.addActionListener(frame);
|
|
|
|
|
ecnBeans.add(ecnBean);
|
|
|
|
|
// ecnBean.setProductSz(szProduct[j]);
|
|
|
|
|
}
|
|
|
|
@ -1080,19 +1083,17 @@ public class CreateEcnController extends KFXPanelController {
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
|
|
private void createDetailTable() {
|
|
|
|
|
// Auto-generated method stub
|
|
|
|
|
|
|
|
|
|
TableColumn<EcnBean, TextArea> tc_beforChange = new TableColumn<EcnBean, TextArea>("更改前");
|
|
|
|
|
TableColumn<EcnBean, TextArea> tc_afterChange = new TableColumn<EcnBean, TextArea>("更改后");
|
|
|
|
|
TableColumn<EcnBean, TextArea> tc_afterVer = new TableColumn<EcnBean, TextArea>("更改后版本");
|
|
|
|
|
|
|
|
|
|
TableColumn<EcnBean, Integer> tc_xh = new TableColumn<EcnBean, Integer>("序号");
|
|
|
|
|
TableColumn<EcnBean, TextArea> tc_drawNo = new TableColumn<EcnBean, TextArea>("图样代号");
|
|
|
|
|
TableColumn<EcnBean, TextArea> tc_mark = new TableColumn<EcnBean, TextArea>("标记");
|
|
|
|
|
TableColumn<EcnBean, Integer> tc_xh = new TableColumn<EcnBean, Integer>("序号");
|
|
|
|
|
TableColumn<EcnBean, ComboBox<String>> tc_wipTreat = new TableColumn<EcnBean, ComboBox<String>>("在制品处理");
|
|
|
|
|
TableColumn<EcnBean, TextArea> tc_poiNum = new TableColumn<EcnBean, TextArea>("处数");
|
|
|
|
|
TableColumn<EcnBean, TextArea> tc_beforChange = new TableColumn<EcnBean, TextArea>("更改前");
|
|
|
|
|
TableColumn<EcnBean, TextArea> tc_beforVer = new TableColumn<EcnBean, TextArea>("更改前版本");
|
|
|
|
|
TableColumn<EcnBean, TextArea> tc_afterChange = new TableColumn<EcnBean, TextArea>("更改后");
|
|
|
|
|
TableColumn<EcnBean, TextArea> tc_afterVer = new TableColumn<EcnBean, TextArea>("更改后版本");
|
|
|
|
|
TableColumn<EcnBean, ComboBox<String>> productSz = new TableColumn<EcnBean, ComboBox<String>>("特性等级");
|
|
|
|
|
TableColumn<EcnBean, ComboBox<String>> tc_reason = new TableColumn<EcnBean, ComboBox<String>>("更改原因");
|
|
|
|
|
TableColumn<EcnBean, TextArea> tc_poiNum = new TableColumn<EcnBean, TextArea>("处数");
|
|
|
|
|
TableColumn<EcnBean, ComboBox<String>> tc_wipTreat = new TableColumn<EcnBean, ComboBox<String>>("在制品处理");
|
|
|
|
|
tableView.getColumns().addAll(tc_xh, tc_drawNo, tc_mark, tc_poiNum, tc_beforChange, tc_beforVer, tc_afterChange,
|
|
|
|
|
tc_afterVer, productSz, tc_reason, tc_wipTreat);
|
|
|
|
|
|
|
|
|
@ -1525,6 +1526,7 @@ public class CreateEcnController extends KFXPanelController {
|
|
|
|
|
void addRows(ActionEvent event) {
|
|
|
|
|
for (int i = 0; i < 5; i++) {
|
|
|
|
|
EcnBean bean = new EcnBean(ecnBeans.size() + 1, reasons, wips, products);
|
|
|
|
|
bean.addActionListener(frame);
|
|
|
|
|
bean.getProductSz().setValue("C");//特性等级默认为“C”
|
|
|
|
|
ecnBeans.add(bean);
|
|
|
|
|
}
|
|
|
|
@ -1540,6 +1542,7 @@ public class CreateEcnController extends KFXPanelController {
|
|
|
|
|
@FXML
|
|
|
|
|
void addRow(ActionEvent event) {
|
|
|
|
|
EcnBean bean = new EcnBean(ecnBeans.size() + 1, reasons, wips, products);
|
|
|
|
|
bean.addActionListener(frame);
|
|
|
|
|
bean.getProductSz().setValue("C");//特性等级默认为“C”
|
|
|
|
|
ecnBeans.add(bean);
|
|
|
|
|
ObservableList<EcnBean> data = FXCollections.observableArrayList(ecnBeans);
|
|
|
|
@ -1582,9 +1585,6 @@ public class CreateEcnController extends KFXPanelController {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@FXML
|
|
|
|
|
public TextField relateEcnText;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @param event
|
|
|
|
|
* @function 关联申请单按钮
|
|
|
|
|