From 9900f547dbcd5cfe7efcaa3ec2f92cfef4a519fb Mon Sep 17 00:00:00 2001
From: "lidy@connor.net.cn" <lidy@connor.net.cn>
Date: Tue, 3 Jun 2025 10:52:20 +0800
Subject: [PATCH] =?UTF-8?q?20250603=E4=BB=A3=E7=A0=81=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 com.connor.chint.wuhan/bin/.gitignore         |   4 -
 .../SearchSapResult/SearchSapDetailPanel.fxml |  81 +++++
 .../SearchSapResult/SearchSapResultPanel.fxml | 204 +++++++++++++
 .../SearchSapDetailPanel.fxml                 |  81 +++++
 .../SearchSapResultPanel - 副本.fxml        | 135 +++++++++
 .../SearchSapResultPanel.fxml                 | 135 +++++++++
 .../com/chint/plm/createEcn/AssignIdPane.fxml |  50 +++
 .../plm/createEcn/ChangeNoticePanel.fxml      | 285 ++++++++++++++++++
 .../chint/plm/createEcn/RelateApplyPane.fxml  | 187 ++++++++++++
 .../Message_zh_CN.properties                  |   3 +
 .../chint/JDBPackage/DesignChangePanel.fxml   | 148 +++++++++
 .../connor/chint/sap2/util/dbcp.properties    |  19 ++
 .../connor/chint/sap2/util/util.properties    |  41 +++
 .../plm/CreateOuotation/PersonOverview.fxml   | 191 ++++++++++++
 .../plm/CreateOuotation/PersonOverview1.fxml  | 123 ++++++++
 .../plm/CreateOuotation/PersonOverview2.fxml  |  86 ++++++
 .../bin/com/connor/plm/GZXQ/a - 副本.fxml   | 106 +++++++
 .../bin/com/connor/plm/GZXQ/a.fxml            | 107 +++++++
 .../plm/process/process_locale.properties     |  24 ++
 .../process/process_locale_zh_CN.properties   |  24 ++
 com.connor.chint.wuhan/plugin.xml             |  26 +-
 .../chint/plm/applyMatnr/ApplyMatnrOp.java    |  14 +-
 .../com/chint/plm/applyMatnr/RemarkUtil.java  |  29 +-
 .../chint/plm/createKjBom/KjController.java   |   8 +-
 .../chint/yunpi/command/BomDcSapOp.java       |  60 ++--
 .../chint/yunpi/command/BomSapWhBjOp.java     |  34 ++-
 .../chint/yunpi/command/DbomToECommand.java   |  31 +-
 .../src/com/connor/plm/txdp/TXDPFram.java     | 213 +++++++------
 28 files changed, 2301 insertions(+), 148 deletions(-)
 delete mode 100644 com.connor.chint.wuhan/bin/.gitignore
 create mode 100644 com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/SearchSapDetailPanel.fxml
 create mode 100644 com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/SearchSapResultPanel.fxml
 create mode 100644 com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult9/SearchSapDetailPanel.fxml
 create mode 100644 com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult9/SearchSapResultPanel - 副本.fxml
 create mode 100644 com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult9/SearchSapResultPanel.fxml
 create mode 100644 com.connor.chint.wuhan/bin/com/chint/plm/createEcn/AssignIdPane.fxml
 create mode 100644 com.connor.chint.wuhan/bin/com/chint/plm/createEcn/ChangeNoticePanel.fxml
 create mode 100644 com.connor.chint.wuhan/bin/com/chint/plm/createEcn/RelateApplyPane.fxml
 create mode 100644 com.connor.chint.wuhan/bin/com/chint/plm/createbomdifference/Message_zh_CN.properties
 create mode 100644 com.connor.chint.wuhan/bin/com/connor/chint/JDBPackage/DesignChangePanel.fxml
 create mode 100644 com.connor.chint.wuhan/bin/com/connor/chint/sap2/util/dbcp.properties
 create mode 100644 com.connor.chint.wuhan/bin/com/connor/chint/sap2/util/util.properties
 create mode 100644 com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/PersonOverview.fxml
 create mode 100644 com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/PersonOverview1.fxml
 create mode 100644 com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/PersonOverview2.fxml
 create mode 100644 com.connor.chint.wuhan/bin/com/connor/plm/GZXQ/a - 副本.fxml
 create mode 100644 com.connor.chint.wuhan/bin/com/connor/plm/GZXQ/a.fxml
 create mode 100644 com.connor.chint.wuhan/bin/com/connor/plm/process/process_locale.properties
 create mode 100644 com.connor.chint.wuhan/bin/com/connor/plm/process/process_locale_zh_CN.properties

diff --git a/com.connor.chint.wuhan/bin/.gitignore b/com.connor.chint.wuhan/bin/.gitignore
deleted file mode 100644
index fcae520..0000000
--- a/com.connor.chint.wuhan/bin/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/com/
-/mes/
-/nc/
-/plm/
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/SearchSapDetailPanel.fxml b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/SearchSapDetailPanel.fxml
new file mode 100644
index 0000000..6f79955
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/SearchSapDetailPanel.fxml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import tornadofx.control.*?>
+<?import javafx.scene.text.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import java.lang.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.layout.BorderPane?>
+
+<StackPane fx:id="stackPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.chint.plm.SearchSapResult.DetailsController">
+   <children>
+      <GridPane fx:id="girdPane">
+        <columnConstraints>
+          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+        </columnConstraints>
+        <rowConstraints>
+          <RowConstraints maxHeight="30.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="100.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+        </rowConstraints>
+         <children>
+            <FlowPane fx:id="flowPane" alignment="TOP_CENTER" prefHeight="200.0" prefWidth="200.0" style="-fx-padding: 5;">
+               <children>
+                  <CheckBox fx:id="cb_errBtn" mnemonicParsing="false" text="仅显示错误数据" />
+               </children>
+            </FlowPane>
+            <ScrollPane fx:id="scrollPane" prefHeight="1200.0" prefWidth="1200.0" style="-fx-padding: 5;" GridPane.rowIndex="1">
+               <content>
+                  <TableView fx:id="tableView" prefHeight="660.0" prefWidth="1180.0" style="-fx-faint-focus-color: transparent;">
+                    <columns>
+                      <TableColumn fx:id="tc_xh" prefWidth="75.0" text="序号" />
+                      <TableColumn fx:id="tc_batch" prefWidth="75.0" text="批次号" />
+                        <TableColumn fx:id="tc_material" prefWidth="162.0" text="父物料编码" />
+                        <TableColumn fx:id="tc_wbs" minWidth="0.0" prefWidth="127.0" text="WBS号" />
+                        <TableColumn fx:id="tc_SapResult" minWidth="0.0" prefWidth="99.0" text="SAP处理结果" />
+                        <TableColumn fx:id="tc_msg" prefWidth="126.0" text="结果内容" />
+                        <TableColumn fx:id="tc_cDate" prefWidth="114.0" text="BOM创建日期" />
+                        <TableColumn fx:id="tc_cTime" prefWidth="110.0" text="BOM创建时间" />
+                        <TableColumn fx:id="tc_returnDate" prefWidth="110.0" text="BOM同步日期" />
+                        <TableColumn fx:id="tc_returnTime" prefWidth="104.0" text="BOM同步时间" />
+                        <TableColumn fx:id="tc_plm" prefWidth="82.0" text="PLM状态" />
+                    </columns>
+                  </TableView>
+               </content>
+            </ScrollPane>
+            <BorderPane prefHeight="100.0" prefWidth="200.0" style="-fx-padding: 10;" GridPane.rowIndex="2">
+               <left>
+                  <FlowPane hgap="15.0" prefHeight="140.0" prefWidth="552.0" style="-fx-padding: 0;" BorderPane.alignment="CENTER">
+                     <children>
+                        <Button fx:id="bt_first" mnemonicParsing="false" onAction="#firstAction" prefHeight="30.0" prefWidth="80.0" text="首页" />
+                        <Button fx:id="bt_last" mnemonicParsing="false" onAction="#lastAction" prefHeight="30.0" prefWidth="80.0" text="上一页" />
+                        <Button fx:id="bt_next" mnemonicParsing="false" onAction="#nextAction" prefWidth="80.0" text="下一页" />
+                        <Button fx:id="bt_tail" mnemonicParsing="false" onAction="#tailAction" prefWidth="80.0" text="尾页" />
+                        <Button fx:id="bt_all" mnemonicParsing="false" onAction="#allAction" text="本页全部加载" />
+                     </children>
+                     <BorderPane.margin>
+                        <Insets bottom="5.0" left="10.0" right="10.0" top="5.0" />
+                     </BorderPane.margin>
+                     <padding>
+                        <Insets left="10.0" right="10.0" />
+                     </padding>
+                  </FlowPane>
+               </left>
+               <right>
+                  <FlowPane alignment="TOP_CENTER" prefHeight="140.0" prefWidth="589.0" BorderPane.alignment="CENTER">
+                     <children>
+                        <TextField fx:id="pageNumTxt" alignment="TOP_RIGHT" prefHeight="30.0" prefWidth="154.0" text="1" />
+                        <Label fx:id="lb_page" prefWidth="80.0" text="/" />
+                        <Button mnemonicParsing="false" onAction="#outputAction" text="结果导出" />
+                     </children>
+                     <BorderPane.margin>
+                        <Insets bottom="5.0" left="10.0" right="10.0" top="5.0" />
+                     </BorderPane.margin>
+                  </FlowPane>
+               </right>
+            </BorderPane>
+         </children>
+      </GridPane>
+   </children>
+</StackPane>
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/SearchSapResultPanel.fxml b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/SearchSapResultPanel.fxml
new file mode 100644
index 0000000..ca27f2b
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/SearchSapResultPanel.fxml
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import tornadofx.control.*?>
+<?import javafx.scene.text.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import java.lang.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.layout.BorderPane?>
+
+<StackPane fx:id="stackPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="1600.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.chint.plm.SearchSapResult.SearchSapController">
+   <children>
+      <ScrollPane fx:id="scrollPane" prefHeight="200.0">
+         <content>
+            <BorderPane fx:id="topBorder" prefHeight="200.0" prefWidth="200.0">
+               <top>
+                  <TitledPane fx:id="tp_sxtj" prefHeight="650.0" text="筛选条件" BorderPane.alignment="CENTER">
+                     <padding>
+                        <Insets bottom="5.0" left="5.0" right="5.0" top="10.0" />
+                     </padding>
+                     <content>
+                        <BorderPane prefHeight="200.0" prefWidth="200.0">
+                           <top>
+                              <TitledPane fx:id="rwtjPane" prefHeight="300.0" prefWidth="200.0" text="任务条件" BorderPane.alignment="CENTER">
+                                 <content>
+                                    <GridPane fx:id="gridPane" style="-fx-padding: 15;">
+                                      <columnConstraints>
+                                          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="40.0" />
+                                          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="60.0" />
+                                          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                      </columnConstraints>
+                                      <rowConstraints>
+                                          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                      </rowConstraints>
+                                       <padding>
+                                          <Insets bottom="5.0" left="5.0" right="10.0" top="5.0" />
+                                       </padding>
+                                       <children>
+                                          <Label text="任务编号:" />
+                                          <Label text="工厂:" GridPane.rowIndex="1" />
+                                          <Label text="发起人:" GridPane.rowIndex="2" />
+                                          <Label text="发起时间晚于:" GridPane.rowIndex="3" />
+                                          <Label text="发起时间早于:" GridPane.rowIndex="4" />
+                                          <Label text="项目名称:" GridPane.columnIndex="3" GridPane.rowIndex="4" />
+                                          <Label text="WBS号:" GridPane.columnIndex="3" GridPane.rowIndex="3" />
+                                          <Label text="数据状态:" GridPane.columnIndex="3" GridPane.rowIndex="5" />
+                                          <Label text="是否仅查看错误数据:" GridPane.columnIndex="3" GridPane.rowIndex="2" />
+                                          <Label text="是否仅查看错误任务:" GridPane.columnIndex="3" GridPane.rowIndex="1" />
+                                          <Label text="任务SAP处理结果:" GridPane.columnIndex="3" />
+                                          <TextField fx:id="tx_bh" GridPane.columnIndex="1" />
+                                          <TextField fx:id="tx_user" promptText="用户名称或用户ID" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                                          <TextField fx:id="tx_wbs" promptText="wbs号" GridPane.columnIndex="4" GridPane.rowIndex="3" />
+                                          <TextField fx:id="tx_projectName" promptText="项目名称" GridPane.columnIndex="4" GridPane.rowIndex="4" />
+                                          <ComboBox fx:id="cb_factory" prefWidth="250.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                                          <ComboBox fx:id="cb_status" prefWidth="250.0" GridPane.columnIndex="4" GridPane.rowIndex="5" />
+                                          <ComboBox fx:id="cb_sapState" prefWidth="250.0" GridPane.columnIndex="4" />
+                                          <CheckBox fx:id="bt_errMsg" mnemonicParsing="false" text="是" GridPane.columnIndex="4" GridPane.rowIndex="2" />
+                                          <CheckBox fx:id="bt_errTask" mnemonicParsing="false" text="是" GridPane.columnIndex="4" GridPane.rowIndex="1" />
+                                       </children>
+                                    </GridPane>
+                                 </content>
+                              </TitledPane>
+                           </top>
+                           <center>
+                              <TitledPane fx:id="mxtjPane" prefHeight="200.0" prefWidth="200.0" text="明细条件" BorderPane.alignment="CENTER">
+                                 <content>
+                                    <GridPane style="-fx-padding: 15;">
+                                      <columnConstraints>
+                                          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="40.0" />
+                                          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="60.0" />
+                                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                      </columnConstraints>
+                                      <rowConstraints>
+                                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                      </rowConstraints>
+                                       <children>
+                                          <Label text="父物料编码:" />
+                                          <Label text="SAP数据状态:" GridPane.rowIndex="1" />
+                                          <Label text="SAP返回信息" GridPane.rowIndex="2" />
+                                          <TextField fx:id="tx_pcode" promptText="多个物料以;隔开" GridPane.columnIndex="1" />
+                                          <TextField fx:id="tx_sapReturn" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                                          <ComboBox fx:id="tx_sapStatus" prefWidth="250.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                                          <Label text="WBS号:" GridPane.columnIndex="3" />
+                                          <Label text="批次号:" GridPane.columnIndex="3" GridPane.rowIndex="1" />
+                                          <TextField fx:id="tx_wbsMx" GridPane.columnIndex="4" />
+                                          <TextField fx:id="tx_batchNum" GridPane.columnIndex="4" GridPane.rowIndex="1" />
+                                       </children>
+                                    </GridPane>
+                                 </content>
+                              </TitledPane>
+                           </center>
+                           <bottom>
+                              <GridPane fx:id="bt_cx" BorderPane.alignment="CENTER">
+                                <columnConstraints>
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                </columnConstraints>
+                                <rowConstraints>
+                                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                </rowConstraints>
+                                 <children>
+                                    <Button fx:id="bt_close" mnemonicParsing="false" onAction="#closeClick" text="关闭" GridPane.columnIndex="3" />
+                                    <Button fx:id="bt_search" mnemonicParsing="false" onAction="#searchAction" text="查询" GridPane.columnIndex="1" />
+                                    <Button fx:id="bt_czcx" mnemonicParsing="false" onAction="#resetClick" text="重置查询" GridPane.columnIndex="2" />
+                                 </children>
+                              </GridPane>
+                           </bottom>
+                        </BorderPane>
+                     </content>
+                  </TitledPane>
+               </top>
+               <center>
+                  <BorderPane fx:id="resultBorder" prefHeight="800.0" prefWidth="1200.0" BorderPane.alignment="CENTER">
+                     <top>
+                        <TitledPane fx:id="tp_result" prefHeight="600.0" prefWidth="200.0" text="结果" BorderPane.alignment="CENTER">
+                           <padding>
+                              <Insets bottom="5.0" left="5.0" right="5.0" top="10.0" />
+                           </padding>
+                           <content>
+                              <BorderPane prefHeight="200.0" prefWidth="200.0" style="-fx-padding: 5;">
+                                 <padding>
+                                    <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+                                 </padding>
+                                 <opaqueInsets>
+                                    <Insets />
+                                 </opaqueInsets>
+                                 <top>
+                                    <TableView fx:id="tableView" prefHeight="460.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+                                      <columns>
+                                        <TableColumn fx:id="tc_xh" prefWidth="75.0" text="序号" />
+                                        <TableColumn fx:id="tc_rwh" prefWidth="102.0" text="任务号" />
+                                          <TableColumn fx:id="tc_fqr" prefWidth="133.0" text="发起人" />
+                                          <TableColumn fx:id="tc_fqsj" prefWidth="160.0" text="发起时间" />
+                                          <TableColumn fx:id="tc_zrws" prefWidth="85.0" text="子任务数" />
+                                          <TableColumn fx:id="tc_sapState" prefWidth="142.0" text="SAP处理结果" />
+                                          <TableColumn fx:id="tc_status" prefWidth="111.0" text="数据状态" />
+                                          <TableColumn fx:id="tc_plm" prefWidth="133.0" text="PLM处理进度" />
+                                          <TableColumn fx:id="tc_result" minWidth="7.0" prefWidth="103.0" text="结果明细" />
+                                          <TableColumn fx:id="tc_log" minWidth="0.0" prefWidth="91.0" text="日志获取" />
+                                      </columns>
+                                    </TableView>
+                                 </top>
+                                 <bottom>
+                                    <GridPane BorderPane.alignment="CENTER">
+                                      <columnConstraints>
+                                          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                      </columnConstraints>
+                                      <rowConstraints>
+                                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                      </rowConstraints>
+                                       <BorderPane.margin>
+                                          <Insets bottom="10.0" left="10.0" right="10.0" />
+                                       </BorderPane.margin>
+                                       <children>
+                                          <Button fx:id="bt_sy" mnemonicParsing="false" onAction="#firstBtnAction" text="首页" GridPane.columnIndex="1" />
+                                          <Button fx:id="bt_syy" mnemonicParsing="false" onAction="#lastBtnAction" text="上一页" GridPane.columnIndex="2" />
+                                          <Button fx:id="bt_xyy" mnemonicParsing="false" onAction="#nextBtnAction" text="下一页" GridPane.columnIndex="3" />
+                                          <Button fx:id="bt_wy" mnemonicParsing="false" onAction="#tailBtnAction" text="尾页" GridPane.columnIndex="4" />
+                                       </children>
+                                    </GridPane>
+                                 </bottom>
+                              </BorderPane>
+                           </content>
+                        </TitledPane>
+                     </top>
+                  </BorderPane>
+               </center>
+               <bottom>
+                  <AnchorPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+                     <children>
+                        <Button fx:id="bt_closeAll" layoutX="1108.0" layoutY="14.0" mnemonicParsing="false" onAction="#clossAll" text="关闭" />
+                     </children>
+                  </AnchorPane>
+               </bottom>
+               <padding>
+                  <Insets left="10.0" />
+               </padding>
+            </BorderPane>
+         </content>
+      </ScrollPane>
+   </children>
+</StackPane>
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult9/SearchSapDetailPanel.fxml b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult9/SearchSapDetailPanel.fxml
new file mode 100644
index 0000000..c89bc99
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult9/SearchSapDetailPanel.fxml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import tornadofx.control.*?>
+<?import javafx.scene.text.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import java.lang.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.layout.BorderPane?>
+
+<StackPane fx:id="stackPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.chint.plm.SearchSapResult.DetailsController">
+   <children>
+      <GridPane>
+        <columnConstraints>
+          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+        </columnConstraints>
+        <rowConstraints>
+          <RowConstraints maxHeight="30.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="100.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+        </rowConstraints>
+         <children>
+            <FlowPane alignment="TOP_CENTER" prefHeight="200.0" prefWidth="200.0" style="-fx-padding: 5;">
+               <children>
+                  <CheckBox fx:id="cb_errBtn" mnemonicParsing="false" onAction="#errBtnAction" text="仅显示错误数据" />
+               </children>
+            </FlowPane>
+            <ScrollPane prefHeight="1200.0" prefWidth="1200.0" style="-fx-padding: 5;" GridPane.rowIndex="1">
+               <content>
+                  <TableView fx:id="tableView" prefHeight="700.0" prefWidth="1190.0" style="-fx-faint-focus-color: transparent;">
+                    <columns>
+                      <TableColumn fx:id="tc_xh" prefWidth="75.0" text="序号" />
+                      <TableColumn fx:id="tc_batch" prefWidth="75.0" text="批次号" />
+                        <TableColumn fx:id="tc_material" prefWidth="162.0" text="父物料编码" />
+                        <TableColumn fx:id="tc_wbs" minWidth="0.0" prefWidth="127.0" text="WBS号" />
+                        <TableColumn fx:id="tc_SapResult" minWidth="0.0" prefWidth="99.0" text="SAP处理结果" />
+                        <TableColumn fx:id="tc_msg" prefWidth="126.0" text="结果内容" />
+                        <TableColumn fx:id="tc_cDate" prefWidth="114.0" text="BOM创建日期" />
+                        <TableColumn fx:id="tc_cTime" prefWidth="110.0" text="BOM创建时间" />
+                        <TableColumn fx:id="tc_returnDate" prefWidth="110.0" text="BOM同步日期" />
+                        <TableColumn fx:id="tc_returnTime" prefWidth="104.0" text="BOM同步时间" />
+                        <TableColumn fx:id="tc_plm" prefWidth="82.0" text="PLM状态" />
+                    </columns>
+                  </TableView>
+               </content>
+            </ScrollPane>
+            <BorderPane prefHeight="100.0" prefWidth="200.0" style="-fx-padding: 10;" GridPane.rowIndex="2">
+               <left>
+                  <FlowPane hgap="15.0" prefHeight="140.0" prefWidth="552.0" style="-fx-padding: 0;" BorderPane.alignment="CENTER">
+                     <children>
+                        <Button fx:id="bt_first" mnemonicParsing="false" onAction="#firstAction" prefHeight="30.0" prefWidth="80.0" text="首页" />
+                        <Button fx:id="bt_last" mnemonicParsing="false" onAction="#lastAction" prefHeight="30.0" prefWidth="80.0" text="上一页" />
+                        <Button fx:id="bt_next" mnemonicParsing="false" onAction="#nextAction" prefWidth="80.0" text="下一页" />
+                        <Button fx:id="bt_tail" mnemonicParsing="false" onAction="#tailAction" prefWidth="80.0" text="尾页" />
+                        <Button fx:id="bt_all" mnemonicParsing="false" onAction="#allAction" text="本页全部加载" />
+                     </children>
+                     <BorderPane.margin>
+                        <Insets bottom="5.0" left="10.0" right="10.0" top="5.0" />
+                     </BorderPane.margin>
+                     <padding>
+                        <Insets left="10.0" right="10.0" />
+                     </padding>
+                  </FlowPane>
+               </left>
+               <right>
+                  <FlowPane alignment="TOP_CENTER" prefHeight="140.0" prefWidth="589.0" BorderPane.alignment="CENTER">
+                     <children>
+                        <TextField alignment="TOP_RIGHT" prefHeight="30.0" prefWidth="154.0" text="1" />
+                        <Label fx:id="lb_page" prefWidth="80.0" text="/" />
+                        <Button mnemonicParsing="false" onAction="#outputAction" text="结果导出" />
+                     </children>
+                     <BorderPane.margin>
+                        <Insets bottom="5.0" left="10.0" right="10.0" top="5.0" />
+                     </BorderPane.margin>
+                  </FlowPane>
+               </right>
+            </BorderPane>
+         </children>
+      </GridPane>
+   </children>
+</StackPane>
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult9/SearchSapResultPanel - 副本.fxml b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult9/SearchSapResultPanel - 副本.fxml
new file mode 100644
index 0000000..ad72ffd
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult9/SearchSapResultPanel - 副本.fxml	
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import tornadofx.control.*?>
+<?import javafx.scene.text.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import java.lang.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.layout.BorderPane?>
+
+<StackPane fx:id="stackPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="1600.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.chint.plm.SearchSapResult.SearchSapController">
+   <children>
+      <ScrollPane prefHeight="865.0" prefWidth="1192.0">
+         <content>
+            <BorderPane prefHeight="849.0" prefWidth="1075.0">
+               <center>
+                  <BorderPane prefHeight="503.0" prefWidth="1075.0" BorderPane.alignment="CENTER">
+                     <right>
+                        <TitledPane fx:id="tp_result" animated="false" prefHeight="480.0" prefWidth="1075.0" text="结果" BorderPane.alignment="CENTER">
+                           <content>
+                              <BorderPane prefHeight="400.0" prefWidth="900.0">
+                                 <top>
+                                    <TableView fx:id="tableView" BorderPane.alignment="CENTER">
+                                       <columns>
+                                          <TableColumn fx:id="tc_xh" prefWidth="54.0" text="序号" />
+                                          <TableColumn fx:id="tc_drawingno" prefWidth="96.0" text="图号" />
+                                          <TableColumn fx:id="tc_datesetname" prefWidth="103.0" text="文件名称" />
+                                          <TableColumn fx:id="tc_materialno" prefWidth="98.0" text="物料编码" />
+                                          <TableColumn fx:id="tc_wbs" prefWidth="97.0" text="WBS号" />
+                                          <TableColumn fx:id="tc_revision" prefWidth="45.0" text="版本" />
+                                          <TableColumn fx:id="tc_code" prefWidth="66.0" text="文件类型" />
+                                          <TableColumn fx:id="tc_urlcreatetime" prefWidth="94.0" text="提交时间" />
+                                          <TableColumn fx:id="tc_released" prefWidth="71.0" text="发放状态" />
+                                          <TableColumn fx:id="tc_username" prefWidth="59.0" text="提交人" />
+                                          <TableColumn fx:id="tc_fileurl" prefWidth="265.0" text="链接" />
+                                       </columns>
+                                    </TableView>
+                                 </top>
+                                 <bottom>
+                                    <GridPane BorderPane.alignment="CENTER">
+                                      <columnConstraints>
+                                          <ColumnConstraints hgrow="SOMETIMES" maxWidth="321.0" minWidth="10.0" prefWidth="265.0" />
+                                          <ColumnConstraints hgrow="SOMETIMES" maxWidth="349.0" minWidth="10.0" prefWidth="160.0" />
+                                          <ColumnConstraints hgrow="SOMETIMES" maxWidth="334.0" minWidth="10.0" prefWidth="155.0" />
+                                          <ColumnConstraints hgrow="SOMETIMES" maxWidth="309.0" minWidth="10.0" prefWidth="149.0" />
+                                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="219.0" minWidth="10.0" prefWidth="213.0" />
+                                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                      </columnConstraints>
+                                      <rowConstraints>
+                                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                      </rowConstraints>
+                                       <children>
+                                          <Button fx:id="bt_sy" mnemonicParsing="false" onAction="#firstBtnAction" text="首页" GridPane.columnIndex="1" />
+                                          <Button fx:id="bt_syy" mnemonicParsing="false" onAction="#lastBtnAction" text="上一页" GridPane.columnIndex="2" />
+                                          <Button fx:id="bt_xyy" mnemonicParsing="false" onAction="#nextBtnAction" text="下一页" GridPane.columnIndex="3" />
+                                          <Button fx:id="bt_wy" mnemonicParsing="false" onAction="#tailBtnAction" text="尾页" GridPane.columnIndex="4" />
+                                       </children>
+                                    </GridPane>
+                                 </bottom>
+                              </BorderPane>
+                           </content>
+                        </TitledPane>
+                     </right>
+                  </BorderPane>
+               </center>
+               <top>
+                  <TitledPane fx:id="tp_sxtj" animated="false" text="筛选条件" BorderPane.alignment="CENTER">
+                    <content>
+                      <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="331.0" prefWidth="1073.0">
+                           <children>
+                              <BorderPane layoutX="26.0" layoutY="8.0" prefHeight="235.0" prefWidth="1022.0">
+                                 <top>
+                                    <TitledPane fx:id="rwtjPane" animated="false" prefHeight="236.0" prefWidth="1022.0" text="查询条件" BorderPane.alignment="CENTER">
+                                      <content>
+                                        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
+                                             <children>
+                                                <GridPane fx:id="gridPane" layoutX="20.0" layoutY="16.0" prefHeight="175.0" prefWidth="980.0">
+                                                  <columnConstraints>
+                                                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="208.0" minWidth="10.0" prefWidth="157.0" />
+                                                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="300.0" minWidth="10.0" prefWidth="268.0" />
+                                                      <ColumnConstraints hgrow="SOMETIMES" maxWidth="291.0" minWidth="10.0" prefWidth="101.0" />
+                                                      <ColumnConstraints hgrow="SOMETIMES" maxWidth="214.0" minWidth="10.0" prefWidth="97.0" />
+                                                      <ColumnConstraints hgrow="SOMETIMES" maxWidth="356.0" minWidth="10.0" prefWidth="356.0" />
+                                                  </columnConstraints>
+                                                  <rowConstraints>
+                                                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                  </rowConstraints>
+                                                   <children>
+                                                      <Label text="发放人:" GridPane.rowIndex="1" />
+                                                      <Label text="物料编码" GridPane.rowIndex="2" />
+                                                      <Label text="发放状态" GridPane.columnIndex="3" GridPane.rowIndex="1" />
+                                                      <Label text="工厂" GridPane.columnIndex="3" />
+                                                      <Label text="WBS号:" />
+                                                      <TextField fx:id="tx_bh" GridPane.columnIndex="1" />
+                                                      <TextField fx:id="tx_projectName" prefHeight="30.0" prefWidth="291.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                                                      <TextField fx:id="tx_user" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                                                      <ComboBox fx:id="cb_sapState" prefHeight="30.0" prefWidth="271.0" GridPane.columnIndex="4" />
+                                                      <ComboBox fx:id="cb_status" prefHeight="30.0" prefWidth="272.0" GridPane.columnIndex="4" GridPane.rowIndex="1" />
+                                                   </children>
+                                                </GridPane>
+                                             </children>
+                                          </AnchorPane>
+                                      </content>
+                                    </TitledPane>
+                                 </top>
+                              </BorderPane>
+                              <GridPane layoutX="216.0" layoutY="270.0" prefHeight="30.0" prefWidth="702.0">
+                                <columnConstraints>
+                                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="95.0" minWidth="10.0" prefWidth="80.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="219.0" minWidth="10.0" prefWidth="219.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="216.0" minWidth="10.0" prefWidth="210.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="185.0" minWidth="10.0" prefWidth="74.0" />
+                                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                </columnConstraints>
+                                <rowConstraints>
+                                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                </rowConstraints>
+                                 <children>
+                                    <Button fx:id="bt_close" mnemonicParsing="false" onAction="#closeClick" prefHeight="30.0" prefWidth="86.0" text="关闭" GridPane.columnIndex="3" />
+                                    <Button fx:id="bt_search" mnemonicParsing="false" onAction="#searchAction" prefHeight="30.0" prefWidth="96.0" text="查询" GridPane.columnIndex="1" />
+                                    <Button fx:id="bt_czcx" mnemonicParsing="false" onAction="#resetClick" prefHeight="30.0" prefWidth="88.0" text="重置查询" GridPane.columnIndex="2" />
+                                 </children>
+                              </GridPane>
+                           </children>
+                        </AnchorPane>
+                    </content>
+                  </TitledPane>
+               </top>
+            </BorderPane>
+         </content>
+      </ScrollPane>
+   </children>
+</StackPane>
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult9/SearchSapResultPanel.fxml b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult9/SearchSapResultPanel.fxml
new file mode 100644
index 0000000..2433a8d
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult9/SearchSapResultPanel.fxml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import tornadofx.control.*?>
+<?import javafx.scene.text.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import java.lang.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.layout.BorderPane?>
+
+<StackPane fx:id="stackPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="1600.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.chint.plm.SearchSapResult9.SearchSapController">
+    <children>
+      <ScrollPane fx:id="scrollPane" prefHeight="865.0" prefWidth="1192.0">
+         <content>
+            <BorderPane prefHeight="849.0" prefWidth="1075.0">
+               <center>
+                  <BorderPane fx:id="resultBorder" prefHeight="503.0" prefWidth="1075.0" BorderPane.alignment="CENTER">
+                     <right>
+                        <TitledPane fx:id="tp_result" animated="false" prefHeight="480.0" prefWidth="1075.0" text="结果" BorderPane.alignment="CENTER">
+                           <content>
+                              <BorderPane prefHeight="400.0" prefWidth="900.0">
+                                 <top>
+                                    <TableView fx:id="tableView" prefHeight="374.0" prefWidth="1049.0" BorderPane.alignment="CENTER">
+                                       <columns>
+                                          <TableColumn fx:id="tc_xh" prefWidth="54.0" text="序号" />
+                                          <TableColumn fx:id="tc_drawingno" prefWidth="96.0" text="图号" />
+                                          <TableColumn fx:id="tc_datesetname" prefWidth="103.0" text="文件名称" />
+                                          <TableColumn fx:id="tc_materialno" prefWidth="98.0" text="物料编码" />
+                                          <TableColumn fx:id="tc_wbs" prefWidth="97.0" text="WBS号" />
+                                          <TableColumn fx:id="tc_revision" prefWidth="45.0" text="版本" />
+                                          <TableColumn fx:id="tc_code" prefWidth="66.0" text="文件类型" />
+                                          <TableColumn fx:id="tc_urlcreatetime" prefWidth="94.0" text="提交时间" />
+                                          <TableColumn fx:id="tc_released" prefWidth="71.0" text="发放状态" />
+                                          <TableColumn fx:id="tc_username" prefWidth="59.0" text="提交人" />
+                                          <TableColumn fx:id="tc_fileurl" prefWidth="265.0" text="链接" />
+                                       </columns>
+                                    </TableView>
+                                 </top>
+                                 <bottom>
+                                    <GridPane BorderPane.alignment="CENTER">
+                                      <columnConstraints>
+                                          <ColumnConstraints hgrow="SOMETIMES" maxWidth="321.0" minWidth="10.0" prefWidth="265.0" />
+                                          <ColumnConstraints hgrow="SOMETIMES" maxWidth="349.0" minWidth="10.0" prefWidth="160.0" />
+                                          <ColumnConstraints hgrow="SOMETIMES" maxWidth="334.0" minWidth="10.0" prefWidth="155.0" />
+                                          <ColumnConstraints hgrow="SOMETIMES" maxWidth="309.0" minWidth="10.0" prefWidth="149.0" />
+                                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="219.0" minWidth="10.0" prefWidth="213.0" />
+                                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                      </columnConstraints>
+                                      <rowConstraints>
+                                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                      </rowConstraints>
+                                       <children>
+                                          <Button fx:id="bt_sy" mnemonicParsing="false" onAction="#firstBtnAction" text="首页" GridPane.columnIndex="1" />
+                                          <Button fx:id="bt_syy" mnemonicParsing="false" onAction="#lastBtnAction" text="上一页" GridPane.columnIndex="2" />
+                                          <Button fx:id="bt_xyy" mnemonicParsing="false" onAction="#nextBtnAction" text="下一页" GridPane.columnIndex="3" />
+                                          <Button fx:id="bt_wy" mnemonicParsing="false" onAction="#tailBtnAction" text="尾页" GridPane.columnIndex="4" />
+                                       </children>
+                                    </GridPane>
+                                 </bottom>
+                              </BorderPane>
+                           </content>
+                        </TitledPane>
+                     </right>
+                  </BorderPane>
+               </center>
+               <top>
+                  <TitledPane fx:id="tp_sxtj" animated="false" text="筛选条件" BorderPane.alignment="CENTER">
+                    <content>
+                      <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="331.0" prefWidth="1073.0">
+                           <children>
+                              <BorderPane layoutX="26.0" layoutY="8.0" prefHeight="235.0" prefWidth="1022.0">
+                                 <top>
+                                    <TitledPane fx:id="rwtjPane" animated="false" prefHeight="236.0" prefWidth="1022.0" text="查询条件" BorderPane.alignment="CENTER">
+                                      <content>
+                                        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
+                                             <children>
+                                                <GridPane fx:id="gridPane" layoutX="20.0" layoutY="16.0" prefHeight="175.0" prefWidth="980.0">
+                                                  <columnConstraints>
+                                                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="208.0" minWidth="10.0" prefWidth="157.0" />
+                                                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="300.0" minWidth="10.0" prefWidth="268.0" />
+                                                      <ColumnConstraints hgrow="SOMETIMES" maxWidth="291.0" minWidth="10.0" prefWidth="101.0" />
+                                                      <ColumnConstraints hgrow="SOMETIMES" maxWidth="214.0" minWidth="10.0" prefWidth="97.0" />
+                                                      <ColumnConstraints hgrow="SOMETIMES" maxWidth="356.0" minWidth="10.0" prefWidth="356.0" />
+                                                  </columnConstraints>
+                                                  <rowConstraints>
+                                                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                  </rowConstraints>
+                                                   <children>
+                                                      <Label text="发放人:" GridPane.rowIndex="1" />
+                                                      <Label text="物料编码" GridPane.rowIndex="2" />
+                                                      <Label text="发放状态" GridPane.columnIndex="3" GridPane.rowIndex="1" />
+                                                      <Label text="工厂" GridPane.columnIndex="3" />
+                                                      <Label text="WBS号:" />
+                                                      <TextField fx:id="tx_bh" GridPane.columnIndex="1" />
+                                                      <TextField fx:id="tx_projectName" prefHeight="30.0" prefWidth="291.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                                                      <TextField fx:id="tx_user" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                                                      <ComboBox fx:id="cb_sapState" prefHeight="30.0" prefWidth="271.0" GridPane.columnIndex="4" />
+                                                      <ComboBox fx:id="cb_status" prefHeight="30.0" prefWidth="272.0" GridPane.columnIndex="4" GridPane.rowIndex="1" />
+                                                   </children>
+                                                </GridPane>
+                                             </children>
+                                          </AnchorPane>
+                                      </content>
+                                    </TitledPane>
+                                 </top>
+                              </BorderPane>
+                              <GridPane layoutX="216.0" layoutY="270.0" prefHeight="30.0" prefWidth="702.0">
+                                <columnConstraints>
+                                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="95.0" minWidth="10.0" prefWidth="80.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="219.0" minWidth="10.0" prefWidth="219.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="216.0" minWidth="10.0" prefWidth="210.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="185.0" minWidth="10.0" prefWidth="74.0" />
+                                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                </columnConstraints>
+                                <rowConstraints>
+                                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                </rowConstraints>
+                                 <children>
+                                    <Button fx:id="bt_close" mnemonicParsing="false" onAction="#closeClick" prefHeight="30.0" prefWidth="86.0" text="关闭" GridPane.columnIndex="3" />
+                                    <Button fx:id="bt_search" mnemonicParsing="false" onAction="#searchAction" prefHeight="30.0" prefWidth="96.0" text="查询" GridPane.columnIndex="1" />
+                                    <Button fx:id="bt_czcx" mnemonicParsing="false" onAction="#resetClick" prefHeight="30.0" prefWidth="88.0" text="重置查询" GridPane.columnIndex="2" />
+                                 </children>
+                              </GridPane>
+                           </children>
+                        </AnchorPane>
+                    </content>
+                  </TitledPane>
+               </top>
+            </BorderPane>
+         </content>
+      </ScrollPane>
+   </children>
+</StackPane>
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/AssignIdPane.fxml b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/AssignIdPane.fxml
new file mode 100644
index 0000000..b85884d
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/AssignIdPane.fxml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.image.*?>
+<?import javafx.scene.control.*?>
+<?import java.lang.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.layout.BorderPane?>
+
+<GridPane hgap="5.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="240.0" prefWidth="400.0" vgap="5.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.chint.plm.createEcn.AssignIdController">
+	<columnConstraints>
+		<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+	</columnConstraints>
+	<rowConstraints>
+		<RowConstraints minHeight="10.0" vgrow="NEVER" />
+		<RowConstraints minHeight="10.0" vgrow="NEVER" />
+	</rowConstraints>
+	<children>
+		<FlowPane alignment="CENTER" hgap="12.0" GridPane.rowIndex="1">
+			<children>
+				<Button fx:id="assignBtn" mnemonicParsing="false" onAction="#okBtnClick" prefWidth="77.0" text="指派" />
+				<Button fx:id="closeBtn" mnemonicParsing="false" onAction="#cancelBtnClick" text="   取消   " />
+			</children>
+		</FlowPane>
+		<GridPane alignment="CENTER" prefHeight="200.0">
+		<columnConstraints>
+			<ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" maxWidth="100.0" minWidth="10.0" prefWidth="50.0" />
+			<ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+		</columnConstraints>
+		<rowConstraints>
+			<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+			<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+			<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+		</rowConstraints>
+			<children>
+				<Label text="创建者工厂:" />
+				<ComboBox fx:id="factoryComb" maxWidth="200.0" prefWidth="150.0" GridPane.columnIndex="1" />
+				<Label text="创建者部门:" GridPane.rowIndex="1" />
+			    <ComboBox fx:id="bmComb" maxWidth="200.0" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+				<RadioButton fx:id="rb_formalChange" maxWidth="200.0" prefWidth="150.0" mnemonicParsing="false" text="正式更改" GridPane.rowIndex="2" />
+				<RadioButton fx:id="rb_tempChange" mnemonicParsing="false" text="临时更改" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+			    <Label text="预览" GridPane.rowIndex="3" />
+			    <TextField fx:id="ylText" maxWidth="200.0" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+			</children>
+		</GridPane>
+	</children>
+	<padding>
+		<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+	</padding>
+</GridPane>
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/ChangeNoticePanel.fxml b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/ChangeNoticePanel.fxml
new file mode 100644
index 0000000..8d56061
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/ChangeNoticePanel.fxml
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
+
+<StackPane fx:id="stackPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.chint.plm.createEcn.CreateEcnController">
+   <children>
+      <ScrollPane fx:id="scollPane" prefHeight="800.0" prefWidth="1200.0">
+         <content>
+            <GridPane fx:id="gridPane" prefHeight="1600.0" prefWidth="1180.0">
+              <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+              </columnConstraints>
+              <rowConstraints>
+                  <RowConstraints maxHeight="160.0" minHeight="10.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="280.0" minHeight="10.0" prefHeight="230.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="600.0" minHeight="10.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" vgrow="NEVER" />
+              </rowConstraints>
+               <children>
+                  <BorderPane prefHeight="160.0" prefWidth="200.0">
+                     <left>
+                        <FlowPane alignment="CENTER_LEFT" hgap="12.0" prefHeight="80.0" prefWidth="400.0" style="-fx-border-color: black;" BorderPane.alignment="CENTER">
+                           <children>
+                              <Label text="单位:" />
+                              <TextField fx:id="factoryText" />
+                           </children>
+                           <BorderPane.margin>
+                              <Insets />
+                           </BorderPane.margin>
+                           <padding>
+                              <Insets left="10.0" />
+                           </padding>
+                        </FlowPane>
+                     </left>
+                     <center>
+                        <FlowPane alignment="CENTER" prefHeight="200.0" prefWidth="100.0" style="-fx-border-color: black;" BorderPane.alignment="CENTER">
+                           <children>
+                              <Label text="更改通知单">
+                                 <font>
+                                    <Font size="22.0" />
+                                 </font>
+                              </Label>
+                           </children>
+                        </FlowPane>
+                     </center>
+                     <padding>
+                        <Insets left="2.0" right="2.0" top="2.0" />
+                     </padding>
+                     <bottom>
+                        <BorderPane prefHeight="80.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+                           <left>
+                              <FlowPane alignment="CENTER" prefHeight="200.0" prefWidth="200.0" style="-fx-border-color: black;" BorderPane.alignment="CENTER">
+                                 <children>
+                                    <Label text="更改类型">
+                                       <font>
+                                          <Font size="18.0" />
+                                       </font>
+                                    </Label>
+                                 </children>
+                              </FlowPane>
+                           </left>
+                           <center>
+                              <GridPane style="-fx-border-color: black;" BorderPane.alignment="CENTER">
+                                <columnConstraints>
+                                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="400.0" minWidth="10.0" prefWidth="100.0" />
+                                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                </columnConstraints>
+                                <rowConstraints>
+                                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                </rowConstraints>
+                                 <children>
+                                    <FlowPane alignment="CENTER_LEFT" hgap="100.0" prefHeight="200.0" prefWidth="200.0">
+                                       <children>
+                                          <RadioButton fx:id="rb_formalChange" mnemonicParsing="false" text="正式更改" />
+                                          <RadioButton fx:id="rb_tempChange" mnemonicParsing="false" text="临时更改" />
+                                       </children>
+                                       <GridPane.margin>
+                                          <Insets />
+                                       </GridPane.margin>
+                                       <padding>
+                                          <Insets left="5.0" />
+                                       </padding>
+                                    </FlowPane>
+                                    <FlowPane alignment="CENTER_LEFT" hgap="100.0" prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1">
+                                       <children>
+                                          <RadioButton fx:id="rb_product" mnemonicParsing="false" text="产品" />
+                                          <RadioButton fx:id="rb_Process" mnemonicParsing="false" text="过程" />
+                                       </children>
+                                       <GridPane.margin>
+                                          <Insets />
+                                       </GridPane.margin>
+                                       <padding>
+                                          <Insets left="5.0" />
+                                       </padding>
+                                    </FlowPane>
+                                    <FlowPane alignment="CENTER_LEFT" hgap="15.0" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
+                                       <padding>
+                                          <Insets left="5.0" />
+                                       </padding>
+                                    </FlowPane>
+                                 </children>
+                              </GridPane>
+                           </center>
+                        </BorderPane>
+                     </bottom>
+                     <right>
+                        <GridPane prefHeight="78.0" prefWidth="400.0" style="-fx-border-color: black;" BorderPane.alignment="CENTER">
+                          <columnConstraints>
+                              <ColumnConstraints hgrow="SOMETIMES" maxWidth="120.0" minWidth="10.0" prefWidth="80.0" />
+                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="150.0" />
+                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="60.0" minWidth="10.0" prefWidth="20.0" />
+                          </columnConstraints>
+                          <rowConstraints>
+                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                          </rowConstraints>
+                           <children>
+                              <Label text="通知单编号:" />
+                              <Label text="关联申请单编号:" GridPane.rowIndex="1" />
+                              <Button fx:id="assignBtn" mnemonicParsing="false" onAction="#assignClick" text="指派" GridPane.columnIndex="2" />
+                              <Button mnemonicParsing="false" onAction="#relateClick" text="查看" GridPane.columnIndex="2" GridPane.rowIndex="1" />
+                              <TextField fx:id="ecnId" GridPane.columnIndex="1" />
+                              <TextField fx:id="relateEcnText" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                           </children>
+                           <padding>
+                              <Insets left="5.0" />
+                           </padding>
+                        </GridPane>
+                     </right>
+                  </BorderPane>
+                  <TitledPane fx:id="tp_product" animated="false" prefHeight="280.0" prefWidth="1200.0" text="产品及项目信息：" GridPane.rowIndex="1">
+                     <content>
+                        <BorderPane prefHeight="200.0" prefWidth="200.0">
+                           <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="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>
+                                <rowConstraints>
+                                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                </rowConstraints>
+                                 <children>
+                                    <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" />
+                                    <DatePicker fx:id="changeDate" GridPane.columnIndex="3" GridPane.rowIndex="2" />
+                                 </children>
+                                 <padding>
+                                    <Insets right="10.0" />
+                                 </padding>
+                              </GridPane>
+                           </center>
+                           <bottom>
+                              <BorderPane prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+                                 <BorderPane.margin>
+                                    <Insets top="5.0" />
+                                 </BorderPane.margin>
+                                 <left>
+                                    <FlowPane alignment="CENTER" prefHeight="200.0" prefWidth="200.0" style="-fx-border-color: black;" BorderPane.alignment="CENTER">
+                                       <children>
+                                          <Label text="发放部门" />
+                                       </children>
+                                    </FlowPane>
+                                 </left>
+                                 <center>
+                                    <FlowPane fx:id="departPane" alignment="CENTER_LEFT" hgap="20.0" prefHeight="200.0" prefWidth="200.0" style="-fx-border-color: black;" BorderPane.alignment="CENTER">
+                                       <BorderPane.margin>
+                                          <Insets />
+                                       </BorderPane.margin>
+                                       <padding>
+                                          <Insets left="5.0" />
+                                       </padding>
+                                    </FlowPane>
+                                 </center>
+                              </BorderPane>
+                           </bottom>
+                        </BorderPane>
+                     </content>
+                     <padding>
+                        <Insets left="2.0" right="2.0" />
+                     </padding>
+                  </TitledPane>
+                  <TitledPane fx:id="tc_details" prefHeight="1200.0" prefWidth="200.0" text="变更明细：" GridPane.rowIndex="2">
+                     <GridPane.margin>
+                        <Insets top="5.0" />
+                     </GridPane.margin>
+                     <padding>
+                        <Insets left="2.0" right="2.0" />
+                     </padding>
+                     <content>
+                        <BorderPane>
+                           <center>
+                              <ScrollPane prefHeight="500.0" style="-fx-padding: 5;" BorderPane.alignment="CENTER">
+                                 <content>
+                                    <TableView fx:id="tableView" prefHeight="480.0" prefWidth="1142.0" style="-fx-faint-focus-color: transparent;" />
+                                 </content>
+                              </ScrollPane>
+                           </center>
+                           <top>
+                              <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="增加行" />
+                                    <Button fx:id="deleteRow" mnemonicParsing="false" onAction="#deleteRow" text="删除行" />
+                                 </children>
+                                 <BorderPane.margin>
+                                    <Insets bottom="5.0" />
+                                 </BorderPane.margin>
+                              </FlowPane>
+                           </top>
+                        </BorderPane>
+                     </content>
+                  </TitledPane>
+                  <GridPane GridPane.rowIndex="3">
+                    <columnConstraints>
+                      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                    </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>
+                        <TitledPane fx:id="referencePane" animated="false" text="影响分析（会签）：">
+                           <GridPane.margin>
+                              <Insets top="5.0" />
+                           </GridPane.margin>
+                           <padding>
+                              <Insets left="2.0" right="2.0" />
+                           </padding>
+                           <content>
+                              <ScrollPane prefHeight="400.0">
+                                 <content>
+                                    <TableView fx:id="refTable" prefHeight="400.0" prefWidth="1170.0" />
+                                 </content>
+                              </ScrollPane>
+                           </content>
+                        </TitledPane>
+                        <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="取消" />
+                           </children>
+                           <GridPane.margin>
+                              <Insets top="5.0" />
+                           </GridPane.margin>
+                        </FlowPane>
+                     </children>
+                  </GridPane>
+               </children>
+            </GridPane>
+         </content>
+      </ScrollPane>
+   </children>
+</StackPane>
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/RelateApplyPane.fxml b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/RelateApplyPane.fxml
new file mode 100644
index 0000000..a50bae2
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/RelateApplyPane.fxml
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import tornadofx.control.*?>
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
+
+<StackPane fx:id="stackPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.chint.plm.createEcn.RelateEcnController">
+   <children>
+      <ScrollPane fx:id="scollPane" prefHeight="800.0" prefWidth="1200.0">
+         <content>
+            <GridPane fx:id="gridPane" prefHeight="800.0" prefWidth="1180.0">
+              <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+              </columnConstraints>
+              <rowConstraints>
+                  <RowConstraints maxHeight="85.0" minHeight="10.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="280.0" minHeight="10.0" prefHeight="230.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="400.0" minHeight="10.0" vgrow="SOMETIMES" />
+              </rowConstraints>
+               <children>
+                  <BorderPane maxHeight="80.0" prefHeight="80.0" prefWidth="200.0">
+                     <padding>
+                        <Insets left="2.0" right="2.0" top="2.0" />
+                     </padding>
+                     <bottom>
+                        <BorderPane prefHeight="80.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+                           <left>
+                              <FlowPane alignment="CENTER" prefHeight="200.0" prefWidth="200.0" style="-fx-border-color: black;" BorderPane.alignment="CENTER">
+                                 <children>
+                                    <Label text="更改类型">
+                                       <font>
+                                          <Font size="18.0" />
+                                       </font>
+                                    </Label>
+                                 </children>
+                              </FlowPane>
+                           </left>
+                           <center>
+                              <GridPane style="-fx-border-color: black;" BorderPane.alignment="CENTER">
+                                <columnConstraints>
+                                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="400.0" minWidth="10.0" prefWidth="100.0" />
+                                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                </columnConstraints>
+                                <rowConstraints>
+                                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                </rowConstraints>
+                                 <children>
+                                    <FlowPane alignment="CENTER_LEFT" hgap="100.0" prefHeight="200.0" prefWidth="200.0">
+                                       <children>
+                                          <RadioButton fx:id="rb_formalChange" mnemonicParsing="false" text="正式更改" />
+                                          <RadioButton fx:id="rb_tempChange" mnemonicParsing="false" text="临时更改" />
+                                       </children>
+                                       <GridPane.margin>
+                                          <Insets />
+                                       </GridPane.margin>
+                                       <padding>
+                                          <Insets left="5.0" />
+                                       </padding>
+                                    </FlowPane>
+                                    <FlowPane alignment="CENTER_LEFT" hgap="15.0" prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1">
+                                       <children>
+                                          <RadioButton fx:id="rb_product" mnemonicParsing="false" text="产品" />
+                                          <Label text="产品特性:" />
+                                          <RadioButton mnemonicParsing="false" text="A" />
+                                          <RadioButton mnemonicParsing="false" text="B" />
+                                          <RadioButton mnemonicParsing="false" text="C" />
+                                       </children>
+                                       <GridPane.margin>
+                                          <Insets />
+                                       </GridPane.margin>
+                                       <padding>
+                                          <Insets left="5.0" />
+                                       </padding>
+                                    </FlowPane>
+                                    <FlowPane alignment="CENTER_LEFT" hgap="15.0" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
+                                       <children>
+                                          <RadioButton fx:id="rb_Process" mnemonicParsing="false" text="过程" />
+                                          <Label text="过程特性:" />
+                                          <RadioButton mnemonicParsing="false" text="A" />
+                                          <RadioButton mnemonicParsing="false" text="B" />
+                                          <RadioButton mnemonicParsing="false" text="C" />
+                                       </children>
+                                       <padding>
+                                          <Insets left="5.0" />
+                                       </padding>
+                                    </FlowPane>
+                                 </children>
+                              </GridPane>
+                           </center>
+                        </BorderPane>
+                     </bottom>
+                  </BorderPane>
+                  <TitledPane fx:id="tp_product" animated="false" prefHeight="280.0" prefWidth="1200.0" text="更改涉及内容：" GridPane.rowIndex="1">
+                     <content>
+                        <BorderPane prefHeight="200.0" prefWidth="200.0">
+                           <center>
+                              <GridPane 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="LEFT" hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                  <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" maxWidth="160.0" minWidth="10.0" prefWidth="100.0" />
+                                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                </columnConstraints>
+                                <rowConstraints>
+                                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                </rowConstraints>
+                                 <children>
+                                    <Label text="产品型号:" />
+                                    <Label text="产品名称:" GridPane.rowIndex="1" />
+                                    <Label text="文件代号及名称:" GridPane.rowIndex="2" />
+                                    <TextField fx:id="prodModelText" GridPane.columnIndex="1" />
+                                    <TextField fx:id="prodNameText" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                                    <TextField fx:id="docCodeText" 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="contCondeText" GridPane.columnIndex="3" />
+                                    <TextField fx:id="contNameText" GridPane.columnIndex="3" GridPane.rowIndex="1" />
+                                    <TextField fx:id="pattCodeText" GridPane.columnIndex="3" GridPane.rowIndex="2" />
+                                    <Label text="申请人：" GridPane.rowIndex="3" />
+                                    <Label text="申请单号：" GridPane.columnIndex="2" GridPane.rowIndex="3" />
+                                    <Label text="申请时间晚于：" GridPane.rowIndex="4" />
+                                    <Label text="申请时间早于：" GridPane.columnIndex="2" GridPane.rowIndex="4" />
+                                    <TextField fx:id="applicantText" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                                    <TextField fx:id="requestNoText" GridPane.columnIndex="3" GridPane.rowIndex="3" />
+                                    <DatePicker fx:id="startTime" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+                                    <DatePicker fx:id="endTime" GridPane.columnIndex="3" GridPane.rowIndex="4" />
+                                 </children>
+                                 <padding>
+                                    <Insets right="10.0" top="2.0" />
+                                 </padding>
+                              </GridPane>
+                           </center>
+                           <bottom>
+                              <BorderPane prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+                                 <BorderPane.margin>
+                                    <Insets top="5.0" />
+                                 </BorderPane.margin>
+                                 <right>
+                                    <FlowPane alignment="CENTER" hgap="30.0" prefHeight="40.0" prefWidth="318.0" BorderPane.alignment="CENTER">
+                                       <children>
+                                          <Button mnemonicParsing="false" onAction="#searchClick" prefWidth="80.0" text="查询" />
+                                          <Button mnemonicParsing="false" onAction="#closeClick" prefWidth="80.0" text="关闭" />
+                                       </children>
+                                    </FlowPane>
+                                 </right>
+                              </BorderPane>
+                           </bottom>
+                        </BorderPane>
+                     </content>
+                     <padding>
+                        <Insets left="2.0" right="2.0" />
+                     </padding>
+                  </TitledPane>
+                  <TitledPane fx:id="tc_details" prefHeight="400.0" prefWidth="200.0" text="搜索结果：" GridPane.rowIndex="2">
+                     <GridPane.margin>
+                        <Insets top="5.0" />
+                     </GridPane.margin>
+                     <padding>
+                        <Insets left="2.0" right="2.0" />
+                     </padding>
+                     <content>
+                        <BorderPane>
+                           <center>
+                              <ScrollPane prefHeight="400.0" style="-fx-padding: 5;" BorderPane.alignment="CENTER">
+                                 <content>
+                                    <TableView fx:id="tableView" prefHeight="400.0" prefWidth="1142.0" style="-fx-faint-focus-color: transparent;" />
+                                 </content>
+                              </ScrollPane>
+                           </center>
+                        </BorderPane>
+                     </content>
+                  </TitledPane>
+               </children>
+            </GridPane>
+         </content>
+      </ScrollPane>
+   </children>
+</StackPane>
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/createbomdifference/Message_zh_CN.properties b/com.connor.chint.wuhan/bin/com/chint/plm/createbomdifference/Message_zh_CN.properties
new file mode 100644
index 0000000..b97fb23
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/chint/plm/createbomdifference/Message_zh_CN.properties
@@ -0,0 +1,3 @@
+ERROR_NOT_CHANGE=\u8BF7\u9009\u62E9\u66F4\u6539\u901A\u77E5\u5355\u5BF9\u8C61
+ERROR_NO_CHANGE=\u672A\u627E\u5230\u53D8\u66F4\u524D\u540E\u5BF9\u8C61,\u65E0\u6CD5\u63D0\u53D6\u5DEE\u5F02\u9879\uFF01
+SUCC_CHANGE=\u63D0\u53D6\u5B8C\u6210
\ No newline at end of file
diff --git a/com.connor.chint.wuhan/bin/com/connor/chint/JDBPackage/DesignChangePanel.fxml b/com.connor.chint.wuhan/bin/com/connor/chint/JDBPackage/DesignChangePanel.fxml
new file mode 100644
index 0000000..528f24d
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/connor/chint/JDBPackage/DesignChangePanel.fxml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.text.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import java.lang.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.layout.BorderPane?>
+
+<StackPane fx:id="stackPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="1200.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.connor.chint.JDBPackage.MySceneController">
+   <children>
+
+      <ScrollPane fx:id="scollPane" prefHeight="1200.0" prefWidth="1200.0">
+        <content>
+          <AnchorPane fx:id="parentPane" minHeight="0.0" minWidth="0.0" prefHeight="1800.0" prefWidth="1200.0">
+               <children>
+                  <BorderPane fx:id="borderPane" layoutX="-7.0" prefHeight="1800.0" prefWidth="1200.0" style="-fx-padding: 5;">
+                     <padding>
+                        <Insets bottom="18.0" left="18.0" right="18.0" top="18.0" />
+                     </padding>
+                     <top>
+                        <TitledPane fx:id="topTitlePane" animated="false" blendMode="DARKEN" pickOnBounds="false" style="-fx-padding: 10;" text="校对条件" BorderPane.alignment="CENTER">
+                          <content>
+                            <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="182.0" prefWidth="1162.0" style="-fx-padding: 5;">
+                                 <children>
+                                    <GridPane fx:id="gridPane" hgap="9.0" layoutX="17.0" maxWidth="1400.0" prefHeight="175.0" prefWidth="1098.0" style="-fx-padding: 7;" vgap="9.0">
+                                      <columnConstraints>
+                                        <ColumnConstraints hgrow="NEVER" maxWidth="104.0" minWidth="10.0" prefWidth="104.0" />
+                                        <ColumnConstraints hgrow="ALWAYS" maxWidth="373.0" minWidth="10.0" prefWidth="283.0" />
+                                          <ColumnConstraints halignment="CENTER" hgrow="NEVER" maxWidth="361.0" minWidth="10.0" prefWidth="208.0" />
+                                          <ColumnConstraints hgrow="ALWAYS" maxWidth="317.0" minWidth="0.0" prefWidth="122.0" />
+                                          <ColumnConstraints halignment="RIGHT" hgrow="NEVER" maxWidth="146.0" minWidth="0.0" prefWidth="0.0" />
+                                          <ColumnConstraints hgrow="ALWAYS" maxWidth="322.0" minWidth="10.0" prefWidth="322.0" />
+                                          <ColumnConstraints hgrow="NEVER" maxWidth="5.0" minWidth="0.0" prefWidth="0.0" />
+                                      </columnConstraints>
+                                      <rowConstraints>
+                                          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                        <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+                                        <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+                                          <RowConstraints maxHeight="36.0" minHeight="10.0" prefHeight="36.0" vgrow="SOMETIMES" />
+                                          <RowConstraints maxHeight="23.0" minHeight="10.0" prefHeight="20.0" vgrow="SOMETIMES" />
+                                      </rowConstraints>
+                                      
+                                       <children>
+                                          <Label text="编号:" />
+                                          <Label text="检查次数:" GridPane.columnIndex="3" />
+                                          <Label text="校对表编号:" GridPane.rowIndex="2" />
+                                          <Label text="校对日期:" GridPane.rowIndex="1" />
+                                          <Label text="检查人:" GridPane.columnIndex="3" GridPane.rowIndex="1" />
+                                          <ComboBox fx:id="cb_jccs" editable="true" maxWidth="1.7976931348623157E308" onAction="#selectJccs" GridPane.columnIndex="5" />
+                                          <TextField fx:id="tf_bh" prefHeight="30.0" prefWidth="288.0" GridPane.columnIndex="1" />
+                                          <ComboBox fx:id="cb_jclx" maxWidth="1.7976931348623157E308" prefWidth="150.0" GridPane.columnIndex="5" GridPane.rowIndex="3" />
+                                          <TextField fx:id="tf_jcr" GridPane.columnIndex="5" GridPane.rowIndex="1" />
+                                          <Label text="图号清单:" GridPane.columnIndex="3" GridPane.rowIndex="2" />
+                                          <ComboBox fx:id="cb_thqd" maxWidth="1.7976931348623157E308" GridPane.columnIndex="5" GridPane.rowIndex="2" />
+                                          <Label text="版本号:" GridPane.rowIndex="3" />
+                                          <Label text="检查类型:" GridPane.columnIndex="3" GridPane.rowIndex="3" />
+                                          <TextField fx:id="jdrq" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                                          <TextField fx:id="revId" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                                          <TextField fx:id="jdbbh" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                                          <Label text="过滤不通过项:" GridPane.rowIndex="4" />
+                                          <CheckBox fx:id="glBtn" mnemonicParsing="false" onAction="#selectBtnGl" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+                                       </children>
+                                    </GridPane>
+                                 </children>
+                              </AnchorPane>
+                          </content>
+                        </TitledPane>
+                     </top>
+                     <center>
+                        <TabPane fx:id="TestPane" prefHeight="263.0" prefWidth="1180.0" style="-fx-padding: 10;" tabClosingPolicy="UNAVAILABLE" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" BorderPane.alignment="CENTER">
+                          <tabs>
+                            <Tab text="检查结果">
+                                 <content>
+                                    <TableView fx:id="table" prefHeight="292.0" prefWidth="1170.0" style="-fx-faint-focus-color: transparent; -fx-focus-color: rgba(0,0,0,0.2);" />
+                                 </content>
+                              </Tab>
+                          </tabs>
+                        </TabPane>
+                     </center>
+                     <bottom>
+                        <BorderPane prefHeight="200.0" prefWidth="200.0" style="-fx-padding: 10;" BorderPane.alignment="CENTER">
+                           <top>
+                              <TitledPane fx:id="btoTitlePane" animated="false" prefHeight="260.0" prefWidth="1160.0" style="-fx-padding: 5;" BorderPane.alignment="CENTER">
+                                <content>
+                                  <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="457.0" prefWidth="1178.0">
+                                       <children>
+                                          <GridPane prefHeight="214.0" prefWidth="1178.0" style="-fx-padding: 15;">
+                                            <columnConstraints>
+                                              <ColumnConstraints hgrow="SOMETIMES" maxWidth="1166.0" minWidth="10.0" prefWidth="1127.0" />
+                                              <ColumnConstraints hgrow="SOMETIMES" maxWidth="584.0" minWidth="10.0" prefWidth="51.0" />
+                                            </columnConstraints>
+                                            <rowConstraints>
+                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                            </rowConstraints>
+                                             <children>
+                                                <Label text="校对人员发现的问题真实记录：" />
+                                                <Label text="审核人员发现的问题真实记录：" GridPane.rowIndex="2" />
+                                                <Label text="校对、审核发现的问题“是否”已逐条进行更改？如未更改则写明未更改理由。（审核人再审签字）：" GridPane.rowIndex="4" />
+                                                <TextField fx:id="tx1" GridPane.rowIndex="1" />
+                                                <TextField fx:id="tx2" GridPane.rowIndex="3" />
+                                                <TextField fx:id="tx3" GridPane.rowIndex="5" />
+                                             </children>
+                                          </GridPane>
+                                       </children></AnchorPane>
+                                </content>
+                              </TitledPane>
+                           </top>
+                           <bottom>
+                              <GridPane style="-fx-padding: 30;" BorderPane.alignment="CENTER">
+                                <columnConstraints>
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                </columnConstraints>
+                                <rowConstraints>
+                                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                </rowConstraints>
+                                 <children>
+                                    <Button fx:id="bt_tj" mnemonicParsing="false" onAction="#tjBtnClick" text="提交" />
+                                    <Button fx:id="bt_sc" mnemonicParsing="false" text="输出" GridPane.columnIndex="1" />
+                                    <Button fx:id="bt_lsbc" mnemonicParsing="false" onAction="#lsbcBtnClick" text="临时保存" GridPane.columnIndex="2" />
+                                    <Button fx:id="bt_outbtg" mnemonicParsing="false" text="输出不通过项" GridPane.columnIndex="3" />
+                                    <Button mnemonicParsing="false" text="输出当前检查" GridPane.columnIndex="4" />
+                                    <Button fx:id="qxBtn" mnemonicParsing="false" onAction="#qxBtnClick" text="取消" GridPane.columnIndex="5" />
+                                 </children>
+                              </GridPane>
+                           </bottom>
+                        </BorderPane>
+                     </bottom>
+                  </BorderPane>
+               </children>
+            </AnchorPane>
+        </content>
+      </ScrollPane>
+   </children>
+</StackPane>
diff --git a/com.connor.chint.wuhan/bin/com/connor/chint/sap2/util/dbcp.properties b/com.connor.chint.wuhan/bin/com/connor/chint/sap2/util/dbcp.properties
new file mode 100644
index 0000000..35e40be
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/connor/chint/sap2/util/dbcp.properties
@@ -0,0 +1,19 @@
+#\u6570\u636E\u5E93\u9A71\u52A8
+driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver
+#\u6570\u636E\u5E93\u8FDE\u63A5\u5730\u5740
+url=jdbc:sqlserver://10.128.10.135:1433;DatabaseName=CHINT_DB
+#\u7528\u6237\u540D
+username=PLMUser
+#\u5BC6\u7801
+password=PLMUser 
+ #\u8FDE\u63A5\u6C60\u7684\u6700\u5927\u6570\u636E\u5E93\u8FDE\u63A5\u6570\u3002\u8BBE\u4E3A0\u8868\u793A\u65E0\u9650\u5236
+maxActive=30
+#\u6700\u5927\u7A7A\u95F2\u6570\uFF0C\u6570\u636E\u5E93\u8FDE\u63A5\u7684\u6700\u5927\u7A7A\u95F2\u65F6\u95F4\u3002\u8D85\u8FC7\u7A7A\u95F2\u65F6\u95F4\uFF0C\u6570\u636E\u5E93\u8FDE
+#\u63A5\u5C06\u88AB\u6807\u8BB0\u4E3A\u4E0D\u53EF\u7528\uFF0C\u7136\u540E\u88AB\u91CA\u653E\u3002\u8BBE\u4E3A0\u8868\u793A\u65E0\u9650\u5236
+maxIdle=10
+#\u6700\u5927\u5EFA\u7ACB\u8FDE\u63A5\u7B49\u5F85\u65F6\u95F4\u3002\u5982\u679C\u8D85\u8FC7\u6B64\u65F6\u95F4\u5C06\u63A5\u5230\u5F02\u5E38\u3002\u8BBE\u4E3A-1\u8868\u793A\u65E0\u9650\u5236
+maxWait=1000 
+ #\u8D85\u8FC7removeAbandonedTimeout\u65F6\u95F4\u540E\uFF0C\u662F\u5426\u8FDB \u884C\u6CA1\u7528\u8FDE\u63A5\uFF08\u5E9F\u5F03\uFF09\u7684\u56DE\u6536\uFF08\u9ED8\u8BA4\u4E3Afalse\uFF0C\u8C03\u6574\u4E3Atrue) 
+removeAbandoned=true
+#\u8D85\u8FC7\u65F6\u95F4\u9650\u5236\uFF0C\u56DE\u6536\u6CA1\u6709\u7528(\u5E9F\u5F03)\u7684\u8FDE\u63A5\uFF08\u9ED8\u8BA4\u4E3A 300\u79D2\uFF0C\u8C03\u6574\u4E3A180\uFF09
+removeAbandonedTimeout=180
diff --git a/com.connor.chint.wuhan/bin/com/connor/chint/sap2/util/util.properties b/com.connor.chint.wuhan/bin/com/connor/chint/sap2/util/util.properties
new file mode 100644
index 0000000..19c2332
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/connor/chint/sap2/util/util.properties
@@ -0,0 +1,41 @@
+SQL.URL=jdbc:sqlserver://10.128.20.35:1433;DatabaseName=BDP2020
+SQL.DRIVER=com.microsoft.sqlserver.jdbc.SQLServerDriver
+SQL.USER=PLMUser
+SQL.PASSWORD=PLMUser
+
+#\u4F4E\u538B\u8BDA\u521B
+SQL.CC.URL=jdbc:sqlserver://10.128.10.135:1433;DatabaseName=CHINT_DB
+SQL.CC.DRIVER=com.microsoft.sqlserver.jdbc.SQLServerDriver
+SQL.CC.USER=PLMUser
+SQL.CC.PASSWORD=PLMUser
+
+# Test
+#SQL.SH.URL=jdbc:sqlserver://10.128.155.236:1433;DatabaseName=ISP.CADAssistant
+#SQL.SH.DRIVER=com.microsoft.sqlserver.jdbc.SQLServerDriver
+#SQL.SH.USER=sa
+#SQL.SH.PASSWORD=2wsx#EDC
+# 
+SQL.SH.URL=jdbc:sqlserver://10.128.155.140:1433;DatabaseName=ISP.CADAssistant
+SQL.SH.DRIVER=com.microsoft.sqlserver.jdbc.SQLServerDriver
+SQL.SH.USER=sa
+SQL.SH.PASSWORD=2wsx#EDC
+
+SQL.TC.URL=jdbc:oracle:thin:@10.128.10.207:1521:tcprod
+SQL.TC.DRIVER=oracle.jdbc.driver.OracleDriver
+SQL.TC.USER=infodba
+SQL.TC.PASSWORD=infodba
+
+
+
+
+#SQL.TCDATA.URL=jdbc:oracle:thin:@192.168.0.103:1521:TC
+SQL.TCDATA.URL=jdbc:oracle:thin:@10.128.18.139:1521:testdb
+SQL.TCDATA.DRIVER=oracle.jdbc.driver.OracleDriver
+SQL.TCDATA.USER=infodba
+SQL.TCDATA.PASSWORD=infodba
+
+SQL.TEMPLATE_TREE=select t.PmpcCode, t.PmpcCompanyCode, t.PmpcName, t.PmpcUpperCode, t.PmpcItem, t.PmpcPrhCode, t.PmpcEnd,t.PmpcCanzz,t.PmpcPType,t.PmpcMType from CcemVW_Pmpc t;
+SQL.TEMPLATE=select t.PrhName,t.PrdLine,t.PrdNo,t.PrdFeatureCode,t.FeatureName,t.PrdCanInput,t.PrdSign from CcemVW_Prd t where t.prhcode = ? order by t.PrdNo
+SQL.LOV=select t.PrddNo,t.PrddFeatureCode,t.PrddValue from CcemVW_Prdd t where t.PrddCode = ? and PrddLine = ? order by t.PrddNo
+SQL.FEATURE=select t.FeatureCode,t.FeatureName from CcemVW_Feature t
+SQL.GROUP=select t.ProductGroupCode,t.ProductGroupName from CcemVW_ProductGroup t
\ No newline at end of file
diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/PersonOverview.fxml b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/PersonOverview.fxml
new file mode 100644
index 0000000..65aaaf8
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/PersonOverview.fxml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.FlowPane?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+
+<AnchorPane fx:id="coverPane" prefHeight="842.0" prefWidth="1326.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.connor.plm.CreateOuotation.MyController">
+   <children>
+      <GridPane fx:id="gridPane" layoutX="14.0" layoutY="108.0" prefHeight="189.0" prefWidth="1302.0" style="-fx-border-color: gray; -fx-border-width: 0.5px; -fx-border-radius: 5px;" AnchorPane.leftAnchor="9.0" AnchorPane.rightAnchor="10.0">
+        <columnConstraints>
+            <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+          <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+            <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+            <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+        </columnConstraints>
+        <rowConstraints>
+            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+        </rowConstraints>
+         <children>
+            <Label fx:id="projectNameLabel" prefHeight="20.0" prefWidth="83.0" text="项目名称:" />
+            <TextField fx:id="projectNameTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="1" />
+            <Label fx:id="transformerModelLabel" prefHeight="20.0" prefWidth="83.0" text="变压器型号:" GridPane.rowIndex="1" />
+            <TextField fx:id="transformerModelTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+            <Label fx:id="noLoadLossLabel" prefHeight="20.0" prefWidth="83.0" text="空载损耗:" GridPane.rowIndex="2" />
+            <TextField fx:id="noLoadLossTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+            <Label fx:id="loadLossLabel" prefHeight="20.0" prefWidth="120.0" text="负载损耗(KW):" GridPane.rowIndex="3" />
+            <TextField fx:id="loadLossTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+            <Label fx:id="biddingNumberLabel" prefHeight="20.0" prefWidth="83.0" text="投标编号:" GridPane.columnIndex="2" />
+            <Label fx:id="capacityRatioLabel" prefHeight="20.0" prefWidth="120.0" text="容量比(MVA):" GridPane.columnIndex="2" GridPane.rowIndex="1" />
+            <Label fx:id="impedanceVoltageLabel" prefHeight="20.0" prefWidth="83.0" text="阻抗电压:" GridPane.columnIndex="2" GridPane.rowIndex="2" />
+            <TextField fx:id="biddingNumberTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="3" />
+            <TextField fx:id="capacityRatioTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="3" GridPane.rowIndex="1" />
+            <TextField fx:id="impedanceVoltageTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="3" GridPane.rowIndex="2" />
+            <Label fx:id="projectManagerLabel" prefHeight="20.0" prefWidth="83.0" text="项目经理:" GridPane.columnIndex="4" />
+            <Label fx:id="voltageRatioLabel" prefHeight="20.0" prefWidth="83.0" text="电压比(kV):" GridPane.columnIndex="4" GridPane.rowIndex="1" />
+            <Label fx:id="transportationWeightLabel" prefHeight="20.0" prefWidth="83.0" text="运输重(t):" GridPane.columnIndex="4" GridPane.rowIndex="2" />
+            <TextField fx:id="projectManagerTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="5" />
+            <TextField fx:id="voltageRatioTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="5" GridPane.rowIndex="1" />
+            <TextField fx:id="transportationWeightTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="5" GridPane.rowIndex="2" />
+            <Label fx:id="quantityLabel" prefHeight="20.0" prefWidth="83.0" text="数量:" GridPane.columnIndex="6" />
+            <TextField fx:id="quantityTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="7" />
+            <Label fx:id="totalWeightLabel" prefHeight="20.0" prefWidth="83.0" text="总重(t):" GridPane.columnIndex="6" GridPane.rowIndex="2" />
+            <TextField fx:id="totalWeightTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="7" GridPane.rowIndex="2" />
+         </children>
+         <padding>
+            <Insets right="15.0" />
+         </padding>
+      </GridPane>
+      <FlowPane fx:id="buttonPane" alignment="CENTER_RIGHT" hgap="40.0" layoutX="618.0" layoutY="766.0" prefHeight="60.0" prefWidth="698.0" AnchorPane.bottomAnchor="1.0" AnchorPane.rightAnchor="10.0">
+         <children>
+            <Button fx:id="saveButton" mnemonicParsing="false" prefWidth="100.0" text="保存" />
+            <Button fx:id="calculateButton" mnemonicParsing="false" prefWidth="100.0" text="计算金额" />
+            <Button fx:id="selectComparisonButton" mnemonicParsing="false" prefWidth="100.0" text="选择对比" />
+            <Button fx:id="compareButton" mnemonicParsing="false" prefWidth="100.0" text="对比" />
+         </children>
+         <padding>
+            <Insets right="30.0" />
+         </padding>
+      </FlowPane>
+      <BorderPane fx:id="tablePane" layoutX="14.0" layoutY="365.0" prefHeight="379.0" prefWidth="1302.0" AnchorPane.bottomAnchor="80.0" AnchorPane.leftAnchor="9.0" AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="350.0">
+         <center>
+            <TableView fx:id="materialsTable" prefHeight="320.0" prefWidth="1302.0" BorderPane.alignment="CENTER">
+              <columns>
+                <TableColumn fx:id="no" prefWidth="54.0" />
+                <TableColumn fx:id="materialNameColumn" prefWidth="78.0" text="材料名称" />
+                  <TableColumn fx:id="relatedMaterialColumn" prefWidth="76.0" text="材料名称" />
+                  <TableColumn fx:id="specificationColumn" prefWidth="223.0" text="规格" />
+                  <TableColumn fx:id="manufacturerColumn" minWidth="0.0" prefWidth="215.0" text="制造厂商" />
+                  <TableColumn fx:id="quantityColumn" prefWidth="81.0" text="数量(净重)" />
+                  <TableColumn fx:id="utilizationRateColumn" prefWidth="71.0" text="利用率" />
+                  <TableColumn fx:id="unitColumn" prefWidth="60.0" text="单位" />
+                  <TableColumn fx:id="unitPriceColumn" prefWidth="89.0" text="单价(元)" />
+                  <TableColumn fx:id="amountColumn" prefWidth="85.0" text="金额(元)" />
+                  <TableColumn fx:id="comparedQuantityColumn" prefWidth="74.0" text="对比数量" />
+                  <TableColumn fx:id="comparedUnitPriceColumn" prefWidth="75.0" text="对比单价" />
+                  <TableColumn fx:id="comparedResultColumn" prefWidth="114.0" text="对比结果(元)" />
+              </columns>
+            </TableView>
+         </center>
+         <bottom>
+            <BorderPane fx:id="bordPane" prefHeight="60.0" prefWidth="314.0" BorderPane.alignment="CENTER">
+               <center>
+                  <FlowPane alignment="CENTER_RIGHT" prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+                     <children>
+                        <FlowPane alignment="CENTER" prefHeight="43.0" prefWidth="447.0">
+                           <children>
+                              <Label alignment="CENTER" contentDisplay="CENTER" nodeOrientation="LEFT_TO_RIGHT" text="颜色备注：">
+                                 <FlowPane.margin>
+                                    <Insets top="10.0" />
+                                 </FlowPane.margin>
+                              </Label>
+                              <TextField editable="false" prefHeight="20.0" prefWidth="37.0" style="-fx-background-color: #FF6600;">
+                                 <FlowPane.margin>
+                                    <Insets top="10.0" />
+                                 </FlowPane.margin>
+                              </TextField>
+                              <Label text="：代表亏损    ">
+                                 <FlowPane.margin>
+                                    <Insets top="10.0" />
+                                 </FlowPane.margin>
+                              </Label>
+                              <TextField editable="false" prefHeight="20.0" prefWidth="37.0" style="-fx-background-color: #A9D08E;">
+                                 <FlowPane.margin>
+                                    <Insets top="10.0" />
+                                 </FlowPane.margin>
+                              </TextField>
+                              <Label text="：代表盈利    ">
+                                 <FlowPane.margin>
+                                    <Insets top="10.0" />
+                                 </FlowPane.margin>
+                              </Label>
+                           </children>
+                        </FlowPane>
+                        <Label prefWidth="86.0" text="     总价：" />
+                        <TextField fx:id="totalPriceTextField" prefHeight="30.0" prefWidth="131.0" />
+                     </children>
+                  </FlowPane>
+               </center>
+               <bottom>
+                  <FlowPane alignment="CENTER_RIGHT" prefHeight="50.0" prefWidth="1237.0" BorderPane.alignment="CENTER">
+                     <children>
+                        <Label text="总价对比结果：" />
+                        <TextField fx:id="totalPriceCompareTextField" prefHeight="30.0" prefWidth="131.0" />
+                     </children>
+                  </FlowPane>
+               </bottom>
+               <padding>
+                  <Insets top="2.0" />
+               </padding>
+            </BorderPane>
+         </bottom>
+      </BorderPane>
+      <FlowPane alignment="TOP_RIGHT" hgap="40.0" layoutX="160.0" layoutY="26.0" prefHeight="48.0" prefWidth="1151.0" AnchorPane.rightAnchor="10.0">
+         <children>
+            <Label fx:id="costSheetTypeLabel" prefHeight="20.0" prefWidth="83.0" text="成本单类型:" />
+            <ComboBox fx:id="costSheetTypeComboBox" prefHeight="30.0" prefWidth="216.0" />
+            <Label fx:id="editionLabel" prefHeight="20.0" prefWidth="52.0" text="版次:" />
+            <ComboBox fx:id="editionComboBox" prefWidth="100.0" />
+            <Label fx:id="comparedCostSheetLabel" prefHeight="20.0" prefWidth="113.0" text="要对比的成本单:" />
+            <TextField fx:id="comparedCostSheetTextField" prefHeight="30.0" prefWidth="200.0" />
+         </children>
+      </FlowPane>
+      <GridPane fx:id="centerPane" layoutX="14.0" layoutY="304.0" prefHeight="48.0" prefWidth="1297.0" style="-fx-border-color: gray; -fx-border-width: 0.5px; -fx-border-radius: 5px;" AnchorPane.leftAnchor="9.0" AnchorPane.rightAnchor="10.0">
+        <columnConstraints>
+          <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+            <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+            <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+        </columnConstraints>
+        <rowConstraints>
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+        </rowConstraints>
+         <children>
+            <Label fx:id="copperAmountLabel" prefHeight="20.0" prefWidth="83.0" text="用铜量(kg):" />
+            <TextField fx:id="copperAmountTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="1" />
+            <Label fx:id="copperMarketPriceLabel" prefHeight="20.0" prefWidth="139.0" text="铜价市场价(元/kg):" GridPane.columnIndex="2" />
+            <TextField fx:id="copperMarketPriceTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="3" />
+            <Label fx:id="voltageLevelLabel" prefHeight="20.0" prefWidth="74.0" text="电压等级:" GridPane.columnIndex="4" />
+            <TextField fx:id="voltageLevelTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="5" />
+         </children>
+         <padding>
+            <Insets right="15.0" />
+         </padding>
+      </GridPane>
+      <TextArea fx:id="changeReason" layoutX="106.0" layoutY="794.0" prefHeight="106.0" prefWidth="450.0" AnchorPane.bottomAnchor="1.0" />
+      <Label layoutX="37.0" layoutY="796.0" text="更改原因：" AnchorPane.bottomAnchor="90.0" />
+   </children>
+   <padding>
+      <Insets bottom="30.0" left="5.0" right="5.0" top="10.0" />
+   </padding>
+</AnchorPane>
diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/PersonOverview1.fxml b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/PersonOverview1.fxml
new file mode 100644
index 0000000..1ff9eaf
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/PersonOverview1.fxml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import java.lang.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.Pane?>
+
+<AnchorPane fx:id="coverPane" prefHeight="814.0" prefWidth="1329.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.connor.plm.CreateOuotation.MyController">
+   <children>
+      <Label fx:id="costSheetTypeLabel" layoutX="461.0" layoutY="50.0" prefHeight="20.0" prefWidth="83.0" text="成本单类型:" />
+      <ComboBox fx:id="costSheetTypeComboBox" layoutX="560.0" layoutY="45.0" prefWidth="160.0" />
+      <Label fx:id="editionLabel" layoutX="762.0" layoutY="50.0" prefHeight="20.0" prefWidth="52.0" text="版次:" />
+      <ComboBox fx:id="editionComboBox" layoutX="822.0" layoutY="45.0" prefWidth="100.0" />
+      <Label fx:id="comparedCostSheetLabel" layoutX="957.0" layoutY="50.0" prefHeight="20.0" prefWidth="113.0" text="要对比的成本单:" />
+      <TextField fx:id="comparedCostSheetTextField" layoutX="1093.0" layoutY="45.0" prefHeight="30.0" prefWidth="200.0" />
+      <Pane fx:id="centerPane" layoutX="14.0" layoutY="299.0" prefHeight="48.0" prefWidth="1302.0" style="-fx-border-color: gray; -fx-border-width: 0.5px; -fx-border-radius: 5px;">
+         <children>
+            <Label fx:id="copperAmountLabel" layoutX="25.0" layoutY="14.0" prefHeight="20.0" prefWidth="83.0" text="用铜量(kg):" />
+            <TextField fx:id="copperAmountTextField" layoutX="131.0" layoutY="9.0" prefHeight="20.0" prefWidth="166.0" />
+            <Label fx:id="copperMarketPriceLabel" layoutX="375.0" layoutY="14.0" prefHeight="20.0" prefWidth="139.0" text="铜价市场价(元/kg):" />
+            <TextField fx:id="copperMarketPriceTextField" layoutX="533.0" layoutY="9.0" prefHeight="20.0" prefWidth="166.0" />
+            <Label fx:id="voltageLevelLabel" layoutX="766.0" layoutY="14.0" prefHeight="20.0" prefWidth="74.0" text="电压等级:" />
+            <TextField fx:id="voltageLevelTextField" layoutX="854.0" layoutY="9.0" prefHeight="20.0" prefWidth="166.0" />
+         </children>
+      </Pane>
+      <Pane fx:id="tablePane" layoutX="14.0" layoutY="365.0" prefHeight="380.0" prefWidth="1302.0">
+         <children>
+            <TableView fx:id="materialsTable" prefHeight="309.0" prefWidth="1302.0">
+              <columns>
+                <TableColumn fx:id="no" prefWidth="75.0" />
+                <TableColumn fx:id="materialNameColumn" prefWidth="126.0" text="材料名称" />
+                  <TableColumn fx:id="relatedMaterialColumn" prefWidth="122.0" text="材料名称" />
+                  <TableColumn fx:id="specificationColumn" prefWidth="250.0" text="规格" />
+                  <TableColumn fx:id="manufacturerColumn" minWidth="0.0" prefWidth="203.0" text="制造厂商" />
+                  <TableColumn fx:id="quantityColumn" prefWidth="91.0" text="数量(净重)" />
+                  <TableColumn fx:id="utilizationRateColumn" prefWidth="69.0" text="利用率" />
+                  <TableColumn fx:id="unitColumn" prefWidth="70.0" text="单位" />
+                  <TableColumn fx:id="unitPriceColumn" prefWidth="86.0" text="单价(元)" />
+                  <TableColumn fx:id="amountColumn" prefWidth="94.0" text="金额(元)" />
+                  <TableColumn fx:id="comparedResultColumn" prefWidth="115.0" text="对比结果(元)" />
+              </columns>
+            </TableView>
+            <BorderPane fx:id="bordPane" layoutX="974.0" layoutY="309.0" prefHeight="60.0" prefWidth="314.0">
+               <center>
+                  <FlowPane alignment="CENTER_RIGHT" prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+                     <children>
+                        <Label prefWidth="86.0" text="     总价：" />
+                        <TextField fx:id="totalPriceTextField" prefHeight="30.0" prefWidth="131.0" />
+                     </children>
+                  </FlowPane>
+               </center>
+               <bottom>
+                  <FlowPane alignment="CENTER_RIGHT" prefHeight="50.0" prefWidth="314.0" BorderPane.alignment="CENTER">
+                     <children>
+                        <Label text="总价对比结果：" />
+                        <TextField fx:id="totalPriceCompareTextField" prefHeight="30.0" prefWidth="131.0" />
+                     </children>
+                  </FlowPane>
+               </bottom>
+               <padding>
+                  <Insets top="2.0" />
+               </padding>
+            </BorderPane>
+         </children>
+      </Pane>
+      <Button fx:id="saveButton" layoutX="750.0" layoutY="759.0" mnemonicParsing="false" prefWidth="100.0" text="保存" />
+      <Button fx:id="calculateButton" layoutX="900.0" layoutY="759.0" mnemonicParsing="false" prefWidth="100.0" text="计算金额" />
+      <Button fx:id="selectComparisonButton" layoutX="1050.0" layoutY="759.0" mnemonicParsing="false" prefWidth="100.0" text="选择对比" />
+      <Button fx:id="compareButton" layoutX="1200.0" layoutY="759.0" mnemonicParsing="false" prefWidth="100.0" text="对比" />
+      <GridPane fx:id="gridPane" layoutX="14.0" layoutY="108.0" prefHeight="189.0" prefWidth="1302.0">
+        <columnConstraints>
+            <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+          <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+            <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+            <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+        </columnConstraints>
+        <rowConstraints>
+            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+        </rowConstraints>
+         <children>
+            <Label fx:id="projectNameLabel" prefHeight="20.0" prefWidth="83.0" text="项目名称:" />
+            <TextField fx:id="projectNameTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="1" />
+            <Label fx:id="transformerModelLabel" prefHeight="20.0" prefWidth="83.0" text="变压器型号:" GridPane.rowIndex="1" />
+            <TextField fx:id="transformerModelTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+            <Label fx:id="noLoadLossLabel" prefHeight="20.0" prefWidth="83.0" text="空载损耗:" GridPane.rowIndex="2" />
+            <TextField fx:id="noLoadLossTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+            <Label fx:id="loadLossLabel" prefHeight="20.0" prefWidth="120.0" text="负载损耗(KW):" GridPane.rowIndex="3" />
+            <TextField fx:id="loadLossTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+            <Label fx:id="biddingNumberLabel" prefHeight="20.0" prefWidth="83.0" text="投标编号:" GridPane.columnIndex="2" />
+            <Label fx:id="capacityRatioLabel" prefHeight="20.0" prefWidth="120.0" text="容量比(MVA):" GridPane.columnIndex="2" GridPane.rowIndex="1" />
+            <Label fx:id="impedanceVoltageLabel" prefHeight="20.0" prefWidth="83.0" text="阻抗电压:" GridPane.columnIndex="2" GridPane.rowIndex="2" />
+            <TextField fx:id="biddingNumberTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="3" />
+            <TextField fx:id="capacityRatioTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="3" GridPane.rowIndex="1" />
+            <TextField fx:id="impedanceVoltageTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="3" GridPane.rowIndex="2" />
+            <Label fx:id="projectManagerLabel" prefHeight="20.0" prefWidth="83.0" text="项目经理:" GridPane.columnIndex="4" />
+            <Label fx:id="voltageRatioLabel" prefHeight="20.0" prefWidth="83.0" text="电压比(kV):" GridPane.columnIndex="4" GridPane.rowIndex="1" />
+            <Label fx:id="transportationWeightLabel" prefHeight="20.0" prefWidth="83.0" text="运输重(t):" GridPane.columnIndex="4" GridPane.rowIndex="2" />
+            <TextField fx:id="projectManagerTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="5" />
+            <TextField fx:id="voltageRatioTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="5" GridPane.rowIndex="1" />
+            <TextField fx:id="transportationWeightTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="5" GridPane.rowIndex="2" />
+            <Label fx:id="quantityLabel" prefHeight="20.0" prefWidth="83.0" text="数量:" GridPane.columnIndex="6" />
+            <TextField fx:id="quantityTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="7" />
+            <Label fx:id="totalWeightLabel" prefHeight="20.0" prefWidth="83.0" text="总重(t):" GridPane.columnIndex="6" GridPane.rowIndex="2" />
+            <TextField fx:id="totalWeightTextField" prefHeight="20.0" prefWidth="166.0" GridPane.columnIndex="7" GridPane.rowIndex="2" />
+         </children>
+      </GridPane>
+   </children>
+</AnchorPane>
diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/PersonOverview2.fxml b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/PersonOverview2.fxml
new file mode 100644
index 0000000..b821cf1
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/PersonOverview2.fxml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.Pane?>
+
+<AnchorPane fx:id="coverPane" prefHeight="814.0" prefWidth="1329.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.connor.plm.CreateOuotation.MyController">
+   <children>
+      <Pane fx:id="topPane" layoutX="14.0" layoutY="91.0" prefHeight="189.0" prefWidth="1302.0" style="-fx-border-color: gray; -fx-border-width: 0.5px; -fx-border-radius: 5px;">
+         <children>
+            <Label fx:id="projectNameLabel" layoutX="23.0" layoutY="16.0" prefHeight="20.0" prefWidth="83.0" text="项目名称:" />
+            <Label fx:id="transformerModelLabel" layoutX="23.0" layoutY="60.0" prefHeight="20.0" prefWidth="83.0" text="变压器型号:" />
+            <Label fx:id="noLoadLossLabel" layoutX="23.0" layoutY="105.0" prefHeight="20.0" prefWidth="83.0" text="空载损耗:" />
+            <Label fx:id="loadLossLabel" layoutX="23.0" layoutY="148.0" prefHeight="20.0" prefWidth="120.0" text="负载损耗(KW):" />
+            <TextField fx:id="projectNameTextField" layoutX="129.0" layoutY="11.0" prefHeight="20.0" prefWidth="166.0" />
+            <TextField fx:id="transformerModelTextField" layoutX="129.0" layoutY="55.0" prefHeight="20.0" prefWidth="166.0" />
+            <TextField fx:id="noLoadLossTextField" layoutX="129.0" layoutY="100.0" prefHeight="20.0" prefWidth="166.0" />
+            <TextField fx:id="loadLossTextField" layoutX="129.0" layoutY="143.0" prefHeight="20.0" prefWidth="166.0" />
+            <Label fx:id="biddingNumberLabel" layoutX="355.0" layoutY="16.0" prefHeight="20.0" prefWidth="83.0" text="投标编号:" />
+            <TextField fx:id="biddingNumberTextField" layoutX="473.0" layoutY="11.0" prefHeight="20.0" prefWidth="166.0" />
+            <Label fx:id="capacityRatioLabel" layoutX="355.0" layoutY="60.0" prefHeight="20.0" prefWidth="120.0" text="容量比(MVA):" />
+            <TextField fx:id="capacityRatioTextField" layoutX="473.0" layoutY="55.0" prefHeight="20.0" prefWidth="166.0" />
+            <Label fx:id="impedanceVoltageLabel" layoutX="355.0" layoutY="105.0" prefHeight="20.0" prefWidth="83.0" text="阻抗电压:" />
+            <Label fx:id="projectManagerLabel" layoutX="705.0" layoutY="16.0" prefHeight="20.0" prefWidth="83.0" text="项目经理:" />
+            <TextField fx:id="impedanceVoltageTextField" layoutX="473.0" layoutY="100.0" prefHeight="20.0" prefWidth="166.0" />
+            <TextField fx:id="projectManagerTextField" layoutX="825.0" layoutY="11.0" prefHeight="20.0" prefWidth="166.0" />
+            <Label fx:id="voltageRatioLabel" layoutX="705.0" layoutY="60.0" prefHeight="20.0" prefWidth="83.0" text="电压比(kV):" />
+            <Label fx:id="transportationWeightLabel" layoutX="705.0" layoutY="105.0" prefHeight="20.0" prefWidth="83.0" text="运输重(t):" />
+            <TextField fx:id="voltageRatioTextField" layoutX="825.0" layoutY="55.0" prefHeight="20.0" prefWidth="166.0" />
+            <TextField fx:id="transportationWeightTextField" layoutX="825.0" layoutY="100.0" prefHeight="20.0" prefWidth="166.0" />
+            <Label fx:id="quantityLabel" layoutX="1044.0" layoutY="15.0" prefHeight="20.0" prefWidth="83.0" text="数量:" />
+            <Label fx:id="totalWeightLabel" layoutX="1044.0" layoutY="105.0" prefHeight="20.0" prefWidth="83.0" text="总重(t):" />
+            <TextField fx:id="quantityTextField" layoutX="1113.0" layoutY="11.0" prefHeight="20.0" prefWidth="166.0" />
+            <TextField fx:id="totalWeightTextField" layoutX="1113.0" layoutY="100.0" prefHeight="20.0" prefWidth="166.0" />
+         </children>
+      </Pane>
+      <Label fx:id="costSheetTypeLabel" layoutX="461.0" layoutY="50.0" prefHeight="20.0" prefWidth="83.0" text="成本单类型:" />
+      <ComboBox fx:id="costSheetTypeComboBox" layoutX="560.0" layoutY="45.0" prefWidth="160.0" />
+      <Label fx:id="editionLabel" layoutX="762.0" layoutY="50.0" prefHeight="20.0" prefWidth="52.0" text="版次:" />
+      <ComboBox fx:id="editionComboBox" layoutX="822.0" layoutY="45.0" prefWidth="100.0" />
+      <Label fx:id="comparedCostSheetLabel" layoutX="957.0" layoutY="50.0" prefHeight="20.0" prefWidth="113.0" text="要对比的成本单:" />
+      <TextField fx:id="comparedCostSheetTextField" layoutX="1093.0" layoutY="45.0" prefHeight="30.0" prefWidth="200.0" />
+      <Pane fx:id="centerPane" layoutX="14.0" layoutY="299.0" prefHeight="48.0" prefWidth="1302.0" style="-fx-border-color: gray; -fx-border-width: 0.5px; -fx-border-radius: 5px;">
+         <children>
+            <Label fx:id="copperAmountLabel" layoutX="25.0" layoutY="14.0" prefHeight="20.0" prefWidth="83.0" text="用铜量(kg):" />
+            <TextField fx:id="copperAmountTextField" layoutX="131.0" layoutY="9.0" prefHeight="20.0" prefWidth="166.0" />
+            <Label fx:id="copperMarketPriceLabel" layoutX="375.0" layoutY="14.0" prefHeight="20.0" prefWidth="139.0" text="铜价市场价(元/kg):" />
+            <TextField fx:id="copperMarketPriceTextField" layoutX="533.0" layoutY="9.0" prefHeight="20.0" prefWidth="166.0" />
+            <Label fx:id="voltageLevelLabel" layoutX="766.0" layoutY="14.0" prefHeight="20.0" prefWidth="74.0" text="电压等级:" />
+            <TextField fx:id="voltageLevelTextField" layoutX="854.0" layoutY="9.0" prefHeight="20.0" prefWidth="166.0" />
+         </children>
+      </Pane>
+      <Pane fx:id="tablePane" layoutX="14.0" layoutY="365.0" prefHeight="380.0" prefWidth="1302.0">
+         <children>
+            <TableView fx:id="materialsTable" prefHeight="309.0" prefWidth="1302.0">
+              <columns>
+                <TableColumn fx:id="no" prefWidth="75.0" />
+                <TableColumn fx:id="materialNameColumn" prefWidth="126.0" text="材料名称" />
+                  <TableColumn fx:id="relatedMaterialColumn" prefWidth="122.0" text="材料名称" />
+                  <TableColumn fx:id="specificationColumn" prefWidth="250.0" text="规格" />
+                  <TableColumn fx:id="manufacturerColumn" minWidth="0.0" prefWidth="203.0" text="制造厂商" />
+                  <TableColumn fx:id="quantityColumn" prefWidth="91.0" text="数量(净重)" />
+                  <TableColumn fx:id="utilizationRateColumn" prefWidth="69.0" text="利用率" />
+                  <TableColumn fx:id="unitColumn" prefWidth="70.0" text="单位" />
+                  <TableColumn fx:id="unitPriceColumn" prefWidth="86.0" text="单价(元)" />
+                  <TableColumn fx:id="amountColumn" prefWidth="94.0" text="金额(元)" />
+                  <TableColumn fx:id="comparedResultColumn" prefWidth="115.0" text="对比结果(元)" />
+              </columns>
+            </TableView>
+            <TextField fx:id="totalPriceTextField" layoutX="1171.0" layoutY="308.0" prefHeight="30.0" prefWidth="131.0" />
+            <Label layoutX="1085.0" layoutY="313.0" prefWidth="86.0" text="     总价：" />
+            <Label layoutX="1050.0" layoutY="346.0" text="总价对比结果：" />
+            <TextField fx:id="totalPriceCompareTextField" layoutX="1171.0" layoutY="341.0" prefHeight="30.0" prefWidth="131.0" />
+         </children>
+      </Pane>
+      <Button fx:id="saveButton" layoutX="750.0" layoutY="759.0" mnemonicParsing="false" prefWidth="100.0" text="保存" />
+      <Button fx:id="calculateButton" layoutX="900.0" layoutY="759.0" mnemonicParsing="false" prefWidth="100.0" text="计算金额" />
+      <Button fx:id="selectComparisonButton" layoutX="1050.0" layoutY="759.0" mnemonicParsing="false" prefWidth="100.0" text="选择对比" />
+      <Button fx:id="compareButton" layoutX="1200.0" layoutY="759.0" mnemonicParsing="false" prefWidth="100.0" text="对比" />
+   </children>
+</AnchorPane>
diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/GZXQ/a - 副本.fxml b/com.connor.chint.wuhan/bin/com/connor/plm/GZXQ/a - 副本.fxml
new file mode 100644
index 0000000..d38317f
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/connor/plm/GZXQ/a - 副本.fxml	
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import java.lang.*?>
+<?import javafx.scene.layout.*?>
+
+<Pane fx:id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="840.0" prefWidth="1270.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.connor.plm.GZXQ.GZXQController">
+   <children>
+      <BorderPane fx:id="bpane" layoutX="5.0" layoutY="14.0" prefHeight="840.0" prefWidth="1261.0">
+         <top>
+            <TitledPane fx:id="titlePaneCondition" animated="false" prefHeight="182.0" prefWidth="1034.0" text="条件" BorderPane.alignment="CENTER">
+              <content>
+                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="151.0" prefWidth="964.0">
+                     <children>
+                        <GridPane fx:id="gridPaneCondition" layoutX="13.0" layoutY="11.0" prefHeight="114.0" prefWidth="1218.0">
+                          <columnConstraints>
+                              <ColumnConstraints hgrow="SOMETIMES" maxWidth="109.0" minWidth="10.0" prefWidth="86.0" />
+                              <ColumnConstraints hgrow="SOMETIMES" maxWidth="216.0" minWidth="10.0" prefWidth="164.0" />
+                              <ColumnConstraints hgrow="SOMETIMES" maxWidth="112.0" minWidth="10.0" prefWidth="93.0" />
+                              <ColumnConstraints hgrow="SOMETIMES" maxWidth="233.0" minWidth="10.0" prefWidth="185.0" />
+                              <ColumnConstraints hgrow="SOMETIMES" maxWidth="103.0" minWidth="10.0" prefWidth="95.0" />
+                              <ColumnConstraints hgrow="SOMETIMES" maxWidth="246.0" minWidth="10.0" prefWidth="191.0" />
+                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="189.0" minWidth="10.0" prefWidth="97.0" />
+                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="212.0" minWidth="10.0" prefWidth="212.0" />
+                          </columnConstraints>
+                          <rowConstraints>
+                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                          </rowConstraints>
+                           <children>
+                              <TextField fx:id="jTextField1" GridPane.columnIndex="1" />
+                              <TextField fx:id="jTextField2" prefHeight="30.0" prefWidth="189.0" GridPane.columnIndex="3" />
+                              <TextField fx:id="jTextField5" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                              <TextField fx:id="jTextField6" prefHeight="30.0" prefWidth="152.0" GridPane.columnIndex="3" GridPane.rowIndex="1" />
+                              <TextField fx:id="jTextField7" GridPane.columnIndex="5" GridPane.rowIndex="1" />
+                              <TextField fx:id="jTextField3" GridPane.columnIndex="5" />
+                              <TextField fx:id="jTextField8" GridPane.columnIndex="7" GridPane.rowIndex="1" />
+                              <TextField fx:id="jTextField4" prefHeight="30.0" prefWidth="168.0" GridPane.columnIndex="7" />
+                              <TextField fx:id="jTextField9" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                              <TextField fx:id="jTextField10" GridPane.columnIndex="3" GridPane.rowIndex="2" />
+                              <Label text="流程实例ID" GridPane.halignment="CENTER" />
+                              <Label text="工装名称" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+                              <Label text="产品名称" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
+                              <Label text="工艺负责人" GridPane.columnIndex="2" GridPane.halignment="CENTER" />
+                              <Label text="委托理由" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+                              <Label text="工装等级" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
+                              <Label text="产品型号" GridPane.columnIndex="4" GridPane.halignment="CENTER" />
+                              <Label text="计划时间" GridPane.columnIndex="4" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+                              <Label GridPane.columnIndex="4" GridPane.rowIndex="2" />
+                              <Label text="工装编号" GridPane.columnIndex="6" GridPane.halignment="CENTER" />
+                              <Label text="申请人" GridPane.columnIndex="6" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+                              <Button fx:id="jButton2" mnemonicParsing="false" onAction="#cxAction" prefHeight="30.0" prefWidth="98.0" text="查   询" GridPane.columnIndex="7" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="BOTTOM">
+                                 <GridPane.margin>
+                                    <Insets />
+                                 </GridPane.margin>
+                              </Button>
+                           </children>
+                        </GridPane>
+                     </children>
+                  </AnchorPane>
+              </content>
+            </TitledPane>
+         </top>
+         <center>
+            <TitledPane fx:id="titlePaneResult" animated="false" prefHeight="620.0" prefWidth="966.0" text="结果" BorderPane.alignment="CENTER">
+              <content>
+                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="570.0" prefWidth="964.0">
+                     <children>
+                        <BorderPane fx:id="tablePane" layoutX="8.0" layoutY="6.0" prefHeight="573.0" prefWidth="1245.0">
+                           <top>
+                              <TableView fx:id="tableView" prefHeight="544.0" prefWidth="1195.0" BorderPane.alignment="CENTER" />
+                           </top>
+                           <bottom>
+                              <GridPane fx:id="gridPaneResult" prefHeight="29.0" prefWidth="948.0" BorderPane.alignment="CENTER">
+                                <columnConstraints>
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                </columnConstraints>
+                                <rowConstraints>
+                                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                </rowConstraints>
+                                 <children>
+                                    <Button fx:id="sy" mnemonicParsing="false" onAction="#firstBtnAction" text="首页" GridPane.columnIndex="2" />
+                                    <Button fx:id="syy" mnemonicParsing="false" onAction="#lastBtnAction" text="上一页" GridPane.columnIndex="3" />
+                                    <Button mnemonicParsing="false" onAction="#nextBtnAction" text="下一页" GridPane.columnIndex="4" fx:id="xyy" />
+                                    <Button fx:id="wy" mnemonicParsing="false" onAction="#tailBtnAction" text="尾页" GridPane.columnIndex="5" />
+                                 </children>
+                              </GridPane>
+                           </bottom>
+                        </BorderPane>
+                     </children>
+                  </AnchorPane>
+              </content>
+            </TitledPane>
+         </center>
+      </BorderPane>
+   </children>
+</Pane>
diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/GZXQ/a.fxml b/com.connor.chint.wuhan/bin/com/connor/plm/GZXQ/a.fxml
new file mode 100644
index 0000000..2d5bcbd
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/connor/plm/GZXQ/a.fxml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import java.lang.*?>
+<?import javafx.scene.layout.*?>
+
+<Pane fx:id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="840.0" prefWidth="1270.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.connor.plm.GZXQ.GZXQController">
+   <children>
+      <BorderPane fx:id="bpane" layoutX="5.0" layoutY="14.0" prefHeight="840.0" prefWidth="1261.0">
+         <top>
+            <TitledPane fx:id="titlePaneCondition" animated="false" prefHeight="182.0" prefWidth="1034.0" text="条件" BorderPane.alignment="CENTER">
+              <content>
+                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="151.0" prefWidth="964.0">
+                     <children>
+                        <GridPane fx:id="gridPaneCondition" layoutX="13.0" layoutY="11.0" prefHeight="114.0" prefWidth="1218.0">
+                          <columnConstraints>
+                              <ColumnConstraints hgrow="SOMETIMES" maxWidth="109.0" minWidth="10.0" prefWidth="86.0" />
+                              <ColumnConstraints hgrow="SOMETIMES" maxWidth="216.0" minWidth="10.0" prefWidth="164.0" />
+                              <ColumnConstraints hgrow="SOMETIMES" maxWidth="112.0" minWidth="10.0" prefWidth="93.0" />
+                              <ColumnConstraints hgrow="SOMETIMES" maxWidth="233.0" minWidth="10.0" prefWidth="185.0" />
+                              <ColumnConstraints hgrow="SOMETIMES" maxWidth="103.0" minWidth="10.0" prefWidth="95.0" />
+                              <ColumnConstraints hgrow="SOMETIMES" maxWidth="246.0" minWidth="10.0" prefWidth="191.0" />
+                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="189.0" minWidth="10.0" prefWidth="97.0" />
+                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="212.0" minWidth="10.0" prefWidth="212.0" />
+                          </columnConstraints>
+                          <rowConstraints>
+                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                          </rowConstraints>
+                           <children>
+                              <TextField fx:id="jTextField1" GridPane.columnIndex="1" />
+                              <TextField fx:id="jTextField2" prefHeight="30.0" prefWidth="189.0" GridPane.columnIndex="3" />
+                              <TextField fx:id="jTextField5" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                              <TextField fx:id="jTextField6" prefHeight="30.0" prefWidth="152.0" GridPane.columnIndex="3" GridPane.rowIndex="1" />
+                              <TextField fx:id="jTextField3" GridPane.columnIndex="5" />
+                              <TextField fx:id="jTextField8" GridPane.columnIndex="7" GridPane.rowIndex="1" />
+                              <TextField fx:id="jTextField4" prefHeight="30.0" prefWidth="168.0" GridPane.columnIndex="7" />
+                              <TextField fx:id="jTextField9" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                              <TextField fx:id="jTextField10" GridPane.columnIndex="3" GridPane.rowIndex="2" />
+                              <Label text="流程实例ID" GridPane.halignment="CENTER" />
+                              <Label text="工装名称" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+                              <Label text="产品名称" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
+                              <Label text="工艺负责人" GridPane.columnIndex="2" GridPane.halignment="CENTER" />
+                              <Label text="委托理由" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+                              <Label text="工装等级" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
+                              <Label text="产品型号" GridPane.columnIndex="4" GridPane.halignment="CENTER" />
+                              <Label text="计划时间" GridPane.columnIndex="4" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+                              <Label GridPane.columnIndex="4" GridPane.rowIndex="2" />
+                              <Label text="工装编号" GridPane.columnIndex="6" GridPane.halignment="CENTER" />
+                              <Label text="申请人" GridPane.columnIndex="6" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+                              <Button fx:id="jButton2" mnemonicParsing="false" onAction="#cxAction" prefHeight="30.0" prefWidth="98.0" text="查   询" GridPane.columnIndex="7" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="BOTTOM">
+                                 <GridPane.margin>
+                                    <Insets />
+                                 </GridPane.margin>
+                              </Button>
+                              <DatePicker GridPane.columnIndex="5" GridPane.rowIndex="1" />
+                              <DatePicker fx:id="jTextField7" GridPane.columnIndex="5" GridPane.rowIndex="1" />
+                           </children>
+                        </GridPane>
+                     </children>
+                  </AnchorPane>
+              </content>
+            </TitledPane>
+         </top>
+         <center>
+            <TitledPane fx:id="titlePaneResult" animated="false" prefHeight="620.0" prefWidth="966.0" text="结果" BorderPane.alignment="CENTER">
+              <content>
+                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="570.0" prefWidth="964.0">
+                     <children>
+                        <BorderPane fx:id="tablePane" layoutX="8.0" layoutY="6.0" prefHeight="573.0" prefWidth="1245.0">
+                           <top>
+                              <TableView fx:id="tableView" prefHeight="544.0" prefWidth="1195.0" BorderPane.alignment="CENTER" />
+                           </top>
+                           <bottom>
+                              <GridPane fx:id="gridPaneResult" prefHeight="29.0" prefWidth="948.0" BorderPane.alignment="CENTER">
+                                <columnConstraints>
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                </columnConstraints>
+                                <rowConstraints>
+                                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                </rowConstraints>
+                                 <children>
+                                    <Button fx:id="sy" mnemonicParsing="false" onAction="#firstBtnAction" text="首页" GridPane.columnIndex="2" />
+                                    <Button fx:id="syy" mnemonicParsing="false" onAction="#lastBtnAction" text="上一页" GridPane.columnIndex="3" />
+                                    <Button mnemonicParsing="false" onAction="#nextBtnAction" text="下一页" GridPane.columnIndex="4" fx:id="xyy" />
+                                    <Button fx:id="wy" mnemonicParsing="false" onAction="#tailBtnAction" text="尾页" GridPane.columnIndex="5" />
+                                 </children>
+                              </GridPane>
+                           </bottom>
+                        </BorderPane>
+                     </children>
+                  </AnchorPane>
+              </content>
+            </TitledPane>
+         </center>
+      </BorderPane>
+   </children>
+</Pane>
diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/process/process_locale.properties b/com.connor.chint.wuhan/bin/com/connor/plm/process/process_locale.properties
new file mode 100644
index 0000000..ba94edb
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/connor/plm/process/process_locale.properties
@@ -0,0 +1,24 @@
+preferr=\u9996\u9009\u9879\u914D\u7F6E\u4E0D\u6B63\u786E
+err=\u9519\u8BEF\uFF1A
+#ProcessCheckDialog
+title=\u5DE5\u827A\u8DEF\u7EBF\u9F50\u5957\u6027\u68C0\u67E5
+cols=\u5E8F\u53F7;\u7269\u6599\u7F16\u7801;\u7269\u6599\u540D\u79F0;\u662F\u5426\u5173\u8054\u5DE5\u827A\u8DEF\u7EBF
+xmzx=\u9879\u76EE\u6267\u884C
+zztz=13-\u603B\u88C5\u56FE\u7EB8
+msg1=\u8BF7\u9009\u62E9\u9879\u76EE\u5BF9\u8C61
+msg2=\u672A\u627E\u5230\u603B\u88C5\u56FE\u7EB8
+yes=\u662F
+no=\u5426
+#AssProcessAutoFeedingCommand
+cpxh=\u4EA7\u54C1\u578B\u53F7
+info1=\u8BF7\u767B\u5F55\u6B63\u786E\u7EC4
+info2=\u8BF7\u9009\u62E9BOM\u884C\u6216\u8005\u7248\u672C\u5BF9\u8C61
+info3=\u8BF7\u9009\u62E9PBOM\u5BF9\u8C61
+info4=\u672A\u627E\u5230\u4EA7\u6210\u54C1\u6587\u4EF6\u5939\uFF0C\u8BF7\u68C0\u67E5
+info5=\u5B58\u5728\u9876\u5C42P\u7269\u6599\u6CA1\u6709\u5173\u8054\u56FE\u7EB8\uFF0C\u8BF7\u68C0\u67E5
+info6=\u5F53\u524D\u4EA7\u54C1\u578B\u53F7\u672A\u7EF4\u62A4\uFF0C\u8BF7\u9009\u62E9\u5BF9\u5E94\u4EA7\u54C1\u65CF
+info7=\u6B63\u5728\u8FDB\u884C\u4E00\u952E\u6307\u6D3E\u5DE5\u827A\u8DEF\u7EBF......
+info8=\u6307\u6D3E\u5DE5\u827A\u8DEF\u7EBF\u5B58\u5728\u5F02\u5E38\uFF0C\u8BF7\u68C0\u67E5\uFF1A\n
+info9=\u6B63\u5728\u8FDB\u884C\u81EA\u52A8\u6295\u6599......
+info10=\u81EA\u52A8\u6295\u6599\u5B58\u5728\u5F02\u5E38\uFF0C\u8BF7\u68C0\u67E5\uFF1A\n
+info11=\u6307\u6D3E\u5DE5\u827A\u8DEF\u7EBF\u4E0E\u81EA\u52A8\u6295\u6599\u5B8C\u6210
diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/process/process_locale_zh_CN.properties b/com.connor.chint.wuhan/bin/com/connor/plm/process/process_locale_zh_CN.properties
new file mode 100644
index 0000000..f574841
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/connor/plm/process/process_locale_zh_CN.properties
@@ -0,0 +1,24 @@
+preferr=\u9996\u9009\u9879\u914D\u7F6E\u4E0D\u6B63\u786E
+#ProcessCheckDialog
+err=\u9519\u8BEF\uFF1A
+title=\u5DE5\u827A\u8DEF\u7EBF\u9F50\u5957\u6027\u68C0\u67E5
+cols=\u5E8F\u53F7;\u7269\u6599\u7F16\u7801;\u7269\u6599\u540D\u79F0;\u662F\u5426\u5173\u8054\u5DE5\u827A\u8DEF\u7EBF
+xmzx=\u9879\u76EE\u6267\u884C
+zztz=13-\u603B\u88C5\u56FE\u7EB8
+msg1=\u8BF7\u9009\u62E9\u9879\u76EE\u5BF9\u8C61
+msg2=\u672A\u627E\u5230\u603B\u88C5\u56FE\u7EB8
+yes=\u662F
+no=\u5426
+#AssProcessAutoFeedingCommand
+cpxh=\u4EA7\u54C1\u578B\u53F7
+info1=\u8BF7\u767B\u5F55\u6B63\u786E\u7EC4
+info2=\u8BF7\u9009\u62E9BOM\u884C\u6216\u8005\u7248\u672C\u5BF9\u8C61
+info3=\u8BF7\u9009\u62E9PBOM\u5BF9\u8C61
+info4=\u672A\u627E\u5230\u4EA7\u6210\u54C1\u6587\u4EF6\u5939\uFF0C\u8BF7\u68C0\u67E5
+info5=\u5B58\u5728\u9876\u5C42P\u7269\u6599\u6CA1\u6709\u5173\u8054\u56FE\u7EB8\uFF0C\u8BF7\u68C0\u67E5
+info6=\u5F53\u524D\u4EA7\u54C1\u578B\u53F7\u672A\u7EF4\u62A4\uFF0C\u8BF7\u9009\u62E9\u5BF9\u5E94\u4EA7\u54C1\u65CF
+info7=\u6B63\u5728\u8FDB\u884C\u4E00\u952E\u6307\u6D3E\u5DE5\u827A\u8DEF\u7EBF......
+info8=\u6307\u6D3E\u5DE5\u827A\u8DEF\u7EBF\u5B58\u5728\u5F02\u5E38\uFF0C\u8BF7\u68C0\u67E5\uFF1A\n
+info9=\u6B63\u5728\u8FDB\u884C\u81EA\u52A8\u6295\u6599......
+info10=\u81EA\u52A8\u6295\u6599\u5B58\u5728\u5F02\u5E38\uFF0C\u8BF7\u68C0\u67E5\uFF1A\n
+info11=\u6307\u6D3E\u5DE5\u827A\u8DEF\u7EBF\u4E0E\u81EA\u52A8\u6295\u6599\u5B8C\u6210
diff --git a/com.connor.chint.wuhan/plugin.xml b/com.connor.chint.wuhan/plugin.xml
index 64fc2de..95e27f0 100644
--- a/com.connor.chint.wuhan/plugin.xml
+++ b/com.connor.chint.wuhan/plugin.xml
@@ -87,6 +87,28 @@
     	
     	  <command commandId = "com.connor.plm.GZXQHandler" id = "com.connor.plm.GZXQHandler">                  
             </command>
+            
+        	<command commandId = "com.connor.plm.txdp.TXDPHandler" id = "com.connor.plm.txdp.TXDPHandler">
+					<visibleWhen>      
+                    	<and>
+							<or>
+								<reference definitionId="com.teamcenter.rac.ui.inMainPerspective"/>	
+								<reference definitionId="com.teamcenter.rac.pse.inMainView"/>
+							</or>
+							<with
+                            	 variable="rac_command_suppression">
+                          	<not>
+                             	<iterate
+                                   	operator="or">
+                                	<equals
+                                      	value="com.connor.plm.txdp.TXDPHandler">
+                               	 	</equals>
+                             	</iterate>
+                          	</not>
+                       	</with>            
+                   	 </and>               
+                 </visibleWhen>
+        	</command>
 
         </menuContribution>
         <menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=additions">
@@ -680,8 +702,8 @@
 					<visibleWhen>      
                     	<and>
 							<or>
-							<reference definitionId="com.teamcenter.rac.ui.inMainPerspective"/>	
-							<reference definitionId="com.teamcenter.rac.pse.inMainView"/>
+								<reference definitionId="com.teamcenter.rac.ui.inMainPerspective"/>	
+								<reference definitionId="com.teamcenter.rac.pse.inMainView"/>
 							</or>
 							<with
                             	 variable="rac_command_suppression">
diff --git a/com.connor.chint.wuhan/src/com/chint/plm/applyMatnr/ApplyMatnrOp.java b/com.connor.chint.wuhan/src/com/chint/plm/applyMatnr/ApplyMatnrOp.java
index 43f862b..60f8281 100644
--- a/com.connor.chint.wuhan/src/com/chint/plm/applyMatnr/ApplyMatnrOp.java
+++ b/com.connor.chint.wuhan/src/com/chint/plm/applyMatnr/ApplyMatnrOp.java
@@ -207,7 +207,7 @@ public class ApplyMatnrOp extends AbstractAIFOperation {
 			// 220103001 CHINT_MadMaterialApply 
 			
 			for(ApplyBean bean:beans) {
-				if(bean.getIdType().equals("1ZD")) {
+				if(bean.getIdType().equals("1ZD") || bean.getIdType().equals("6ZD")) {
 					m_code1 = bean.getmCode();
 				}else {
 					m_code2 = bean.getmCode();
@@ -388,7 +388,7 @@ public class ApplyMatnrOp extends AbstractAIFOperation {
 				for(TCComponentItemRevision generalRev:general_maps.keySet()) {
 					String item_id = generalRev.getStringProperty("item_id");
 					String stringProperty = generalRev.getStringProperty("object_name");
-					if(item_id.startsWith("1ZD")) {
+					if(item_id.startsWith("1ZD") || item_id.startsWith("6ZD")) {
 						if(!nameList.contains(stringProperty)) {
 							errBuff.append(generalRev.toString()).append("\n");
 						}
@@ -830,7 +830,7 @@ public class ApplyMatnrOp extends AbstractAIFOperation {
 			}
 			String bpNo = properties[0];//rev.getProperty("item_id"); // �DZ���
 			String zt2_DrawingNo = properties[2];//rev.getProperty("zt2_DrawingNo");
-			if (!KUtil.isEmpty(zt2_DrawingNo)&& !stuf.equalsIgnoreCase("1ZD")) {
+			if (!KUtil.isEmpty(zt2_DrawingNo) && !stuf.equalsIgnoreCase("1ZD") && !stuf.equalsIgnoreCase("6ZD")) {
 				if (!bpNo.equals(zt2_DrawingNo))
 					bpNo = zt2_DrawingNo;
 			}
@@ -984,7 +984,7 @@ public class ApplyMatnrOp extends AbstractAIFOperation {
 			}
 			String bpNo = properties[0].toString();// rev.getProperty("item_id"); // �DZ���
 			String zt2_DrawingNo = properties[2];// rev.getProperty("zt2_DrawingNo");
-			if (!KUtil.isEmpty(zt2_DrawingNo) && !stuf.equalsIgnoreCase("1ZD")) {
+			if (!KUtil.isEmpty(zt2_DrawingNo) && !stuf.equalsIgnoreCase("1ZD") && !stuf.equalsIgnoreCase("6ZD")) {
 				if (!bpNo.equals(zt2_DrawingNo))
 					bpNo = zt2_DrawingNo;
 			}
@@ -1094,7 +1094,8 @@ public class ApplyMatnrOp extends AbstractAIFOperation {
 			String item_id = revProperties[0];
 			if (item_id.length() >= 3) {
 				String stuf = item_id.substring(0, 3);
-				if (stuf.equalsIgnoreCase("2ZD") || stuf.equalsIgnoreCase("4ZD") || stuf.equalsIgnoreCase("1ZD")) {
+				if (stuf.equalsIgnoreCase("2ZD") || stuf.equalsIgnoreCase("4ZD") 
+						|| stuf.equalsIgnoreCase("1ZD") || stuf.equalsIgnoreCase("6ZD")) {
 //					flag = false;
 					// ��ʼ����ͨ�ü�����������ж��Ƿ���Ҫ��������
 					String zt2_TYJSpec = line.getProperty("ZT2_TYSpecifications");
@@ -1175,7 +1176,8 @@ public class ApplyMatnrOp extends AbstractAIFOperation {
 							String bpNo = item_id;
 							//String zt2_DrawingNo = rev.getProperty("zt2_DrawingNo");
 							String zt2_DrawingNo = revProperties[2];
-							if (!KUtil.isEmpty(zt2_DrawingNo) && !stuf.equalsIgnoreCase("1ZD")) {
+							if (!KUtil.isEmpty(zt2_DrawingNo) && !stuf.equalsIgnoreCase("1ZD") 
+									&& !stuf.equalsIgnoreCase("6ZD")) {
 								if (!item_id.equals(zt2_DrawingNo))
 									bpNo = zt2_DrawingNo;
 							}
diff --git a/com.connor.chint.wuhan/src/com/chint/plm/applyMatnr/RemarkUtil.java b/com.connor.chint.wuhan/src/com/chint/plm/applyMatnr/RemarkUtil.java
index baf9742..32a75a4 100644
--- a/com.connor.chint.wuhan/src/com/chint/plm/applyMatnr/RemarkUtil.java
+++ b/com.connor.chint.wuhan/src/com/chint/plm/applyMatnr/RemarkUtil.java
@@ -4,7 +4,6 @@ import java.util.Map;
 import com.teamcenter.rac.kernel.TCComponentBOMLine;
 import com.teamcenter.rac.kernel.TCComponentItem;
 import com.teamcenter.rac.kernel.TCComponentItemType;
-import com.teamcenter.rac.kernel.TCProperty;
 import com.teamcenter.rac.kernel.TCSession;
 public class RemarkUtil {
 	
@@ -14,11 +13,31 @@ public class RemarkUtil {
 		int len =0;
 		try {
 			String[] split = itemId.split("-");
-			String topId = "1ZDB300000P-"+split[1];
-			System.out.println("topId:" + topId);
+			String id4 = itemId.substring(0, 4);
+			//lidy20250423
+			String[] ids = session.getPreferenceService().getStringValues("CHINT_FindDrawing");
+			String topId = "";//"1ZDB300000P-" + split[1];
+			for(String s : ids) {
+				if(s.substring(0, 4).equalsIgnoreCase(id4)) {
+					topId = s + split[1];
+					break;
+				}
+			}
 			TCComponentItemType partType = (TCComponentItemType) session.getTypeComponent("ZT2_Design3D");
-			TCComponentItem find = partType.findItems(topId)[0];
-			Map<String, String> classificationAttributes =  find.getClassificationAttributes();
+			TCComponentItem[] find = null;
+			if(topId.isEmpty()) {
+				for(String s : ids) {
+					topId = s + split[1];
+					find = partType.findItems(topId);
+					if(find != null && find.length > 0)
+						break;
+				}
+			}else {
+				find = partType.findItems(topId);
+			}
+			System.out.println("topId:" + topId);
+//			TCComponentItem find = partType.findItems(topId)[0];
+			Map<String, String> classificationAttributes =  find[0].getClassificationAttributes();
 //			System.out.println(classificationAttributes.toString());
 			
 			for(String key : classificationAttributes.keySet()) {
diff --git a/com.connor.chint.wuhan/src/com/chint/plm/createKjBom/KjController.java b/com.connor.chint.wuhan/src/com/chint/plm/createKjBom/KjController.java
index b18010b..f8f29e8 100644
--- a/com.connor.chint.wuhan/src/com/chint/plm/createKjBom/KjController.java
+++ b/com.connor.chint.wuhan/src/com/chint/plm/createKjBom/KjController.java
@@ -672,10 +672,10 @@ public class KjController {
 				}
 				saveList.add(dataMap);
 			}
-			for(TCComponentBOMLine subLine : useLines) {
-				CloneStructureSaveAsIn dataMap = getDataMap(subLine, 1, session);
-				saveList.add(dataMap);
-			}
+//			for(TCComponentBOMLine subLine : useLines) {
+//				CloneStructureSaveAsIn dataMap = getDataMap(subLine, 1, session);
+//				saveList.add(dataMap);
+//			}
 			com.teamcenter.services.rac.structuremanagement._2014_10.Structure.CloneStructureDefaultNaming naming = 
 					new com.teamcenter.services.rac.structuremanagement._2014_10.Structure.CloneStructureDefaultNaming();
 			CloneStructureSaveAsIn[] array = saveList.toArray(new CloneStructureSaveAsIn[saveList.size()]);
diff --git a/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/BomDcSapOp.java b/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/BomDcSapOp.java
index 2c1e02d..e005ceb 100644
--- a/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/BomDcSapOp.java
+++ b/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/BomDcSapOp.java
@@ -63,30 +63,50 @@ public class BomDcSapOp extends AbstractAIFOperation {
 		
 		List<TCComponentItem> itemList = new ArrayList<>();
 		List<TCComponentItem> itemPList = new ArrayList<>();
-		String id = "1ZDB300000P-";
-		if(rev2.getType().equals("Part Revision")) {	
-			String desc = rev2.getStringProperty("object_desc");
-			String[] split = desc.split(" ");
-			if(split.length>=2) {
-				String[] split2 = split[1].split("-");
-				if(split2.length==2) {
-					id = id + split2[1];
-				}else if(split2.length==3) {
-					id = id + split2[2];
+		//lidy20250423 1ZDB300000P-
+		String[] ids = session.getPreferenceService().getStringValues("CHINT_FindDrawing");
+        String id = "", idl = "";
+        if (rev2.getType().equals("Part Revision")) {
+            String desc = rev2.getStringProperty("object_desc");
+            String[] split = desc.split(" ");
+            if (split.length >= 2) {
+                String[] split2 = split[1].split("-");
+                if (split2.length == 2) {
+                	idl = split2[1];
+                } else if (split2.length == 3) {
+                	idl = split2[2];
+                }
+            }
+        } else if (rev2.getType().equals("ZT2_Design3DRevision")) {
+            String desc = rev2.getStringProperty("item_id");
+            String[] split2 = desc.split("-");
+            if (split2.length == 2) {
+            	idl = split2[1];
+            } else if (split2.length == 3) {
+            	idl = split2[2];
+            }
+			String id4 = desc.substring(0, 4);
+			for(String s : ids) {
+				if(s.substring(0, 4).equalsIgnoreCase(id4)) {
+					id = s + idl;
+					break;
 				}
 			}
-		}else if(rev2.getType().equals("ZT2_Design3DRevision")) {
-			String desc = rev2.getStringProperty("item_id");
-			String[] split2 = desc.split("-");
-			if(split2.length==2) {
-				id = id + split2[1];
-			}else if(split2.length==3) {
-				id = id + split2[2];
+        }
+		TCComponentItem[] find = null;
+		if(id.isEmpty()) {
+			for(String s : ids) {
+				id = s + idl;
+				find = ccomponentitemtype.findItems(id);
+				if(find != null && find.length > 0)
+					break;
 			}
+		}else {
+			find = ccomponentitemtype.findItems(id);
 		}
-		System.out.print("id===>"+id);
-		TCComponentItem find = ccomponentitemtype.findItems(id)[0];
-		TCComponentItemRevision zztRev = find.getLatestItemRevision();
+		System.out.print("id===>" + id);
+//		TCComponentItem find = ccomponentitemtype.findItems(id)[0];
+		TCComponentItemRevision zztRev = find[0].getLatestItemRevision();
 		TCComponent[] matnrs = zztRev.getRelatedComponents("representation_for");
 		for(TCComponent matnr:matnrs) {
 			String[] properties = matnr.getProperties(new String[]{"zt2_ifpbom"});
diff --git a/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/BomSapWhBjOp.java b/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/BomSapWhBjOp.java
index abbf814..2d03393 100644
--- a/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/BomSapWhBjOp.java
+++ b/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/BomSapWhBjOp.java
@@ -65,30 +65,50 @@ public class BomSapWhBjOp extends AbstractAIFOperation {
 
         List<TCComponentItem> itemList = new ArrayList<>();
         List<TCComponentItem> itemPList = new ArrayList<>();
-        String id = "1ZDB300000P-";
+		//lidy20250423 1ZDB300000P-
+		String[] ids = session.getPreferenceService().getStringValues("CHINT_FindDrawing");
+        String id = "", idl = "";
         if (rev2.getType().equals("Part Revision")) {
             String desc = rev2.getStringProperty("object_desc");
             String[] split = desc.split(" ");
             if (split.length >= 2) {
                 String[] split2 = split[1].split("-");
                 if (split2.length == 2) {
-                    id = id + split2[1];
+                	idl = split2[1];
                 } else if (split2.length == 3) {
-                    id = id + split2[2];
+                	idl = split2[2];
                 }
             }
         } else if (rev2.getType().equals("ZT2_Design3DRevision")) {
             String desc = rev2.getStringProperty("item_id");
             String[] split2 = desc.split("-");
             if (split2.length == 2) {
-                id = id + split2[1];
+            	idl = split2[1];
             } else if (split2.length == 3) {
-                id = id + split2[2];
+            	idl = split2[2];
             }
+			String id4 = desc.substring(0, 4);
+			for(String s : ids) {
+				if(s.substring(0, 4).equalsIgnoreCase(id4)) {
+					id = s + idl;
+					break;
+				}
+			}
         }
+		TCComponentItem[] find = null;
+		if(id.isEmpty()) {
+			for(String s : ids) {
+				id = s + idl;
+				find = ccomponentitemtype.findItems(id);
+				if(find != null && find.length > 0)
+					break;
+			}
+		}else {
+			find = ccomponentitemtype.findItems(id);
+		}
         System.out.print("id===>" + id);
-        TCComponentItem find = ccomponentitemtype.findItems(id)[0];
-        TCComponentItemRevision zztRev = find.getLatestItemRevision();
+//        TCComponentItem find = ccomponentitemtype.findItems(id)[0];
+        TCComponentItemRevision zztRev = find[0].getLatestItemRevision();
         TCComponent[] matnrs = zztRev.getRelatedComponents("representation_for");
         for (TCComponent matnr : matnrs) {
             String[] properties = matnr.getProperties(new String[] { "zt2_ifpbom" });
diff --git a/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/DbomToECommand.java b/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/DbomToECommand.java
index d0014d1..a87a6ec 100644
--- a/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/DbomToECommand.java
+++ b/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/DbomToECommand.java
@@ -64,12 +64,35 @@ public class DbomToECommand extends KCommand {
 						String itemId = rev.getProperty("item_id");
 						String[] split = itemId.split("-");
 						if(split.length>=2) {
-							String topId = "1ZDB300000P-"+split[1];
+//							String topId = "1ZDB300000P-"+split[1];
+							String id4 = itemId.substring(0, 4);
+							//lidy20250423
+							String[] ids = session.getPreferenceService().getStringValues("CHINT_FindDrawing");
+							String topId = "";//"1ZDB300000P-" + split[1];
+							for(String s : ids) {
+								if(s.substring(0, 4).equalsIgnoreCase(id4)) {
+									topId = s + split[1];
+									break;
+								}
+							}
+//							TCComponentItemType itemType = (TCComponentItemType) session.getTypeComponent("ZT2_Design3D");
+//							TCComponentItem find = itemType.find(topId);
 							TCComponentItemType itemType = (TCComponentItemType) session.getTypeComponent("ZT2_Design3D");
-							TCComponentItem find = itemType.find(topId);
-							if(find!=null) {
+							TCComponentItem[] find = null;
+							if(topId.isEmpty()) {
+								for(String s : ids) {
+									topId = s + split[1];
+									find = itemType.findItems(topId);
+									if(find != null && find.length > 0)
+										break;
+								}
+							}else {
+								find = itemType.findItems(topId);
+							}
+							System.out.println("topId:" + topId);
+							if(find != null && find.length > 0) {
 								//boolean equals = find.getLatestItemRevision().getProperty("zt2_SapState").equals("�Ѵ�");
-								boolean equals = find.getProperty("zt2_kjbomstate").equals("�Ѵ�");
+								boolean equals = find[0].getProperty("zt2_kjbomstate").equals("�Ѵ�");
 								if(!equals) {
 									MessageBox.post("����ϵ���贫�ݿ��BOM.", "", MessageBox.ERROR);
 									return;
diff --git a/com.connor.chint.wuhan/src/com/connor/plm/txdp/TXDPFram.java b/com.connor.chint.wuhan/src/com/connor/plm/txdp/TXDPFram.java
index 7b5f898..535d02c 100644
--- a/com.connor.chint.wuhan/src/com/connor/plm/txdp/TXDPFram.java
+++ b/com.connor.chint.wuhan/src/com/connor/plm/txdp/TXDPFram.java
@@ -201,70 +201,76 @@ public class TXDPFram extends JFrame implements ActionListener {
  	            	System.out.println("updateSql=======" + updateSql);
 					SqlUtil.update(updateSql);
 					if(mom) {
-						String[] pref = ChintPreferenceUtil.getPreference("CHINT_GetCoreLaminationStacK", session)
-								.split("=");
-						if(pref[0].equals("MOM:1")) {
-		 	            	JSONArray classParameter = new JSONArray();
-							selectSql = "select distinct a.\"class_number\",a.\"thickness_perstage\","
-									+ "a.\"yoke_offset\",a.\"oil_passage\",a.\"jetthickness\",a.\"number_pieces\","
-									+ "decode(b.\"d\",'',b.\"a\",b.\"d\") as ����d,b.\"b\" as ����b,c.\"b\" as ����b,"
-									+ "d.\"c\" as ��c,d.\"b\" as ��b "
-									+ "from CHINT_IRON_CORE_SUM_DETIALS a,CHINT_IRON_CORE_DETIALS b,"
-									+ "CHINT_IRON_CORE_DETIALS c,CHINT_IRON_CORE_DETIALS d "
-									+ "where a.\"drawingno\"=b.\"drawingno\" and a.\"class_number\"=b.\"class_number\" "
-									+ "and b.\"classification\"='����' and a.\"drawingno\"=c.\"drawingno\" "
-									+ "and a.\"class_number\"=c.\"class_number\" and c.\"classification\"='����'  "
-									+ "and a.\"drawingno\"=d.\"drawingno\" and a.\"class_number\"=d.\"class_number\" "
-									+ "and d.\"classification\"='��' and a.\"producttype\"='����' and a.\"drawingno\"='" 
-									+ gcth + "' order by to_number(a.\"class_number\")";
-		 	            	System.out.println("selectSql=======" + selectSql);
-							rs = SqlUtil.read(selectSql);
-							while(rs.next()) {
-				            	JSONObject js = new JSONObject();
-				            	String oil_passage = rs.getString(4);
-	            				if(oil_passage.isEmpty()) {
-	            					js.put("OilTunnel", "0");
-	            				}else {
-	            					js.put("OilTunnel", "1");
-	            				}
-	            				js.put("bJet", "0");
-	            				js.put("ClassNumber", rs.getString(1));
-	            				js.put("ClassThickness", rs.getString(2));
-	            				js.put("OilTunnelThickness", oil_passage);
-	            				js.put("OutDistance", rs.getString(3));
-	            				js.put("JetThickness", rs.getString(5));
-	            				js.put("ActualLayersEach", rs.getString(6));
-	            				js.put("LengthM", rs.getString(7));
-	            				js.put("WidthM", rs.getString(8));
-	            				js.put("WidthLeft", rs.getString(9));
-	            				js.put("LengthDown", rs.getString(10));
-	            				js.put("WidthDown", rs.getString(11));
-				            	
-				            	classParameter.add(js);
-							}
-				 	        json.put("ClassParameter", classParameter);
-							System.out.println("json==>" + json);
-				 	        OkHttpClient client = new OkHttpClient();
-				 	        MediaType mediaType = MediaType.parse("application/json");
-				 	        RequestBody body = RequestBody.create(mediaType, json.toString());
-				 	        Builder builder = new Request.Builder()
-				 	    		  .url(pref[1])
-				 	    		  .method("POST", body)
-				 	    		  .addHeader("Content-Type", "application/json");
-				            if (pref[1].contains("10.128.11.12")) {
-				            	builder.addHeader("Authorization", "Basic MTQyODI0Mjg2NDU2ODMwNzcxNDpkREF3TWpveE1EQXg=");
-				            } else {
-				            	builder.addHeader("Authorization", "Basic MTcxNDkwNTkyNTc2MjUzNTQyNjpkREF3TWpveE1EQXg=");
-				            }
-				 	        Request request = builder.build();
-				 	        Response response = client.newCall(request).execute();
-							String string = response.body().string();
-							System.out.println("response==>" + string);
-							JSONObject result = JSONObject.fromObject(string);
-							if(!result.get("status").equals("S")) {
-								MessageBox.post("MOMϵͳ��������ʧ�ܣ�����ϵ����Ա\n�����룺" + result.get("code") 
-									+ "������Ϣ��" + result.get("msg"), "��ʾ", MessageBox.WARNING);
-								return;
+						String group = SAPUtil.getGroupID(session);
+						System.out.println("group==>" + group);
+						String[] prefs = ChintPreferenceUtil.getPreferences("CHINT_GetCoreLaminationStacK", session);
+						for(String s : prefs) {
+							System.out.println("prefs==>" + s);
+							String[] pref = s.split("=");
+							if(pref[0].startsWith(group + ":")) {
+			 	            	JSONArray classParameter = new JSONArray();
+								selectSql = "select distinct a.\"class_number\",a.\"thickness_perstage\","
+										+ "a.\"yoke_offset\",a.\"oil_passage\",a.\"jetthickness\",a.\"number_pieces\","
+										+ "decode(b.\"d\",'',b.\"a\",b.\"d\") as ����d,b.\"b\" as ����b,c.\"b\" as ����b,"
+										+ "d.\"c\" as ��c,d.\"b\" as ��b "
+										+ "from CHINT_IRON_CORE_SUM_DETIALS a,CHINT_IRON_CORE_DETIALS b,"
+										+ "CHINT_IRON_CORE_DETIALS c,CHINT_IRON_CORE_DETIALS d "
+										+ "where a.\"drawingno\"=b.\"drawingno\" and a.\"class_number\"=b.\"class_number\" "
+										+ "and b.\"classification\"='����' and a.\"drawingno\"=c.\"drawingno\" "
+										+ "and a.\"class_number\"=c.\"class_number\" and c.\"classification\"='����'  "
+										+ "and a.\"drawingno\"=d.\"drawingno\" and a.\"class_number\"=d.\"class_number\" "
+										+ "and d.\"classification\"='��' and a.\"producttype\"='����' and a.\"drawingno\"='" 
+										+ gcth + "' order by to_number(a.\"class_number\")";
+			 	            	System.out.println("selectSql=======" + selectSql);
+								rs = SqlUtil.read(selectSql);
+								while(rs.next()) {
+					            	JSONObject js = new JSONObject();
+					            	String oil_passage = rs.getString(4);
+		            				if(oil_passage.isEmpty()) {
+		            					js.put("OilTunnel", "0");
+		            				}else {
+		            					js.put("OilTunnel", "1");
+		            				}
+		            				js.put("bJet", "0");
+		            				js.put("ClassNumber", rs.getString(1));
+		            				js.put("ClassThickness", rs.getString(2));
+		            				js.put("OilTunnelThickness", oil_passage);
+		            				js.put("OutDistance", rs.getString(3));
+		            				js.put("JetThickness", rs.getString(5));
+		            				js.put("ActualLayersEach", rs.getString(6));
+		            				js.put("LengthM", rs.getString(7));
+		            				js.put("WidthM", rs.getString(8));
+		            				js.put("WidthLeft", rs.getString(9));
+		            				js.put("LengthDown", rs.getString(10));
+		            				js.put("WidthDown", rs.getString(11));
+					            	
+					            	classParameter.add(js);
+								}
+					 	        json.put("ClassParameter", classParameter);
+								System.out.println("json==>" + json);
+					 	        OkHttpClient client = new OkHttpClient();
+					 	        MediaType mediaType = MediaType.parse("application/json");
+					 	        RequestBody body = RequestBody.create(mediaType, json.toString());
+					 	        Builder builder = new Request.Builder()
+					 	    		  .url(pref[1])
+					 	    		  .method("POST", body)
+					 	    		  .addHeader("Content-Type", "application/json");
+					            if (pref[1].contains("10.128.11.12")) {
+					            	builder.addHeader("Authorization", "Basic MTQyODI0Mjg2NDU2ODMwNzcxNDpkREF3TWpveE1EQXg=");
+					            } else {
+					            	builder.addHeader("Authorization", "Basic MTcxNDkwNTkyNTc2MjUzNTQyNjpkREF3TWpveE1EQXg=");
+					            }
+					 	        Request request = builder.build();
+					 	        Response response = client.newCall(request).execute();
+								String string = response.body().string();
+								System.out.println("response==>" + string);
+								JSONObject result = JSONObject.fromObject(string);
+								if(!result.get("status").equals("S")) {
+									MessageBox.post("MOMϵͳ��������ʧ�ܣ�����ϵ����Ա\n�����룺" + result.get("code") 
+										+ "������Ϣ��" + result.get("msg"), "��ʾ", MessageBox.WARNING);
+									return;
+								}
+								break;
 							}
 						}
 					}
@@ -314,8 +320,6 @@ public class TXDPFram extends JFrame implements ActionListener {
 	            }
 	            
 	            if(producttype.equals("����")) {
-					String[] pref = ChintPreferenceUtil.getPreference("CHINT_GetCoreLaminationStacK", session)
-							.split("=");
 	            	JSONObject json = new JSONObject();
  	            	JSONArray classParameter = new JSONArray();
  	            	LinkedHashMap<String, JSONObject> map = new LinkedHashMap<>();
@@ -604,37 +608,54 @@ public class TXDPFram extends JFrame implements ActionListener {
 	 	            }
 		 	        uploadFile(name, pathJTextFieldStr);
 		 	        //TODO �����������ĵ�Ƭ���ݵ�MOMϵͳ
-					if(pref[0].equals("MOM:1")) {
-			 	        for(String class_number : map.keySet()) {
-		 	               JSONObject js = map.get(class_number);
-		 	               classParameter.add(js);
-			 	        }
-			 	        json.put("ClassParameter", classParameter);
-						System.out.println("json==>" + json);
-			 	        OkHttpClient client = new OkHttpClient();
-			 	        MediaType mediaType = MediaType.parse("application/json");
-			 	        RequestBody body = RequestBody.create(mediaType, json.toString());
-			 	        Builder builder = new Request.Builder()
-			 	    		  .url(pref[1])
-			 	    		  .method("POST", body)
-			 	    		  .addHeader("Content-Type", "application/json");
-			            if (pref[1].contains("10.128.11.12")) {
-			            	builder.addHeader("Authorization", "Basic MTQyODI0Mjg2NDU2ODMwNzcxNDpkREF3TWpveE1EQXg=");
-			            } else {
-			            	builder.addHeader("Authorization", "Basic MTcxNDkwNTkyNTc2MjUzNTQyNjpkREF3TWpveE1EQXg=");
-			            }
-			 	        Request request = builder.build();
-			 	        Response response = client.newCall(request).execute();
-						String string = response.body().string();
-						System.out.println("response==>" + string);
-						JSONObject result = JSONObject.fromObject(string);
-						if(result.get("status").equals("S")) {
-							MessageBox.post("����ɹ���", "��ʾ", MessageBox.INFORMATION);
-						}else {
-							MessageBox.post("MOMϵͳ��������ʧ�ܣ�����ϵ����Ա\n�����룺" + result.get("code") 
-								+ "������Ϣ��" + result.get("msg"), "��ʾ", MessageBox.WARNING);
+					String group = SAPUtil.getGroupID(session);
+					System.out.println("group==>" + group);
+//					String[] pref = ChintPreferenceUtil.getPreference("CHINT_GetCoreLaminationStacK", session)
+//							.split("=");
+					String[] prefs = ChintPreferenceUtil.getPreferences("CHINT_GetCoreLaminationStacK", session);
+					boolean flag = true;
+					for(String s : prefs) {
+						System.out.println("prefs==>" + s);
+						String[] pref = s.split("=");
+						if(pref[0].startsWith(group + ":")) {
+							flag = false;
+				 	        for(String class_number : map.keySet()) {
+			 	               JSONObject js = map.get(class_number);
+			 	               classParameter.add(js);
+				 	        }
+				 	        json.put("ClassParameter", classParameter);
+							System.out.println("json==>" + json);
+				 	        OkHttpClient client = new OkHttpClient();
+				 	        MediaType mediaType = MediaType.parse("application/json");
+				 	        RequestBody body = RequestBody.create(mediaType, json.toString());
+				 	        Builder builder = new Request.Builder()
+				 	    		  .url(pref[1])
+				 	    		  .method("POST", body)
+				 	    		  .addHeader("Content-Type", "application/json");
+				            if (pref[1].contains("10.128.11.12")) {
+				            	builder.addHeader("Authorization", "Basic MTQyODI0Mjg2NDU2ODMwNzcxNDpkREF3TWpveE1EQXg=");
+				            } else {
+				            	builder.addHeader("Authorization", "Basic MTcxNDkwNTkyNTc2MjUzNTQyNjpkREF3TWpveE1EQXg=");
+				            }
+				 	        Request request = builder.build();
+				 	        Response response = client.newCall(request).execute();
+							String string = response.body().string();
+							System.out.println("response==>" + string);
+							JSONObject result = JSONObject.fromObject(string);
+							if(result.get("status").equals("S")) {
+								System.out.println("����ɹ������ݳɹ�");
+								MessageBox.post("����ɹ���", "��ʾ", MessageBox.INFORMATION);
+							}else {
+								String err = "MOMϵͳ��������ʧ�ܣ�����ϵ����Ա\n�����룺" + result.get("code") + 
+										" ������Ϣ��" + result.get("msg");
+								System.out.println(err);
+								MessageBox.post(err, "��ʾ", MessageBox.WARNING);
+							}
+							break;
 						}
-					}else {
+					}
+					if(flag) {
+						System.out.println("����ɹ���δ����");
 						MessageBox.post("����ɹ���", "��ʾ", MessageBox.INFORMATION);
 					}
 	            }else if(producttype.equals("����")) {