1、6号修改

com.connor.chint.wuhan/plugin.xml

@@ -18,14 +18,15 @@
        <command name="典型工艺一键指派" id="com.connor.chint.yunpi.command.AssignProcess"/>
        <command name="一键式工艺自动投料" id="com.connor.chint.yunpi.command.AutoFeedingComd"/>
        <command name="创建/编辑更改通知单" id="com.chint.plm.createEcn.CreateEcnCommond"/>
-   		
+   	   <command name="提取差异项" id="com.chint.plm.createbomdifference.ExtractDiffComd"/>
+   	   <command name="生成更改差异文件" id="com.chint.plm.createbomdifference.BomCompareComd"/>
    		<command name="更新现有工时" id="com.chint.plm.updateWorkTime.UpdateWorkCommand"/> 
    		 <command name="单层BOM传递SAP" id="com.connor.chint.yunpi.command.BomDcSapCommand"/> 
    		 <command name="SAP传递结果查询" id="com.chint.plm.SearchSapResult.SearchSapResultComd"/> 
    		<command name="校对表填写" id="com.connor.chint.yunpi.command.TestCommand"/><!--   -->
    		  <command name="系统版本V1.11" id="com.connor.chint.sap2.projectTest.VersionCommandWh"/>
    		  <command name="工装需求管理" id="com.connor.plm.GZXQHandler"/>
-   		 <command name="生成更改差异文件" id="com.chint.plm.createbomdifference.BomCompareComd"/>
+   		 
    		  <command name="一键提取图纸" id="com.chint.plm.extractdraw.ExtractDrawComd"/>
    		  <command name="成本单管理" id="com.connor.plm.CostListManagement"/>
           <command name="标准工序传递MOM" id="com.connor.plm.sendGXToMOM"/> 
@@ -34,6 +35,7 @@
    <extension
          point="org.eclipse.ui.handlers">
          <handler commandId="com.chint.plm.createbomdifference.BomCompareComd" class="com.connor.chint.yunpi.KHandler"/>
+         <handler commandId="com.chint.plm.createbomdifference.ExtractDiffComd" class="com.connor.chint.yunpi.KHandler"/>
          <handler commandId="com.chint.plm.extractdraw.ExtractDrawComd" class="com.connor.chint.yunpi.KHandler"/>
         <handler commandId="com.chint.plm.SearchSapResult.SearchSapResultComd" class="com.connor.chint.yunpi.KHandler"/>
           <handler commandId="com.connor.chint.yunpi.command.TestCommand" class="com.connor.chint.yunpi.KHandler"/><!---->
@@ -68,7 +70,28 @@
 		
 		 <menuContribution locationURI="menu:com.connor.chint.sap2.menu.whgc?after=additions">
 		 
-		<!-- <command commandId = "com.chint.plm.createbomdifference.BomCompareComd" id = "com.chint.plm.createbomdifference.BomCompareComd">
+		<!-- <command commandId = "com.chint.plm.createbomdifference.ExtractDiffComd" id = "com.chint.plm.createbomdifference.ExtractDiffComd">
+                    <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.chint.plm.createbomdifference.ExtractDiffComd">
+                                    </equals>
+                                </iterate>
+                            </not>
+                        </with>            
+                     </and>               
+                 </visibleWhen>
+            </command>
+		<command commandId = "com.chint.plm.createbomdifference.BomCompareComd" id = "com.chint.plm.createbomdifference.BomCompareComd">
                     <visibleWhen>      
                         <and>
                             <or>
@@ -88,7 +111,7 @@
                         </with>            
                      </and>               
                  </visibleWhen>
-            </command>-->
+            </command> -->
 		 <command commandId = "com.connor.plm.CostListManagement" id = "com.connor.plm.CostListManagement">
                     <visibleWhen>      
                         <and>

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

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<RelateEcnBean> tableView)
             throws SQLException {
         super();
         this.num = num;
@@ -80,7 +85,9 @@ public class RelateEcnBean {
                 e1.printStackTrace();
             }
         });
+        // 导入按钮，导入之后状态更新为已引用
         importBtn.setOnAction(e -> {
+            SqlUtil.getTCDataConnection(prefs);
             try {
                 ObservableList<RefTableBean> 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();
             }
         });
     }

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<RelateEcnBean> 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();

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();
     }

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";