diff --git a/com.connor.chint.wuhan/plugin.xml b/com.connor.chint.wuhan/plugin.xml index d4ca55a..34ea10c 100644 --- a/com.connor.chint.wuhan/plugin.xml +++ b/com.connor.chint.wuhan/plugin.xml @@ -18,14 +18,15 @@ - + + - + @@ -34,6 +35,7 @@ + @@ -68,7 +70,28 @@ - + --> diff --git a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnController.java b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnController.java index b5fc47f..d121efa 100644 --- a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnController.java +++ b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnController.java @@ -142,7 +142,8 @@ public class CreateEcnController extends KFXPanelController { private CreateEcnController controller; private CreateEcnFrame frame; private String[] database; - + public final String UPDATE_OA = "update CHINT_ECR_FROM_OA set STATUS = '' where APPLYNO = ? "; + public final String SELECT_OA_APPLYNO = "select * from CHINT_ECR_FROM_OA where APPLYNO = ? "; @Override public void initData(KFXPanel paramKFXPanel) throws Exception { // TODO Auto-generated method stub diff --git a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/RelateEcnBean.java b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/RelateEcnBean.java index db0c403..4e63b8e 100644 --- a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/RelateEcnBean.java +++ b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/RelateEcnBean.java @@ -4,10 +4,14 @@ import java.sql.ResultSet; import java.sql.SQLException; import com.connor.chint.sap2.util.BomToSapUtil; +import com.connor.chint.sap2.util.ChintPreferenceUtil; +import com.connor.chint.sap2.util.SqlUtil; +import com.teamcenter.rac.util.MessageBox; import javafx.beans.property.SimpleStringProperty; import javafx.collections.ObservableList; import javafx.scene.control.Button; +import javafx.scene.control.TableView; public class RelateEcnBean { protected SimpleStringProperty num;// @@ -50,7 +54,8 @@ public class RelateEcnBean { public RelateEcnBean(SimpleStringProperty num, SimpleStringProperty contConde, SimpleStringProperty contName, SimpleStringProperty requestNo, SimpleStringProperty prodModel, SimpleStringProperty applicant, - SimpleStringProperty status, String link, CreateEcnController controller, ResultSet read) + SimpleStringProperty status, String link, CreateEcnController controller, + ResultSet read, String[] prefs, TableView tableView) throws SQLException { super(); this.num = num; @@ -80,7 +85,9 @@ public class RelateEcnBean { e1.printStackTrace(); } }); + // 밴ť֮״̬Ϊ importBtn.setOnAction(e -> { + SqlUtil.getTCDataConnection(prefs); try { ObservableList items = controller.refTable.getItems(); for (int i = 0; i < 7; i++) { @@ -107,9 +114,16 @@ public class RelateEcnBean { controller.markText.setText(docuName); controller.relateEcnText.setText(applyNo); controller.refTable.setItems(items); + this.status.setValue(""); + // ݿϢ + SqlUtil.update(controller.UPDATE_OA, new String[] { applyNo }); + tableView.refresh(); + MessageBox.post("", "", MessageBox.INFORMATION); } catch (Exception e1) { // TODO Auto-generated catch block e1.printStackTrace(); + } finally { + SqlUtil.freeAll(); } }); } diff --git a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/RelateEcnController.java b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/RelateEcnController.java index 3f2c780..454aea8 100644 --- a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/RelateEcnController.java +++ b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/RelateEcnController.java @@ -1,5 +1,6 @@ package com.chint.plm.createEcn; +import java.awt.Window; import java.sql.ResultSet; import java.time.format.DateTimeFormatter; import java.util.ArrayList; @@ -101,6 +102,48 @@ public class RelateEcnController { this.controller = controller; this.session = session; initTable(); + // 2024.1.11 Ѿıʼ + init(); + } + + /** + * + * @function + */ + private void init() { + // TODO Auto-generated method stub + String applyCode = controller.relateEcnText.getText(); + if (applyCode != null && !applyCode.isEmpty()) { + String[] prefs = ChintPreferenceUtil.getPreferences("database_tc", session); + SqlUtil.getTCDataConnection(prefs); + try { + int num = 1; + ResultSet read = SqlUtil.read(controller.SELECT_OA_APPLYNO, new String[] {applyCode}); + List ecnBeans = new ArrayList<>(); + while (read.next()) { + String contConde = read.getString("CONTRACTNO"); + String contName = read.getString("CONTRACTNAME"); + String requestNo = read.getString("APPLYNO"); + String prodModel = read.getString("PRODUCTMODEL"); + String applicant = read.getString("APPLYUSER");// STATUS + String status = read.getString("STATUS"); + String link = read.getString("APPLYLINK"); + ecnBeans.add( + new RelateEcnBean(new SimpleStringProperty(num + ""), new SimpleStringProperty(contConde), + new SimpleStringProperty(contName), new SimpleStringProperty(requestNo), + new SimpleStringProperty(prodModel), new SimpleStringProperty(applicant), + new SimpleStringProperty(status), link, controller, read, prefs, tableView)); + } + tableView.getItems().clear(); + tableView.getItems().addAll(ecnBeans); + + } catch (Exception e) { + e.printStackTrace(); + } finally { + SqlUtil.freeAll(); + } + + } } /** @@ -205,7 +248,7 @@ public class RelateEcnController { ecnBeans.add(new RelateEcnBean(new SimpleStringProperty(num + ""), new SimpleStringProperty(contConde), new SimpleStringProperty(contName), new SimpleStringProperty(requestNo), new SimpleStringProperty(prodModel), new SimpleStringProperty(applicant), - new SimpleStringProperty(status), link, controller, read)); + new SimpleStringProperty(status), link, controller, read, prefs, tableView)); num++; } tableView.getItems().clear(); diff --git a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/RelateEcnDialog.java b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/RelateEcnDialog.java index fffde4a..15febf7 100644 --- a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/RelateEcnDialog.java +++ b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/RelateEcnDialog.java @@ -34,6 +34,7 @@ public class RelateEcnDialog extends Application { RelateEcnController controller = (RelateEcnController) fxmlLoader.getController(); primaryStage.setTitle("֪ͨ"); controller.initData(session, this.controller); + ; primaryStage.setScene(scene); primaryStage.show(); } diff --git a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/Util.java b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/Util.java index d89311c..b9cf007 100644 --- a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/Util.java +++ b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/Util.java @@ -39,6 +39,7 @@ public class Util { public static final String ZT_DESIGN_TYPE = "ZT2_Design3DRevision"; public static final String REPRESENTATION_FOR = "representation_for"; public static final String ZT_MATERIAL_NO = "zt2_MaterialNo"; + public static final String ITEM_REVIISON_ID = "item_revision_id"; public Connection connect(Connection conn, TCSession session) { String[] database = session.getPreferenceService().getStringValues("database_tc"); String JdbcDriverClass = "oracle.jdbc.driver.OracleDriver";