ZT_CODE
/
chint_wuhan
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

创建/编辑更改通知单界面调整

Browse Source
pull/13/head
李冬阳 1 year ago
parent 6fb38b4d73
commit b5ecef5f0e
2 changed files with 65 additions and 8 deletions
Show Stats Download Patch File Download Diff File

25
com.connor.chint.wuhan/src/com/chint/plm/createEcn/ChangeNoticePanel.fxml
Unescape View File

@ -139,8 +139,8 @@
<center> <center>
<GridPane fx:id="productPane" alignment="CENTER" maxHeight="200.0" style="-fx-border-color: black;" BorderPane.alignment="CENTER"> <GridPane fx:id="productPane" alignment="CENTER" maxHeight="200.0" style="-fx-border-color: black;" BorderPane.alignment="CENTER">
<columnConstraints> <columnConstraints>
<ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" maxWidth="160.0" minWidth="10.0" prefWidth="20.0" /> <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" maxWidth="160.0" minWidth="10.0" prefWidth="20.0" />
<ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> <ColumnConstraints halignment="LEFT" hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" maxWidth="160.0" minWidth="10.0" prefWidth="100.0" /> <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" maxWidth="160.0" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints halignment="LEFT" hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> <ColumnConstraints halignment="LEFT" hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints> </columnConstraints>
@ -153,14 +153,14 @@
<Label text="产品型号:" /> <Label text="产品型号:" />
<Label text="产品名称:" GridPane.rowIndex="1" /> <Label text="产品名称:" GridPane.rowIndex="1" />
<Label text="文件代号及名称:" GridPane.rowIndex="2" /> <Label text="文件代号及名称:" GridPane.rowIndex="2" />
<ComboBox fx:id="pmCombox" prefHeight="30.0" prefWidth="370.0" GridPane.columnIndex="1" />
<ComboBox fx:id="prodNameComb" prefHeight="30.0" prefWidth="370.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
<TextField fx:id="markText" GridPane.columnIndex="1" GridPane.rowIndex="2" /> <TextField fx:id="markText" GridPane.columnIndex="1" GridPane.rowIndex="2" />
<Label text="合同代号:" GridPane.columnIndex="2" /> <Label text="合同代号:" GridPane.columnIndex="2" />
<Label text="合同名称:" GridPane.columnIndex="2" GridPane.rowIndex="1" /> <Label text="合同名称:" GridPane.columnIndex="2" GridPane.rowIndex="1" />
<Label text="更改实施日期:" GridPane.columnIndex="2" GridPane.rowIndex="2" /> <Label text="更改实施日期:" GridPane.columnIndex="2" GridPane.rowIndex="2" />
<TextField fx:id="contractText" GridPane.columnIndex="3" /> <TextField fx:id="contractText" GridPane.columnIndex="3" />
<TextField fx:id="htNameText" GridPane.columnIndex="3" GridPane.rowIndex="1" /> <TextField fx:id="htNameText" GridPane.columnIndex="3" GridPane.rowIndex="1" />
<ComboBox fx:id="pmCombox" prefHeight="30.0" prefWidth="370.0" GridPane.columnIndex="1" />
<ComboBox fx:id="prodNameComb" prefHeight="30.0" prefWidth="370.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
<DatePicker fx:id="changeDate" GridPane.columnIndex="3" GridPane.rowIndex="2" /> <DatePicker fx:id="changeDate" GridPane.columnIndex="3" GridPane.rowIndex="2" />
</children> </children>
<padding> <padding>
@ -215,7 +215,7 @@
</ScrollPane> </ScrollPane>
</center> </center>
<top> <top>
<FlowPane alignment="CENTER" hgap="25.0" prefHeight="40.0" BorderPane.alignment="CENTER"> <FlowPane alignment="CENTER" hgap="25.0" prefHeight="80.0" BorderPane.alignment="CENTER">
<children> <children>
<Button fx:id="addRows" mnemonicParsing="false" onAction="#addRows" text="增加五行" /> <Button fx:id="addRows" mnemonicParsing="false" onAction="#addRows" text="增加五行" />
<Button fx:id="addRow" mnemonicParsing="false" onAction="#addRow" text="增加行" /> <Button fx:id="addRow" mnemonicParsing="false" onAction="#addRow" text="增加行" />
@ -235,6 +235,7 @@
</columnConstraints> </columnConstraints>
<rowConstraints> <rowConstraints>
<RowConstraints minHeight="10.0" vgrow="NEVER" /> <RowConstraints minHeight="10.0" vgrow="NEVER" />
<RowConstraints minHeight="10.0" prefHeight="100.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints> </rowConstraints>
<children> <children>
@ -253,7 +254,19 @@
</ScrollPane> </ScrollPane>
</content> </content>
</TitledPane> </TitledPane>
<FlowPane alignment="TOP_CENTER" hgap="40.0" prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1"> <BorderPane prefHeight="100.0" prefWidth="200.0" GridPane.rowIndex="1">
<left>
<Label text="备注:" />
</left>
<center>
<ScrollPane prefHeight="100.0" style="-fx-padding: 5;" BorderPane.alignment="CENTER">
<content>
<TextArea fx:id="remarkArea" prefHeight="99.0" prefWidth="1100.0" wrapText="true" />
</content>
</ScrollPane>
</center>
</BorderPane>
<FlowPane alignment="TOP_CENTER" hgap="40.0" prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="2">
<children> <children>
<Button fx:id="createBtn" mnemonicParsing="false" onAction="#createClick" text="确定" /> <Button fx:id="createBtn" mnemonicParsing="false" onAction="#createClick" text="确定" />
<Button alignment="CENTER" mnemonicParsing="false" onAction="#disposeClick" text="取消" /> <Button alignment="CENTER" mnemonicParsing="false" onAction="#disposeClick" text="取消" />

48
com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnController.java
Unescape View File

@ -68,6 +68,7 @@ import javafx.scene.control.DatePicker;
import javafx.scene.control.RadioButton; import javafx.scene.control.RadioButton;
import javafx.scene.control.ScrollPane; import javafx.scene.control.ScrollPane;
import javafx.scene.control.TableColumn; import javafx.scene.control.TableColumn;
import javafx.scene.control.TableRow;
import javafx.scene.control.TableView; import javafx.scene.control.TableView;
import javafx.scene.control.TextArea; import javafx.scene.control.TextArea;
import javafx.scene.control.TextField; import javafx.scene.control.TextField;
@ -143,6 +144,9 @@ public class CreateEcnController extends KFXPanelController {
private List<CheckBox> partBtns = new ArrayList<>(); private List<CheckBox> partBtns = new ArrayList<>();
@FXML @FXML
private ComboBox<String> pmCombox; private ComboBox<String> pmCombox;
@FXML
private TextArea remarkArea;
private CreateEcnController controller; private CreateEcnController controller;
private CreateEcnFrame frame; private CreateEcnFrame frame;
private String[] database; private String[] database;
@ -198,7 +202,33 @@ public class CreateEcnController extends KFXPanelController {
@FXML @FXML
private void createClick(ActionEvent event) throws Exception { private void createClick(ActionEvent event) throws Exception {
if (ecnId.getText().isEmpty()) { if (ecnId.getText().isEmpty()) {
MessageBox.post("헝邱寧탰긴뫘데ID", "瓊刻", 2); // MessageBox.post("请先指派变更单ID", "提示", MessageBox.ERROR);
Alert alert = new Alert(AlertType.INFORMATION);
alert.setTitle("提示");
alert.setHeaderText("请先指派变更单ID");
//alert.setContentText("导入完成");
alert.showAndWait();
return;
}
//TODO lidy20240520检查“影响分析”中的责任人列是否都为空值。如果是则不允许创建
boolean check = true;
ObservableList<RefTableBean> refs = refTable.getItems();
for (int i = 0; i < refs.size(); i++) {
RefTableBean refTableBean = refs.get(i);
String user = refTableBean.getUserVal();//责任人
System.out.println("user:" + user);
if(user != null && !user.isEmpty()) {
check = false;
break;
}
}
if(check) {
// MessageBox.post("当前变更单没有选择会签人，请选择会签人", "提示", MessageBox.ERROR);
Alert alert = new Alert(AlertType.INFORMATION);
alert.setTitle("提示");
alert.setHeaderText("当前变更单没有选择会签人，请选择会签人");
//alert.setContentText("导入完成");
alert.showAndWait();
return; return;
} }
String changeName = "临时更改通知单"; String changeName = "临时更改通知单";
@ -404,6 +434,9 @@ public class CreateEcnController extends KFXPanelController {
row = POIUtil.getRow(sheet, 5); row = POIUtil.getRow(sheet, 5);
cell = POIUtil.getCell(row, 3); cell = POIUtil.getCell(row, 3);
cell.setCellValue(changeUnit1);//发放部门 cell.setCellValue(changeUnit1);//发放部门
row = POIUtil.getRow(sheet, 27);
cell = POIUtil.getCell(row, 2);
cell.setCellValue(remarkArea.getText());//备注
//复制表头与页 //复制表头与页
if(pages > 1) { if(pages > 1) {
@ -584,6 +617,7 @@ public class CreateEcnController extends KFXPanelController {
item.setProperty("zt2_FileName", fileName); item.setProperty("zt2_FileName", fileName);
item.setProperty("zt2_ProductName", productName); item.setProperty("zt2_ProductName", productName);
item.setProperty("zt2_ChangRequestNo", relateEcnText.getText()); item.setProperty("zt2_ChangRequestNo", relateEcnText.getText());
item.setProperty("zt2_Remark", remarkArea.getText());
changeTime = changeDate.getEditor().getText(); changeTime = changeDate.getEditor().getText();
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-M-dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-M-dd");
if (changeTime.length() > 0) { if (changeTime.length() > 0) {
@ -751,7 +785,7 @@ public class CreateEcnController extends KFXPanelController {
properties = target.getTCProperties( properties = target.getTCProperties(
new String[] { "zt2_ChangeDrawingNo", "zt2_Sign", "zt2_PlacesNo", "zt2_Partition", new String[] { "zt2_ChangeDrawingNo", "zt2_Sign", "zt2_PlacesNo", "zt2_Partition",
"zt2_ChangeBefore1", "zt2_ChangeAfter1", "zt2_ChangeReason", "zt2_ProcessType1", "zt2_ChangeBefore1", "zt2_ChangeAfter1", "zt2_ChangeReason", "zt2_ProcessType1",
"zt2_SZVersionbefore", "zt2_SZRevisedversion", "zt2_SZProduct", "zt2_SZProcess" }); "zt2_SZVersionbefore", "zt2_SZRevisedversion", "zt2_SZProduct", "zt2_SZProcess", "zt2_Remark" });
} catch (TCException e1) { } catch (TCException e1) {
e1.printStackTrace(); e1.printStackTrace();
} }
@ -767,6 +801,7 @@ public class CreateEcnController extends KFXPanelController {
String[] szVersionAft = properties[9].getStringArrayValue(); String[] szVersionAft = properties[9].getStringArrayValue();
String[] szProduct = properties[10].getStringArrayValue(); String[] szProduct = properties[10].getStringArrayValue();
String[] szProcess = properties[11].getStringArrayValue(); String[] szProcess = properties[11].getStringArrayValue();
String zt2_Remark = properties[12].getStringValue();
if (szProcess.length > 0) { if (szProcess.length > 0) {
rb_Process.setSelected(szProcess[0].equals("N")); rb_Process.setSelected(szProcess[0].equals("N"));
} }
@ -776,6 +811,7 @@ public class CreateEcnController extends KFXPanelController {
prodNameComb.getSelectionModel().select(productName); prodNameComb.getSelectionModel().select(productName);
markText.setText(fileName); markText.setText(fileName);
relateEcnText.setText(changRequestNo); relateEcnText.setText(changRequestNo);
remarkArea.setText(zt2_Remark);
// String productName = prodNameComb.getSelectionModel().getSelectedItem(); // String productName = prodNameComb.getSelectionModel().getSelectedItem();
// String fileName = markText.getText(); // String fileName = markText.getText();
// item.setProperty("zt2_FileName", fileName); // item.setProperty("zt2_FileName", fileName);
@ -970,6 +1006,13 @@ public class CreateEcnController extends KFXPanelController {
tc_afterVer.prefWidthProperty().bind(tableView.widthProperty().multiply(0.06)); tc_afterVer.prefWidthProperty().bind(tableView.widthProperty().multiply(0.06));
tc_reason.prefWidthProperty().bind(tableView.widthProperty().multiply(0.14)); // 0.4 tc_reason.prefWidthProperty().bind(tableView.widthProperty().multiply(0.14)); // 0.4
tc_wipTreat.prefWidthProperty().bind(tableView.widthProperty().multiply(0.10)); tc_wipTreat.prefWidthProperty().bind(tableView.widthProperty().multiply(0.10));
tableView.setRowFactory(tv -> {
//TODO 设置行高
TableRow<EcnBean> row = new TableRow<>();
row.setPrefHeight(100);
return row;
});
} }
/** /**
@ -1206,6 +1249,7 @@ public class CreateEcnController extends KFXPanelController {
gridPane.setPrefWidth(width * 0.98); gridPane.setPrefWidth(width * 0.98);
tableView.setPrefWidth(width * 0.97); tableView.setPrefWidth(width * 0.97);
refTable.setPrefWidth(width * 0.97); refTable.setPrefWidth(width * 0.97);
remarkArea.setPrefWidth(width * 0.97);
} }
@Override @Override

Write Preview
Loading…
Cancel
Save