1219 更新

no-bomasyn
陈翼晖 2 years ago
parent 5dd1381619
commit 7f81cec8a0

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import tornadofx.control.*?>
<?import java.lang.*?> <?import java.lang.*?>
<?import javafx.geometry.*?> <?import javafx.geometry.*?>
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
@ -27,7 +26,7 @@
<FlowPane alignment="CENTER_LEFT" hgap="12.0" prefHeight="80.0" prefWidth="400.0" style="-fx-border-color: black;" BorderPane.alignment="CENTER"> <FlowPane alignment="CENTER_LEFT" hgap="12.0" prefHeight="80.0" prefWidth="400.0" style="-fx-border-color: black;" BorderPane.alignment="CENTER">
<children> <children>
<Label text="单位:" /> <Label text="单位:" />
<TextField /> <TextField fx:id="factoryText" />
</children> </children>
<BorderPane.margin> <BorderPane.margin>
<Insets /> <Insets />
@ -87,13 +86,10 @@
<Insets left="5.0" /> <Insets left="5.0" />
</padding> </padding>
</FlowPane> </FlowPane>
<FlowPane alignment="CENTER_LEFT" hgap="15.0" prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1"> <FlowPane alignment="CENTER_LEFT" hgap="100.0" prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1">
<children> <children>
<RadioButton fx:id="rb_product" mnemonicParsing="false" text="产品" /> <RadioButton fx:id="rb_product" mnemonicParsing="false" text="产品" />
<Label text="产品特性:" /> <RadioButton fx:id="rb_Process" mnemonicParsing="false" text="过程" />
<RadioButton mnemonicParsing="false" text="A" />
<RadioButton mnemonicParsing="false" text="B" />
<RadioButton mnemonicParsing="false" text="C" />
</children> </children>
<GridPane.margin> <GridPane.margin>
<Insets /> <Insets />
@ -103,13 +99,6 @@
</padding> </padding>
</FlowPane> </FlowPane>
<FlowPane alignment="CENTER_LEFT" hgap="15.0" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1"> <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> <padding>
<Insets left="5.0" /> <Insets left="5.0" />
</padding> </padding>
@ -266,7 +255,7 @@
</TitledPane> </TitledPane>
<FlowPane alignment="TOP_CENTER" hgap="40.0" prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1"> <FlowPane alignment="TOP_CENTER" hgap="40.0" prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1">
<children> <children>
<Button mnemonicParsing="false" onAction="#createClick" text="确定" /> <Button fx:id="createBtn" mnemonicParsing="false" onAction="#createClick" text="确定" />
<Button alignment="CENTER" mnemonicParsing="false" onAction="#disposeClick" text="取消" /> <Button alignment="CENTER" mnemonicParsing="false" onAction="#disposeClick" text="取消" />
</children> </children>
<GridPane.margin> <GridPane.margin>

@ -122,6 +122,8 @@ public class AssignIdController{
} }
assignBtnTop.setDisable(true);// 只能指派一次 assignBtnTop.setDisable(true);// 只能指派一次
assignBtn.setDisable(true);// 只能指派一次 assignBtn.setDisable(true);// 只能指派一次
Stage stage = (Stage)closeBtn.getScene().getWindow();
stage.close();
} }
@FXML @FXML

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import tornadofx.control.*?>
<?import java.lang.*?> <?import java.lang.*?>
<?import javafx.geometry.*?> <?import javafx.geometry.*?>
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
@ -27,7 +26,7 @@
<FlowPane alignment="CENTER_LEFT" hgap="12.0" prefHeight="80.0" prefWidth="400.0" style="-fx-border-color: black;" BorderPane.alignment="CENTER"> <FlowPane alignment="CENTER_LEFT" hgap="12.0" prefHeight="80.0" prefWidth="400.0" style="-fx-border-color: black;" BorderPane.alignment="CENTER">
<children> <children>
<Label text="单位:" /> <Label text="单位:" />
<TextField /> <TextField fx:id="factoryText" />
</children> </children>
<BorderPane.margin> <BorderPane.margin>
<Insets /> <Insets />
@ -87,13 +86,10 @@
<Insets left="5.0" /> <Insets left="5.0" />
</padding> </padding>
</FlowPane> </FlowPane>
<FlowPane alignment="CENTER_LEFT" hgap="15.0" prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1"> <FlowPane alignment="CENTER_LEFT" hgap="100.0" prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1">
<children> <children>
<RadioButton fx:id="rb_product" mnemonicParsing="false" text="产品" /> <RadioButton fx:id="rb_product" mnemonicParsing="false" text="产品" />
<Label text="产品特性:" /> <RadioButton fx:id="rb_Process" mnemonicParsing="false" text="过程" />
<RadioButton mnemonicParsing="false" text="A" />
<RadioButton mnemonicParsing="false" text="B" />
<RadioButton mnemonicParsing="false" text="C" />
</children> </children>
<GridPane.margin> <GridPane.margin>
<Insets /> <Insets />
@ -103,13 +99,6 @@
</padding> </padding>
</FlowPane> </FlowPane>
<FlowPane alignment="CENTER_LEFT" hgap="15.0" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1"> <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> <padding>
<Insets left="5.0" /> <Insets left="5.0" />
</padding> </padding>
@ -266,7 +255,7 @@
</TitledPane> </TitledPane>
<FlowPane alignment="TOP_CENTER" hgap="40.0" prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1"> <FlowPane alignment="TOP_CENTER" hgap="40.0" prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1">
<children> <children>
<Button mnemonicParsing="false" onAction="#createClick" text="确定" /> <Button fx:id="createBtn" mnemonicParsing="false" onAction="#createClick" text="确定" />
<Button alignment="CENTER" mnemonicParsing="false" onAction="#disposeClick" text="取消" /> <Button alignment="CENTER" mnemonicParsing="false" onAction="#disposeClick" text="取消" />
</children> </children>
<GridPane.margin> <GridPane.margin>

@ -100,27 +100,29 @@ public class CreateEcnController extends KFXPanelController {
private List<String> parts = new ArrayList<String>(); private List<String> parts = new ArrayList<String>();
private List<String> reasons = new ArrayList<String>(); private List<String> reasons = new ArrayList<String>();
private List<String> wips = new ArrayList<String>(); private List<String> wips = new ArrayList<String>();
private List<String> products = new ArrayList<String>();
private List<EcnBean> ecnBeans = new ArrayList<EcnBean>(); private List<EcnBean> ecnBeans = new ArrayList<EcnBean>();
protected AbstractAIFApplication app; protected AbstractAIFApplication app;
private TCSession session; private TCSession session;
private TCComponent target; private TCComponent target;
@FXML @FXML
private RadioButton rb_formalChange; //正式更改通知单 private RadioButton rb_formalChange; //正式更改通知单
@FXML
private TextField factoryText;
@FXML @FXML
private GridPane productPane; private GridPane productPane;
@FXML @FXML
private TextField htNameText; private TextField htNameText;
@FXML @FXML
private TextField markText; public TextField markText;
@FXML @FXML
private TextField contractText; private TextField contractText;
@FXML @FXML
private ComboBox<String> prodNameComb; private ComboBox<String> prodNameComb;
@FXML @FXML
private FlowPane departPane; private FlowPane departPane;
private List<RadioButton> partBtns = new ArrayList<>(); private List<CheckBox> partBtns = new ArrayList<>();
@FXML @FXML
private ComboBox<String> pmCombox; private ComboBox<String> pmCombox;
private CreateEcnController controller; private CreateEcnController controller;
@ -159,6 +161,8 @@ public class CreateEcnController extends KFXPanelController {
initText(); initText();
} }
@FXML
private Button createBtn;
/** /**
* @param event * @param event
* @throws Exception * @throws Exception
@ -253,7 +257,6 @@ public class CreateEcnController extends KFXPanelController {
//影响分析信息 保存到CHINT_ECN_NOTIFICATION中 //影响分析信息 保存到CHINT_ECN_NOTIFICATION中
try { try {
String groupID = SAPUtil.getGroupID();
SqlUtil.getTCDataConnection(database); SqlUtil.getTCDataConnection(database);
String deleteSql = "delete CHINT_ECN_NOTIFICATION where \"ecncode\" = ? "; String deleteSql = "delete CHINT_ECN_NOTIFICATION where \"ecncode\" = ? ";
String endCode = ecnId.getText(); String endCode = ecnId.getText();
@ -266,7 +269,7 @@ public class CreateEcnController extends KFXPanelController {
RefTableBean refTableBean = items.get(i); RefTableBean refTableBean = items.get(i);
String result = refTableBean.getShYes().isSelected()?"是":"否"; String result = refTableBean.getShYes().isSelected()?"是":"否";
SqlUtil.write( 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.getMessage(),result,refTableBean.getUser().getText(),
refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql); refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql);
} }
@ -274,7 +277,7 @@ public class CreateEcnController extends KFXPanelController {
RefTableBean refTableBean = items.get(i); RefTableBean refTableBean = items.get(i);
String result = refTableBean.getShYes().isSelected()?"是":"否"; String result = refTableBean.getShYes().isSelected()?"是":"否";
SqlUtil.write( 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.getMessage(),result,refTableBean.getUser().getText(),
refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql); refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql);
} }
@ -282,7 +285,7 @@ public class CreateEcnController extends KFXPanelController {
RefTableBean refTableBean = items.get(i); RefTableBean refTableBean = items.get(i);
String result = refTableBean.getShYes().isSelected()?"是":"否"; String result = refTableBean.getShYes().isSelected()?"是":"否";
SqlUtil.write( 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.getMessage(),result,refTableBean.getUser().getText(),
refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql); refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql);
} }
@ -290,7 +293,7 @@ public class CreateEcnController extends KFXPanelController {
RefTableBean refTableBean = items.get(i); RefTableBean refTableBean = items.get(i);
String result = refTableBean.getShYes().isSelected()?"是":"否"; String result = refTableBean.getShYes().isSelected()?"是":"否";
SqlUtil.write( 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.getMessage(),result,refTableBean.getUser().getText(),
refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql); refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql);
} }
@ -298,7 +301,7 @@ public class CreateEcnController extends KFXPanelController {
RefTableBean refTableBean = items.get(i); RefTableBean refTableBean = items.get(i);
String result = refTableBean.getShYes().isSelected()?"是":"否"; String result = refTableBean.getShYes().isSelected()?"是":"否";
SqlUtil.write( 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.getMessage(),result,refTableBean.getUser().getText(),
refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql); refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql);
} }
@ -306,7 +309,7 @@ public class CreateEcnController extends KFXPanelController {
RefTableBean refTableBean = items.get(i); RefTableBean refTableBean = items.get(i);
String result = refTableBean.getShYes().isSelected()?"是":"否"; String result = refTableBean.getShYes().isSelected()?"是":"否";
SqlUtil.write( 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.getMessage(),result,refTableBean.getUser().getText(),
refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql); refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql);
} }
@ -314,7 +317,7 @@ public class CreateEcnController extends KFXPanelController {
RefTableBean refTableBean = items.get(i); RefTableBean refTableBean = items.get(i);
String result = refTableBean.getShYes().isSelected()?"是":"否"; String result = refTableBean.getShYes().isSelected()?"是":"否";
SqlUtil.write( 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.getMessage(),result,refTableBean.getUser().getText(),
refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql); refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql);
} }
@ -323,7 +326,7 @@ public class CreateEcnController extends KFXPanelController {
}finally { }finally {
SqlUtil.freeAll(); SqlUtil.freeAll();
} }
createBtn.setDisable(true);
} }
/** /**
* @param * @param
@ -435,11 +438,16 @@ public class CreateEcnController extends KFXPanelController {
contractNo = contractText.getText(); //合同代号 contractNo = contractText.getText(); //合同代号
contractName = htNameText.getText();//合同名称 contractName = htNameText.getText();//合同名称
productModel = pmCombox.getSelectionModel().getSelectedItem(); //产品型号 productModel = pmCombox.getSelectionModel().getSelectedItem(); //产品型号
String productName = prodNameComb.getSelectionModel().getSelectedItem();
String fileName = markText.getText();
changeType = changeName; //正式临时 changeType = changeName; //正式临时
item.setProperty("zt2_ContractNo", contractNo); item.setProperty("zt2_ContractNo", contractNo);
item.setProperty("zt2_ContractName", contractName); item.setProperty("zt2_ContractName", contractName);
item.setProperty("zt2_ProductModel", productModel); item.setProperty("zt2_ProductModel", productModel);
item.setProperty("zt2_ChangeType", changeType); 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(); changeTime = changeDate.getEditor().getText();
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-M-dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-M-dd");
if (changeTime.length() > 0) { if (changeTime.length() > 0) {
@ -448,7 +456,7 @@ public class CreateEcnController extends KFXPanelController {
} }
StringBuilder unit = new StringBuilder(""); StringBuilder unit = new StringBuilder("");
for(int j=0;j<partBtns.size();j++) { for(int j=0;j<partBtns.size();j++) {
RadioButton radioButton = partBtns.get(j); CheckBox radioButton = partBtns.get(j);
if(radioButton.isSelected()) { if(radioButton.isSelected()) {
if (unit.length() > 0) { if (unit.length() > 0) {
unit.append(";").append(radioButton.getText()); unit.append(";").append(radioButton.getText());
@ -471,7 +479,12 @@ public class CreateEcnController extends KFXPanelController {
changeAfter1 = new String[rowCount]; changeAfter1 = new String[rowCount];
changeReason = new String[rowCount]; changeReason = new String[rowCount];
processType1 = 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 modulus = changeDrawingNo.length % 5;
int dlivery = changeDrawingNo.length / 5; int dlivery = changeDrawingNo.length / 5;
if (modulus == 0) { if (modulus == 0) {
@ -488,8 +501,14 @@ public class CreateEcnController extends KFXPanelController {
partition[i] = ecnBean.getPoiNum().getText(); partition[i] = ecnBean.getPoiNum().getText();
changeBefore1[i] = ecnBean.getOverChange().getText(); changeBefore1[i] = ecnBean.getOverChange().getText();
changeAfter1[i] = ecnBean.getAfterChange().getText(); changeAfter1[i] = ecnBean.getAfterChange().getText();
changeReason[i] = ecnBean.getChangeReason().getSelectionModel().getSelectedItem(); String reasonItem = ecnBean.getChangeReason().getSelectionModel().getSelectedItem();
processType1[i] = ecnBean.getWipTreat().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_ChangeDrawingNo").setStringValueArray(changeDrawingNo);
item.getTCProperty("zt2_Sign").setStringValueArray(sign); item.getTCProperty("zt2_Sign").setStringValueArray(sign);
@ -498,6 +517,10 @@ public class CreateEcnController extends KFXPanelController {
item.getTCProperty("zt2_ChangeAfter1").setStringValueArray(changeAfter1); item.getTCProperty("zt2_ChangeAfter1").setStringValueArray(changeAfter1);
item.getTCProperty("zt2_ChangeReason").setStringValueArray(changeReason); item.getTCProperty("zt2_ChangeReason").setStringValueArray(changeReason);
item.getTCProperty("zt2_ProcessType1").setStringValueArray(processType1); 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 int pages = 0;
private String[] changeDrawingNo; //属性zt2_ChangeDrawingNo private String[] changeDrawingNo; //属性zt2_ChangeDrawingNo
@ -508,6 +531,10 @@ public class CreateEcnController extends KFXPanelController {
private String[] changeAfter1; //属性zt2_ChangeAfter1 private String[] changeAfter1; //属性zt2_ChangeAfter1
private String[] changeReason; //属性zt2_ChangeReason private String[] changeReason; //属性zt2_ChangeReason
private String[] processType1; //属性zt2_ProcessType1 private String[] processType1; //属性zt2_ProcessType1
private String[] szVersionBefs; // 变更前版本
private String[] szVersionAfts; // 变更后版本
private String[] productSzs; // 变更后版本
private String[] processSzs; // 变更后版本
/** /**
* @param event * @param event
* @function * @function
@ -524,13 +551,15 @@ public class CreateEcnController extends KFXPanelController {
private void initText() throws Exception { private void initText() throws Exception {
List<String> productModelList = new ArrayList<>(); List<String> productModelList = new ArrayList<>();
productModelList = Util.getproductModel(target, productModelList); productModelList = Util.getproductModel(target, productModelList);
factoryText.setEditable(false);
pmCombox.getItems().addAll(productModelList); pmCombox.getItems().addAll(productModelList);
List<String> unitList = new ArrayList<>(); List<String> unitList = new ArrayList<>();
contractText.setText(Util.getProjectNo(target)); contractText.setText(Util.getProjectNo(target));
contractText.setEditable(false); contractText.setEditable(false);
htNameText.setText(Util.getProjectName(target)); htNameText.setText(Util.getProjectName(target));
htNameText.setEditable(false); htNameText.setEditable(false);
ecnId.setEditable(false);
rb_product.setSelected(true);
if(target.getType().equals("ZT2_ProjectItem")) { if(target.getType().equals("ZT2_ProjectItem")) {
//获取产成品的名称 //获取产成品的名称
List<String> ccpNameFromProject = KUtil.getCCPNameFromProject(target, session); List<String> ccpNameFromProject = KUtil.getCCPNameFromProject(target, session);
@ -562,7 +591,8 @@ public class CreateEcnController extends KFXPanelController {
target.refresh(); target.refresh();
properties = target.getTCProperties( properties = target.getTCProperties(
new String[] { "zt2_ChangeDrawingNo", "zt2_Sign", "zt2_PlacesNo", "zt2_Partition", 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) { } catch (TCException e1) {
e1.printStackTrace(); e1.printStackTrace();
} }
@ -574,16 +604,35 @@ public class CreateEcnController extends KFXPanelController {
String[] ChangeAfter1 = properties[5].getStringArrayValue(); String[] ChangeAfter1 = properties[5].getStringArrayValue();
String[] ChangeReason = properties[6].getStringArrayValue(); String[] ChangeReason = properties[6].getStringArrayValue();
String[] ProcessType1 = properties[7].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; int rowNum = 0;
for (int j = 0; j < ChangeDrawingNo.length; j++) { for (int j = 0; j < ChangeDrawingNo.length; j++) {
rowNum++; rowNum++;
ecnBeans.add(new EcnBean(rowNum, reasons, wips, ChangeDrawingNo[j], sign[j], placesNo[j] EcnBean ecnBean = new EcnBean(rowNum, reasons, wips, ChangeDrawingNo[j], sign[j], placesNo[j]
, ChangeBefore1[j], ChangeAfter1[j], ChangeReason[j], ProcessType1[j])); , ChangeBefore1[j], ChangeAfter1[j], ChangeReason[j], ProcessType1[j], szVersionBef[j], szVersionAft[j]);
ecnBeans.add(ecnBean);
ecnBean.setProductSz(szProduct[j]);
} }
} }
tableView.getItems().addAll(ecnBeans); tableView.getItems().addAll(ecnBeans);
for(int i=0;i<parts.size();i++) { for(int i=0;i<parts.size();i++) {
RadioButton btn = new RadioButton(parts.get(i)); CheckBox btn = new CheckBox(parts.get(i));
partBtns.add(btn); partBtns.add(btn);
departPane.getChildren().add(btn); departPane.getChildren().add(btn);
if(unitList.contains(parts.get(i))) { if(unitList.contains(parts.get(i))) {
@ -709,10 +758,11 @@ public class CreateEcnController extends KFXPanelController {
TableColumn<EcnBean,Integer> tc_xh = new TableColumn<EcnBean,Integer>("序号"); TableColumn<EcnBean,Integer> tc_xh = new TableColumn<EcnBean,Integer>("序号");
TableColumn<EcnBean,ComboBox<String>> tc_wipTreat = new TableColumn<EcnBean,ComboBox<String>>("在制品处理"); TableColumn<EcnBean,ComboBox<String>> tc_wipTreat = new TableColumn<EcnBean,ComboBox<String>>("在制品处理");
TableColumn<EcnBean,TextArea> tc_beforVer = new TableColumn<EcnBean,TextArea>("更改前版本"); TableColumn<EcnBean,TextArea> tc_beforVer = new TableColumn<EcnBean,TextArea>("更改前版本");
TableColumn<EcnBean,ComboBox<String>> productSz = new TableColumn<EcnBean,ComboBox<String>>("特性等级");
TableColumn<EcnBean,ComboBox<String>> tc_reason = new TableColumn<EcnBean,ComboBox<String>>("更改原因"); TableColumn<EcnBean,ComboBox<String>> tc_reason = new TableColumn<EcnBean,ComboBox<String>>("更改原因");
TableColumn<EcnBean,TextArea> tc_poiNum = new TableColumn<EcnBean,TextArea>("处数"); TableColumn<EcnBean,TextArea> tc_poiNum = new TableColumn<EcnBean,TextArea>("处数");
tableView.getColumns().addAll(tc_xh, tc_drawNo, tc_mark,tc_poiNum,tc_beforChange, tc_beforVer, tc_afterChange, 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_xh.setSortable(false);
tc_drawNo.setSortable(false); tc_drawNo.setSortable(false);
@ -723,6 +773,7 @@ public class CreateEcnController extends KFXPanelController {
tc_afterChange.setSortable(false); tc_afterChange.setSortable(false);
tc_afterVer.setSortable(false); tc_afterVer.setSortable(false);
tc_reason.setSortable(false); tc_reason.setSortable(false);
productSz.setSortable(false);
tc_wipTreat.setSortable(false); tc_wipTreat.setSortable(false);
//列绑定bean对象 //列绑定bean对象
tc_xh.setCellValueFactory(new PropertyValueFactory<EcnBean,Integer>("num")); tc_xh.setCellValueFactory(new PropertyValueFactory<EcnBean,Integer>("num"));
@ -735,17 +786,18 @@ public class CreateEcnController extends KFXPanelController {
tc_afterVer.setCellValueFactory(new PropertyValueFactory<EcnBean,TextArea>("afterVersion")); tc_afterVer.setCellValueFactory(new PropertyValueFactory<EcnBean,TextArea>("afterVersion"));
tc_reason.setCellValueFactory(new PropertyValueFactory<EcnBean,ComboBox<String>>("changeReason")); tc_reason.setCellValueFactory(new PropertyValueFactory<EcnBean,ComboBox<String>>("changeReason"));
tc_wipTreat.setCellValueFactory(new PropertyValueFactory<EcnBean,ComboBox<String>>("wipTreat")); tc_wipTreat.setCellValueFactory(new PropertyValueFactory<EcnBean,ComboBox<String>>("wipTreat"));
productSz.setCellValueFactory(new PropertyValueFactory<EcnBean,ComboBox<String>>("productSz"));
tc_xh.prefWidthProperty().bind(tableView.widthProperty().multiply(0.06)); 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_mark.prefWidthProperty().bind(tableView.widthProperty().multiply(0.06));
tc_poiNum.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_beforChange.prefWidthProperty().bind(tableView.widthProperty().multiply(0.10));
tc_beforVer.prefWidthProperty().bind(tableView.widthProperty().multiply(0.08)); tc_beforVer.prefWidthProperty().bind(tableView.widthProperty().multiply(0.06));
tc_afterChange.prefWidthProperty().bind(tableView.widthProperty().multiply(0.08)); 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.1)); tc_afterVer.prefWidthProperty().bind(tableView.widthProperty().multiply(0.06));
tc_reason.prefWidthProperty().bind(tableView.widthProperty().multiply(0.14)); tc_reason.prefWidthProperty().bind(tableView.widthProperty().multiply(0.14)); //0.4
tc_wipTreat.prefWidthProperty().bind(tableView.widthProperty().multiply(0.10)); tc_wipTreat.prefWidthProperty().bind(tableView.widthProperty().multiply(0.10));
} }
@FXML @FXML
@ -883,19 +935,24 @@ public class CreateEcnController extends KFXPanelController {
SqlUtil.getTCDataConnection(database); SqlUtil.getTCDataConnection(database);
try { 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()}); ResultSet read = SqlUtil.read(sql, new String[] {SAPUtil.getGroupID()});
if(read.next()) { if(read.next()) {
String part = read.getString(1); String part = read.getString(1);
String reason = read.getString(2); String reason = read.getString(2);
String manage = read.getString(3); String manage = read.getString(3);
String dataset = read.getString(4); String dataset = read.getString(4);
String factory = read.getString(5);
String grade = read.getString(6);
factoryText.setText(factory);
String[] partArray = part.split(";"); String[] partArray = part.split(";");
String[] reasonArray = reason.split(";"); String[] reasonArray = reason.split(";");
String[] manageArray = manage.split(";"); String[] manageArray = manage.split(";");
String[] grades = grade.split(";");
parts = new ArrayList<String>(Arrays.asList(partArray)); parts = new ArrayList<String>(Arrays.asList(partArray));
reasons = new ArrayList<String>(Arrays.asList(reasonArray)); reasons = new ArrayList<String>(Arrays.asList(reasonArray));
wips = new ArrayList<String>(Arrays.asList(manageArray)); wips = new ArrayList<String>(Arrays.asList(manageArray));
products = new ArrayList<String>(Arrays.asList(grades));
} }
}catch(Exception e) { }catch(Exception e) {
@ -913,7 +970,7 @@ public class CreateEcnController extends KFXPanelController {
@FXML @FXML
void addRows(ActionEvent event) { void addRows(ActionEvent event) {
for(int i=0;i<5;i++) { 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<EcnBean> data = FXCollections.observableArrayList(ecnBeans); ObservableList<EcnBean> data = FXCollections.observableArrayList(ecnBeans);
tableView.getItems().clear(); tableView.getItems().clear();
@ -925,7 +982,7 @@ public class CreateEcnController extends KFXPanelController {
*/ */
@FXML @FXML
void addRow(ActionEvent event) { void addRow(ActionEvent event) {
ecnBeans.add(new EcnBean(ecnBeans.size()+1,reasons,wips)); ecnBeans.add(new EcnBean(ecnBeans.size()+1, reasons, wips, products));
ObservableList<EcnBean> data = FXCollections.observableArrayList(ecnBeans); ObservableList<EcnBean> data = FXCollections.observableArrayList(ecnBeans);
tableView.getItems().clear(); tableView.getItems().clear();
tableView.setItems(data); tableView.setItems(data);

@ -1,6 +1,7 @@
package com.chint.plm.createEcn; package com.chint.plm.createEcn;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import javafx.beans.property.SimpleIntegerProperty; import javafx.beans.property.SimpleIntegerProperty;
@ -16,12 +17,19 @@ public class EcnBean {
protected TextArea poiNum; //处数 protected TextArea poiNum; //处数
protected TextArea overChange;//更改前 protected TextArea overChange;//更改前
protected TextArea overVersion;//更改前版本 protected TextArea overVersion;//更改前版本
protected TextArea afterChange;//更改后
protected TextArea afterVersion;//更改后版本 protected TextArea afterVersion;//更改后版本
protected TextArea afterChange;//更改后
protected ComboBox<String> productSz = new ComboBox<String>();//特性等级
protected ComboBox<String> changeReason = new ComboBox<String>();//更改原因 protected ComboBox<String> changeReason = new ComboBox<String>();//更改原因
protected ComboBox<String> wipTreat = new ComboBox<String>();;//在制品处理 protected ComboBox<String> wipTreat = new ComboBox<String>();//在制品处理
EcnBean(int ind, List<String> reasons, List<String> wips) { public ComboBox<String> getProductSz() {
return productSz;
}
public void setProductSz(String productSz) {
this.productSz.getSelectionModel().select(productSz);
}
EcnBean(int ind, List<String> reasons, List<String> wips,List<String> products) {
num = new SimpleIntegerProperty(ind); num = new SimpleIntegerProperty(ind);
drawNo = new TextArea(); //ComboBoxTextArea drawNo = new TextArea(); //ComboBoxTextArea
drawNo.setPrefSize(200, 40); drawNo.setPrefSize(200, 40);
@ -44,10 +52,13 @@ public class EcnBean {
afterVersion = new TextArea(); //ComboBoxTextArea afterVersion = new TextArea(); //ComboBoxTextArea
afterVersion.setPrefSize(200, 40); afterVersion.setPrefSize(200, 40);
wipTreat.getItems().addAll(wips); wipTreat.getItems().addAll(wips);
productSz.getItems().addAll(products);
productSz.getSelectionModel().selectFirst();
changeReason.getItems().addAll(reasons); changeReason.getItems().addAll(reasons);
} }
EcnBean(int ind, List<String> reasons, List<String> wips, String drawNoVal, String markVal, EcnBean(int ind, List<String> reasons, List<String> 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); num = new SimpleIntegerProperty(ind);
drawNo = new TextArea(); //ComboBoxTextArea drawNo = new TextArea(); //ComboBoxTextArea
drawNo.setPrefSize(200, 40); drawNo.setPrefSize(200, 40);
@ -67,6 +78,7 @@ public class EcnBean {
overVersion = new TextArea(); //ComboBoxTextArea overVersion = new TextArea(); //ComboBoxTextArea
overVersion.setPrefSize(200, 40); overVersion.setPrefSize(200, 40);
overVersion.setText(szRevisionBef);
afterChange = new TextArea(); //ComboBoxTextArea afterChange = new TextArea(); //ComboBoxTextArea
afterChange.setPrefSize(200, 40); afterChange.setPrefSize(200, 40);
@ -74,6 +86,8 @@ public class EcnBean {
afterVersion = new TextArea(); //ComboBoxTextArea afterVersion = new TextArea(); //ComboBoxTextArea
afterVersion.setPrefSize(200, 40); afterVersion.setPrefSize(200, 40);
afterVersion.setText(szRevisionAft);
wipTreat.getItems().addAll(wips); wipTreat.getItems().addAll(wips);
wipTreat.getSelectionModel().select(processType); wipTreat.getSelectionModel().select(processType);
changeReason.getItems().addAll(reasons); changeReason.getItems().addAll(reasons);

@ -83,7 +83,7 @@ public class RefTableBean {
// this.user = user; // this.user = user;
// this.compDate = compDate; // this.compDate = compDate;
// this.mark = mark; // this.mark = mark;
shYes.setSelected(true); shNo.setSelected(true);
shYes.selectedProperty().addListener(new ChangeListener<Boolean>() { shYes.selectedProperty().addListener(new ChangeListener<Boolean>() {

@ -52,7 +52,9 @@ public class RelateEcnBean {
this.prodModel = prodModel; this.prodModel = prodModel;
this.applicant = applicant; this.applicant = applicant;
this.status = status; this.status = status;
//变更单号
String applyNo = read.getString("APPLYNO"); String applyNo = read.getString("APPLYNO");
//七种责任人
String designPal = read.getString("DESIGNPRINCIPAL"); String designPal = read.getString("DESIGNPRINCIPAL");
String techPal = read.getString("TECHPRINCIPAL"); String techPal = read.getString("TECHPRINCIPAL");
String quantityPal = read.getString("QUALITYPRINCIPAL"); String quantityPal = read.getString("QUALITYPRINCIPAL");
@ -60,6 +62,8 @@ public class RelateEcnBean {
String purchasePal = read.getString("PURCHASEYPRINCIPAL"); String purchasePal = read.getString("PURCHASEYPRINCIPAL");
String customPal = read.getString("CUSTOMNOTICEPRINCIPAL");//FINAPRICEPRINCIPAL String customPal = read.getString("CUSTOMNOTICEPRINCIPAL");//FINAPRICEPRINCIPAL
String finaPal = read.getString("FINAPRICEPRINCIPAL"); String finaPal = read.getString("FINAPRICEPRINCIPAL");
String docuName = read.getString("DOCUNAME"); //文件代号及名称
String designFile = read.getString("DESIGNFILE");//获取行动内容
linkBtn.setOnAction(e -> { linkBtn.setOnAction(e -> {
try { try {
BomToSapUtil.browse2(link); BomToSapUtil.browse2(link);
@ -92,6 +96,7 @@ public class RelateEcnBean {
for(int i=27;i<28;i++) { for(int i=27;i<28;i++) {
items.get(i).setUser(finaPal); items.get(i).setUser(finaPal);
} }
controller.markText.setText(docuName);
controller.relateEcnText.setText(applyNo); controller.relateEcnText.setText(applyNo);
controller.refTable.setItems(items); controller.refTable.setItems(items);
} catch (Exception e1) { } catch (Exception e1) {

Loading…
Cancel
Save