diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/AssignIdController.class b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/AssignIdController.class
index 62d21f4..f11b974 100644
Binary files a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/AssignIdController.class and b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/AssignIdController.class differ
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
index 8dcb333..a128940 100644
--- a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/ChangeNoticePanel.fxml
+++ b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/ChangeNoticePanel.fxml
@@ -1,6 +1,5 @@
-
@@ -27,7 +26,7 @@
-
+
@@ -87,13 +86,10 @@
-
+
-
-
-
-
+
@@ -103,13 +99,6 @@
-
-
-
-
-
-
-
@@ -266,7 +255,7 @@
-
+
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/CreateEcnController$1.class b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/CreateEcnController$1.class
index 8525b2c..e7020a1 100644
Binary files a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/CreateEcnController$1.class and b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/CreateEcnController$1.class differ
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/CreateEcnController.class b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/CreateEcnController.class
index 500c196..406baa2 100644
Binary files a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/CreateEcnController.class and b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/CreateEcnController.class differ
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/EcnBean.class b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/EcnBean.class
index b4f76fb..b1aab38 100644
Binary files a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/EcnBean.class and b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/EcnBean.class differ
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/RefTableBean.class b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/RefTableBean.class
index b4187e0..8f9733d 100644
Binary files a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/RefTableBean.class and b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/RefTableBean.class differ
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/RelateEcnBean.class b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/RelateEcnBean.class
index b54ff3c..6c458f3 100644
Binary files a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/RelateEcnBean.class and b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/RelateEcnBean.class differ
diff --git a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/AssignIdController.java b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/AssignIdController.java
index f645c1a..6ccc522 100644
--- a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/AssignIdController.java
+++ b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/AssignIdController.java
@@ -122,6 +122,8 @@ public class AssignIdController{
}
assignBtnTop.setDisable(true);// ָֻһ
assignBtn.setDisable(true);// ָֻһ
+ Stage stage = (Stage)closeBtn.getScene().getWindow();
+ stage.close();
}
@FXML
diff --git a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/ChangeNoticePanel.fxml b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/ChangeNoticePanel.fxml
index 8dcb333..a128940 100644
--- a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/ChangeNoticePanel.fxml
+++ b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/ChangeNoticePanel.fxml
@@ -1,6 +1,5 @@
-
@@ -27,7 +26,7 @@
-
+
@@ -87,13 +86,10 @@
-
+
-
-
-
-
+
@@ -103,13 +99,6 @@
-
-
-
-
-
-
-
@@ -266,7 +255,7 @@
-
+
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 1a0fc87..dd09856 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
@@ -100,27 +100,29 @@ public class CreateEcnController extends KFXPanelController {
private List parts = new ArrayList();
private List reasons = new ArrayList();
private List wips = new ArrayList();
+ private List products = new ArrayList();
private List ecnBeans = new ArrayList();
protected AbstractAIFApplication app;
private TCSession session;
private TCComponent target;
@FXML
private RadioButton rb_formalChange; //ʽ֪ͨ
-
+ @FXML
+ private TextField factoryText;
@FXML
private GridPane productPane;
@FXML
private TextField htNameText;
@FXML
- private TextField markText;
+ public TextField markText;
@FXML
private TextField contractText;
@FXML
private ComboBox prodNameComb;
@FXML
private FlowPane departPane;
- private List partBtns = new ArrayList<>();
+ private List partBtns = new ArrayList<>();
@FXML
private ComboBox pmCombox;
private CreateEcnController controller;
@@ -159,6 +161,8 @@ public class CreateEcnController extends KFXPanelController {
initText();
}
+ @FXML
+ private Button createBtn;
/**
* @param event
* @throws Exception
@@ -253,7 +257,6 @@ public class CreateEcnController extends KFXPanelController {
//ӰϢ 浽CHINT_ECN_NOTIFICATION
try {
- String groupID = SAPUtil.getGroupID();
SqlUtil.getTCDataConnection(database);
String deleteSql = "delete CHINT_ECN_NOTIFICATION where \"ecncode\" = ? ";
String endCode = ecnId.getText();
@@ -266,7 +269,7 @@ public class CreateEcnController extends KFXPanelController {
RefTableBean refTableBean = items.get(i);
String result = refTableBean.getShYes().isSelected()?"":"";
SqlUtil.write(
- new String[] {endCode,"1",groupID,String.valueOf(i+1),
+ new String[] {endCode,"1",refTableBean.getDepart(),String.valueOf(i+1),
refTableBean.getMessage(),result,refTableBean.getUser().getText(),
refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql);
}
@@ -274,7 +277,7 @@ public class CreateEcnController extends KFXPanelController {
RefTableBean refTableBean = items.get(i);
String result = refTableBean.getShYes().isSelected()?"":"";
SqlUtil.write(
- new String[] {endCode,"2",groupID,String.valueOf(i-6),
+ new String[] {endCode,"2",refTableBean.getDepart(),String.valueOf(i-6),
refTableBean.getMessage(),result,refTableBean.getUser().getText(),
refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql);
}
@@ -282,7 +285,7 @@ public class CreateEcnController extends KFXPanelController {
RefTableBean refTableBean = items.get(i);
String result = refTableBean.getShYes().isSelected()?"":"";
SqlUtil.write(
- new String[] {endCode,"3",groupID,String.valueOf(i-10),
+ new String[] {endCode,"3",refTableBean.getDepart(),String.valueOf(i-10),
refTableBean.getMessage(),result,refTableBean.getUser().getText(),
refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql);
}
@@ -290,7 +293,7 @@ public class CreateEcnController extends KFXPanelController {
RefTableBean refTableBean = items.get(i);
String result = refTableBean.getShYes().isSelected()?"":"";
SqlUtil.write(
- new String[] {endCode,"4",groupID,String.valueOf(i-14),
+ new String[] {endCode,"4",refTableBean.getDepart(),String.valueOf(i-14),
refTableBean.getMessage(),result,refTableBean.getUser().getText(),
refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql);
}
@@ -298,7 +301,7 @@ public class CreateEcnController extends KFXPanelController {
RefTableBean refTableBean = items.get(i);
String result = refTableBean.getShYes().isSelected()?"":"";
SqlUtil.write(
- new String[] {endCode,"5",groupID,String.valueOf(i-18),
+ new String[] {endCode,"5",refTableBean.getDepart(),String.valueOf(i-18),
refTableBean.getMessage(),result,refTableBean.getUser().getText(),
refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql);
}
@@ -306,7 +309,7 @@ public class CreateEcnController extends KFXPanelController {
RefTableBean refTableBean = items.get(i);
String result = refTableBean.getShYes().isSelected()?"":"";
SqlUtil.write(
- new String[] {endCode,"6",groupID,String.valueOf(i-23),
+ new String[] {endCode,"6",refTableBean.getDepart(),String.valueOf(i-23),
refTableBean.getMessage(),result,refTableBean.getUser().getText(),
refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql);
}
@@ -314,7 +317,7 @@ public class CreateEcnController extends KFXPanelController {
RefTableBean refTableBean = items.get(i);
String result = refTableBean.getShYes().isSelected()?"":"";
SqlUtil.write(
- new String[] {endCode,"7",groupID,String.valueOf(i-26),
+ new String[] {endCode,"7",refTableBean.getDepart(),String.valueOf(i-26),
refTableBean.getMessage(),result,refTableBean.getUser().getText(),
refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql);
}
@@ -323,7 +326,7 @@ public class CreateEcnController extends KFXPanelController {
}finally {
SqlUtil.freeAll();
}
-
+ createBtn.setDisable(true);
}
/**
* @param ݼ
@@ -435,11 +438,16 @@ public class CreateEcnController extends KFXPanelController {
contractNo = contractText.getText(); //ͬ
contractName = htNameText.getText();//ͬ
productModel = pmCombox.getSelectionModel().getSelectedItem(); //Ʒͺ
+ String productName = prodNameComb.getSelectionModel().getSelectedItem();
+ String fileName = markText.getText();
changeType = changeName; //ʽʱ
item.setProperty("zt2_ContractNo", contractNo);
item.setProperty("zt2_ContractName", contractName);
item.setProperty("zt2_ProductModel", productModel);
item.setProperty("zt2_ChangeType", changeType);
+ item.setProperty("zt2_FileName", fileName);
+ item.setProperty("zt2_ProductName", productName);
+ item.setProperty("zt2_ChangRequestNo", relateEcnText.getText());
changeTime = changeDate.getEditor().getText();
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-M-dd");
if (changeTime.length() > 0) {
@@ -448,7 +456,7 @@ public class CreateEcnController extends KFXPanelController {
}
StringBuilder unit = new StringBuilder("");
for(int j=0;j 0) {
unit.append(";").append(radioButton.getText());
@@ -471,7 +479,12 @@ public class CreateEcnController extends KFXPanelController {
changeAfter1 = new String[rowCount];
changeReason = new String[rowCount];
processType1 = new String[rowCount];
-
+ szVersionBefs = new String[rowCount];
+ szVersionAfts = new String[rowCount];
+
+ productSzs = new String[rowCount];
+ processSzs = new String[rowCount];
+
int modulus = changeDrawingNo.length % 5;
int dlivery = changeDrawingNo.length / 5;
if (modulus == 0) {
@@ -488,8 +501,14 @@ public class CreateEcnController extends KFXPanelController {
partition[i] = ecnBean.getPoiNum().getText();
changeBefore1[i] = ecnBean.getOverChange().getText();
changeAfter1[i] = ecnBean.getAfterChange().getText();
- changeReason[i] = ecnBean.getChangeReason().getSelectionModel().getSelectedItem();
- processType1[i] = ecnBean.getWipTreat().getSelectionModel().getSelectedItem();
+ String reasonItem = ecnBean.getChangeReason().getSelectionModel().getSelectedItem();
+ changeReason[i] = reasonItem==null?"":reasonItem;
+ String processTypeItem = ecnBean.getWipTreat().getSelectionModel().getSelectedItem();
+ processType1[i] = processTypeItem==null?"":processTypeItem;
+ szVersionBefs[i] = ecnBean.getOverVersion().getText();
+ szVersionAfts[i] = ecnBean.getAfterVersion().getText();
+ productSzs[i] = ecnBean.getProductSz().getSelectionModel().getSelectedItem();
+ processSzs[i] = rb_product.isSelected() ? "Y":"N";
}
item.getTCProperty("zt2_ChangeDrawingNo").setStringValueArray(changeDrawingNo);
item.getTCProperty("zt2_Sign").setStringValueArray(sign);
@@ -498,6 +517,10 @@ public class CreateEcnController extends KFXPanelController {
item.getTCProperty("zt2_ChangeAfter1").setStringValueArray(changeAfter1);
item.getTCProperty("zt2_ChangeReason").setStringValueArray(changeReason);
item.getTCProperty("zt2_ProcessType1").setStringValueArray(processType1);
+ item.getTCProperty("zt2_SZVersionbefore").setStringValueArray(szVersionBefs);
+ item.getTCProperty("zt2_SZRevisedversion").setStringValueArray(szVersionAfts);
+ item.getTCProperty("zt2_SZProduct").setStringValueArray(productSzs);
+ item.getTCProperty("zt2_SZProcess").setStringValueArray(processSzs);
}
private int pages = 0;
private String[] changeDrawingNo; //zt2_ChangeDrawingNo
@@ -508,6 +531,10 @@ public class CreateEcnController extends KFXPanelController {
private String[] changeAfter1; //zt2_ChangeAfter1
private String[] changeReason; //zt2_ChangeReason
private String[] processType1; //zt2_ProcessType1
+ private String[] szVersionBefs; // ǰ汾
+ private String[] szVersionAfts; // 汾
+ private String[] productSzs; // 汾
+ private String[] processSzs; // 汾
/**
* @param event
* @function رҳ
@@ -524,13 +551,15 @@ public class CreateEcnController extends KFXPanelController {
private void initText() throws Exception {
List productModelList = new ArrayList<>();
productModelList = Util.getproductModel(target, productModelList);
-
+ factoryText.setEditable(false);
pmCombox.getItems().addAll(productModelList);
List unitList = new ArrayList<>();
contractText.setText(Util.getProjectNo(target));
contractText.setEditable(false);
htNameText.setText(Util.getProjectName(target));
htNameText.setEditable(false);
+ ecnId.setEditable(false);
+ rb_product.setSelected(true);
if(target.getType().equals("ZT2_ProjectItem")) {
//ȡƷ
List ccpNameFromProject = KUtil.getCCPNameFromProject(target, session);
@@ -562,7 +591,8 @@ public class CreateEcnController extends KFXPanelController {
target.refresh();
properties = target.getTCProperties(
new String[] { "zt2_ChangeDrawingNo", "zt2_Sign", "zt2_PlacesNo", "zt2_Partition",
- "zt2_ChangeBefore1", "zt2_ChangeAfter1", "zt2_ChangeReason", "zt2_ProcessType1" });
+ "zt2_ChangeBefore1", "zt2_ChangeAfter1", "zt2_ChangeReason", "zt2_ProcessType1" ,"zt2_SZVersionbefore",
+ "zt2_SZRevisedversion", "zt2_SZProduct", "zt2_SZProcess"});
} catch (TCException e1) {
e1.printStackTrace();
}
@@ -574,16 +604,35 @@ public class CreateEcnController extends KFXPanelController {
String[] ChangeAfter1 = properties[5].getStringArrayValue();
String[] ChangeReason = properties[6].getStringArrayValue();
String[] ProcessType1 = properties[7].getStringArrayValue();
+ String[] szVersionBef = properties[8].getStringArrayValue();
+ String[] szVersionAft = properties[9].getStringArrayValue();
+ String[] szProduct = properties[10].getStringArrayValue();
+ String[] szProcess = properties[11].getStringArrayValue();
+ if(szProcess.length>0) {
+ rb_Process.setSelected(szProcess[0].equals("N"));
+ }
+ String fileName = target.getProperty("zt2_FileName");
+ String productName = target.getProperty("zt2_ProductName");
+ String changRequestNo = target.getProperty("zt2_ChangRequestNo");// relateEcnText.getText()
+ prodNameComb.getSelectionModel().select(productName);
+ markText.setText(fileName);
+ relateEcnText.setText(changRequestNo);
+// String productName = prodNameComb.getSelectionModel().getSelectedItem();
+// String fileName = markText.getText();
+// item.setProperty("zt2_FileName", fileName);
+// item.setProperty("zt2_ProductName", productName);
int rowNum = 0;
for (int j = 0; j < ChangeDrawingNo.length; j++) {
rowNum++;
- ecnBeans.add(new EcnBean(rowNum, reasons, wips, ChangeDrawingNo[j], sign[j], placesNo[j]
- , ChangeBefore1[j], ChangeAfter1[j], ChangeReason[j], ProcessType1[j]));
+ EcnBean ecnBean = new EcnBean(rowNum, reasons, wips, ChangeDrawingNo[j], sign[j], placesNo[j]
+ , ChangeBefore1[j], ChangeAfter1[j], ChangeReason[j], ProcessType1[j], szVersionBef[j], szVersionAft[j]);
+ ecnBeans.add(ecnBean);
+ ecnBean.setProductSz(szProduct[j]);
}
}
tableView.getItems().addAll(ecnBeans);
for(int i=0;i tc_xh = new TableColumn("");
TableColumn> tc_wipTreat = new TableColumn>("Ʒ");
TableColumn tc_beforVer = new TableColumn("ǰ汾");
+ TableColumn> productSz = new TableColumn>("Եȼ");
TableColumn> tc_reason = new TableColumn>("ԭ");
TableColumn tc_poiNum = new TableColumn("");
tableView.getColumns().addAll(tc_xh, tc_drawNo, tc_mark,tc_poiNum,tc_beforChange, tc_beforVer, tc_afterChange,
- tc_afterVer,tc_reason,tc_wipTreat);
+ tc_afterVer,productSz,tc_reason,tc_wipTreat);
tc_xh.setSortable(false);
tc_drawNo.setSortable(false);
@@ -723,6 +773,7 @@ public class CreateEcnController extends KFXPanelController {
tc_afterChange.setSortable(false);
tc_afterVer.setSortable(false);
tc_reason.setSortable(false);
+ productSz.setSortable(false);
tc_wipTreat.setSortable(false);
//аbean
tc_xh.setCellValueFactory(new PropertyValueFactory("num"));
@@ -735,17 +786,18 @@ public class CreateEcnController extends KFXPanelController {
tc_afterVer.setCellValueFactory(new PropertyValueFactory("afterVersion"));
tc_reason.setCellValueFactory(new PropertyValueFactory>("changeReason"));
tc_wipTreat.setCellValueFactory(new PropertyValueFactory>("wipTreat"));
+ productSz.setCellValueFactory(new PropertyValueFactory>("productSz"));
tc_xh.prefWidthProperty().bind(tableView.widthProperty().multiply(0.06));
- tc_drawNo.prefWidthProperty().bind(tableView.widthProperty().multiply(0.20));
+ tc_drawNo.prefWidthProperty().bind(tableView.widthProperty().multiply(0.18));
tc_mark.prefWidthProperty().bind(tableView.widthProperty().multiply(0.06));
tc_poiNum.prefWidthProperty().bind(tableView.widthProperty().multiply(0.06));
tc_beforChange.prefWidthProperty().bind(tableView.widthProperty().multiply(0.10));
- tc_beforVer.prefWidthProperty().bind(tableView.widthProperty().multiply(0.08));
- tc_afterChange.prefWidthProperty().bind(tableView.widthProperty().multiply(0.08));
-
- tc_afterVer.prefWidthProperty().bind(tableView.widthProperty().multiply(0.1));
- tc_reason.prefWidthProperty().bind(tableView.widthProperty().multiply(0.14));
+ tc_beforVer.prefWidthProperty().bind(tableView.widthProperty().multiply(0.06));
+ tc_afterChange.prefWidthProperty().bind(tableView.widthProperty().multiply(0.10));
+ productSz.prefWidthProperty().bind(tableView.widthProperty().multiply(0.06));
+ tc_afterVer.prefWidthProperty().bind(tableView.widthProperty().multiply(0.06));
+ tc_reason.prefWidthProperty().bind(tableView.widthProperty().multiply(0.14)); //0.4
tc_wipTreat.prefWidthProperty().bind(tableView.widthProperty().multiply(0.10));
}
@FXML
@@ -883,19 +935,24 @@ public class CreateEcnController extends KFXPanelController {
SqlUtil.getTCDataConnection(database);
try {
- String sql = "select PART,REASON,MANAGE,DATASET from CHINT_ECN_TYPE where CODE = ?";
+ String sql = "select PART,REASON,MANAGE,DATASET,UNIT,GRADE from CHINT_ECN_TYPE where CODE = ?";
ResultSet read = SqlUtil.read(sql, new String[] {SAPUtil.getGroupID()});
if(read.next()) {
String part = read.getString(1);
String reason = read.getString(2);
String manage = read.getString(3);
String dataset = read.getString(4);
+ String factory = read.getString(5);
+ String grade = read.getString(6);
+ factoryText.setText(factory);
String[] partArray = part.split(";");
String[] reasonArray = reason.split(";");
String[] manageArray = manage.split(";");
+ String[] grades = grade.split(";");
parts = new ArrayList(Arrays.asList(partArray));
reasons = new ArrayList(Arrays.asList(reasonArray));
wips = new ArrayList(Arrays.asList(manageArray));
+ products = new ArrayList(Arrays.asList(grades));
}
}catch(Exception e) {
@@ -913,7 +970,7 @@ public class CreateEcnController extends KFXPanelController {
@FXML
void addRows(ActionEvent event) {
for(int i=0;i<5;i++) {
- ecnBeans.add(new EcnBean(ecnBeans.size()+1,reasons,wips));
+ ecnBeans.add(new EcnBean(ecnBeans.size()+1, reasons, wips, products));
}
ObservableList data = FXCollections.observableArrayList(ecnBeans);
tableView.getItems().clear();
@@ -925,7 +982,7 @@ public class CreateEcnController extends KFXPanelController {
*/
@FXML
void addRow(ActionEvent event) {
- ecnBeans.add(new EcnBean(ecnBeans.size()+1,reasons,wips));
+ ecnBeans.add(new EcnBean(ecnBeans.size()+1, reasons, wips, products));
ObservableList data = FXCollections.observableArrayList(ecnBeans);
tableView.getItems().clear();
tableView.setItems(data);
diff --git a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/EcnBean.java b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/EcnBean.java
index c5e66c2..988fb14 100644
--- a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/EcnBean.java
+++ b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/EcnBean.java
@@ -1,6 +1,7 @@
package com.chint.plm.createEcn;
+import java.util.ArrayList;
import java.util.List;
import javafx.beans.property.SimpleIntegerProperty;
@@ -16,12 +17,19 @@ public class EcnBean {
protected TextArea poiNum; //
protected TextArea overChange;//ǰ
protected TextArea overVersion;//ǰ汾
- protected TextArea afterChange;//ĺ
protected TextArea afterVersion;//ĺ汾
+ protected TextArea afterChange;//ĺ
+ protected ComboBox productSz = new ComboBox();//Եȼ
protected ComboBox changeReason = new ComboBox();//ԭ
- protected ComboBox wipTreat = new ComboBox();;//Ʒ
+ protected ComboBox wipTreat = new ComboBox();//Ʒ
- EcnBean(int ind, List reasons, List wips) {
+ public ComboBox getProductSz() {
+ return productSz;
+ }
+ public void setProductSz(String productSz) {
+ this.productSz.getSelectionModel().select(productSz);
+ }
+ EcnBean(int ind, List reasons, List wips,List products) {
num = new SimpleIntegerProperty(ind);
drawNo = new TextArea(); //ComboBoxTextArea
drawNo.setPrefSize(200, 40);
@@ -44,10 +52,13 @@ public class EcnBean {
afterVersion = new TextArea(); //ComboBoxTextArea
afterVersion.setPrefSize(200, 40);
wipTreat.getItems().addAll(wips);
+ productSz.getItems().addAll(products);
+ productSz.getSelectionModel().selectFirst();
changeReason.getItems().addAll(reasons);
}
EcnBean(int ind, List reasons, List wips, String drawNoVal, String markVal,
- String placesNo, String changeBefore, String changeAfter, String reasonVal, String processType) {
+ String placesNo, String changeBefore, String changeAfter, String reasonVal, String processType,
+ String szRevisionBef, String szRevisionAft) {
num = new SimpleIntegerProperty(ind);
drawNo = new TextArea(); //ComboBoxTextArea
drawNo.setPrefSize(200, 40);
@@ -67,6 +78,7 @@ public class EcnBean {
overVersion = new TextArea(); //ComboBoxTextArea
overVersion.setPrefSize(200, 40);
+ overVersion.setText(szRevisionBef);
afterChange = new TextArea(); //ComboBoxTextArea
afterChange.setPrefSize(200, 40);
@@ -74,6 +86,8 @@ public class EcnBean {
afterVersion = new TextArea(); //ComboBoxTextArea
afterVersion.setPrefSize(200, 40);
+ afterVersion.setText(szRevisionAft);
+
wipTreat.getItems().addAll(wips);
wipTreat.getSelectionModel().select(processType);
changeReason.getItems().addAll(reasons);
diff --git a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/RefTableBean.java b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/RefTableBean.java
index 14db1d7..b1c653b 100644
--- a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/RefTableBean.java
+++ b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/RefTableBean.java
@@ -83,7 +83,7 @@ public class RefTableBean {
// this.user = user;
// this.compDate = compDate;
// this.mark = mark;
- shYes.setSelected(true);
+ shNo.setSelected(true);
shYes.selectedProperty().addListener(new ChangeListener() {
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 be21b26..aad1db2 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
@@ -52,7 +52,9 @@ public class RelateEcnBean {
this.prodModel = prodModel;
this.applicant = applicant;
this.status = status;
+ //
String applyNo = read.getString("APPLYNO");
+ //
String designPal = read.getString("DESIGNPRINCIPAL");
String techPal = read.getString("TECHPRINCIPAL");
String quantityPal = read.getString("QUALITYPRINCIPAL");
@@ -60,6 +62,8 @@ public class RelateEcnBean {
String purchasePal = read.getString("PURCHASEYPRINCIPAL");
String customPal = read.getString("CUSTOMNOTICEPRINCIPAL");//FINAPRICEPRINCIPAL
String finaPal = read.getString("FINAPRICEPRINCIPAL");
+ String docuName = read.getString("DOCUNAME"); //ļż
+ String designFile = read.getString("DESIGNFILE");//ȡж
linkBtn.setOnAction(e -> {
try {
BomToSapUtil.browse2(link);
@@ -92,6 +96,7 @@ public class RelateEcnBean {
for(int i=27;i<28;i++) {
items.get(i).setUser(finaPal);
}
+ controller.markText.setText(docuName);
controller.relateEcnText.setText(applyNo);
controller.refTable.setItems(items);
} catch (Exception e1) {