From b5ecef5f0e876f74cc21b4fdbaf69820337f036b Mon Sep 17 00:00:00 2001
From: "lidy@connor.net.cn" <lidy@connor.net.cn>
Date: Thu, 23 May 2024 15:07:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA/=E7=BC=96=E8=BE=91=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=E9=80=9A=E7=9F=A5=E5=8D=95=E7=95=8C=E9=9D=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plm/createEcn/ChangeNoticePanel.fxml      | 25 +++++++---
 .../plm/createEcn/CreateEcnController.java    | 48 ++++++++++++++++++-
 2 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/ChangeNoticePanel.fxml b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/ChangeNoticePanel.fxml
index c3003f1..8d56061 100644
--- a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/ChangeNoticePanel.fxml
+++ b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/ChangeNoticePanel.fxml
@@ -139,8 +139,8 @@
                            <center>
                               <GridPane fx:id="productPane" alignment="CENTER" maxHeight="200.0" style="-fx-border-color: black;" BorderPane.alignment="CENTER">
                                 <columnConstraints>
-                                    <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="CENTER" hgrow="SOMETIMES" maxWidth="160.0" minWidth="10.0" prefWidth="20.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="LEFT" hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
                                 </columnConstraints>
@@ -153,14 +153,14 @@
                                     <Label text="产品型号:" />
                                     <Label text="产品名称:" GridPane.rowIndex="1" />
                                     <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" />
                                     <Label text="合同代号:" GridPane.columnIndex="2" />
                                     <Label text="合同名称:" GridPane.columnIndex="2" GridPane.rowIndex="1" />
                                     <Label text="更改实施日期:" GridPane.columnIndex="2" GridPane.rowIndex="2" />
                                     <TextField fx:id="contractText" GridPane.columnIndex="3" />
                                     <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" />
                                  </children>
                                  <padding>
@@ -215,7 +215,7 @@
                               </ScrollPane>
                            </center>
                            <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>
                                     <Button fx:id="addRows" mnemonicParsing="false" onAction="#addRows" text="增加五行" />
                                     <Button fx:id="addRow" mnemonicParsing="false" onAction="#addRow" text="增加行" />
@@ -235,6 +235,7 @@
                     </columnConstraints>
                     <rowConstraints>
                       <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>
                      <children>
@@ -253,7 +254,19 @@
                               </ScrollPane>
                            </content>
                         </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>
                               <Button fx:id="createBtn" mnemonicParsing="false" onAction="#createClick" text="确定" />
                               <Button alignment="CENTER" mnemonicParsing="false" onAction="#disposeClick" text="取消" />
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 d7a465f..60cfa99 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
@@ -68,6 +68,7 @@ import javafx.scene.control.DatePicker;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableRow;
 import javafx.scene.control.TableView;
 import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
@@ -143,6 +144,9 @@ public class CreateEcnController extends KFXPanelController {
     private List<CheckBox> partBtns = new ArrayList<>();
     @FXML
     private ComboBox<String> pmCombox;
+    @FXML
+    private TextArea remarkArea;
+    
     private CreateEcnController controller;
     private CreateEcnFrame frame;
     private String[] database;
@@ -198,7 +202,33 @@ public class CreateEcnController extends KFXPanelController {
     @FXML
     private void createClick(ActionEvent event) throws Exception {
         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;
         }
         String changeName = "��ʱ����֪ͨ��";
@@ -404,6 +434,9 @@ public class CreateEcnController extends KFXPanelController {
             row = POIUtil.getRow(sheet, 5);
             cell = POIUtil.getCell(row, 3);
             cell.setCellValue(changeUnit1);//���Ų���
+            row = POIUtil.getRow(sheet, 27);
+            cell = POIUtil.getCell(row, 2);
+            cell.setCellValue(remarkArea.getText());//��ע
             
             //���Ʊ�ͷ��ҳ
             if(pages > 1) {
@@ -584,6 +617,7 @@ public class CreateEcnController extends KFXPanelController {
         item.setProperty("zt2_FileName", fileName);
         item.setProperty("zt2_ProductName", productName);
         item.setProperty("zt2_ChangRequestNo", relateEcnText.getText());
+        item.setProperty("zt2_Remark", remarkArea.getText());
         changeTime = changeDate.getEditor().getText();
         SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-M-dd");
         if (changeTime.length() > 0) {
@@ -751,7 +785,7 @@ 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_SZVersionbefore", "zt2_SZRevisedversion", "zt2_SZProduct", "zt2_SZProcess", "zt2_Remark" });
             } catch (TCException e1) {
                 e1.printStackTrace();
             }
@@ -767,6 +801,7 @@ public class CreateEcnController extends KFXPanelController {
             String[] szVersionAft = properties[9].getStringArrayValue();
             String[] szProduct = properties[10].getStringArrayValue();
             String[] szProcess = properties[11].getStringArrayValue();
+            String zt2_Remark = properties[12].getStringValue();
             if (szProcess.length > 0) {
                 rb_Process.setSelected(szProcess[0].equals("N"));
             }
@@ -776,6 +811,7 @@ public class CreateEcnController extends KFXPanelController {
             prodNameComb.getSelectionModel().select(productName);
             markText.setText(fileName);
             relateEcnText.setText(changRequestNo);
+            remarkArea.setText(zt2_Remark);
 //			String productName = prodNameComb.getSelectionModel().getSelectedItem();
 //			String fileName = markText.getText();
 //			item.setProperty("zt2_FileName", fileName);
@@ -970,6 +1006,13 @@ public class CreateEcnController extends KFXPanelController {
         tc_afterVer.prefWidthProperty().bind(tableView.widthProperty().multiply(0.06));
         tc_reason.prefWidthProperty().bind(tableView.widthProperty().multiply(0.14)); // 0.4
         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);
                 tableView.setPrefWidth(width * 0.97);
                 refTable.setPrefWidth(width * 0.97);
+                remarkArea.setPrefWidth(width * 0.97);
             }
 
             @Override