Merge pull request '武汉生成更改差异文件功能报错修改' (#21) from ldy into main

Reviewed-on: http://yunpi.tpddns.cn:3000/ZT_CODE/chint_wuhan/pulls/21
main
李冬阳 11 months ago
commit dd24df7010

@ -9,13 +9,13 @@ import javafx.scene.control.TextField;
import javafx.scene.layout.FlowPane; import javafx.scene.layout.FlowPane;
public class RefTableBean { public class RefTableBean {
protected SimpleStringProperty depart;// 部门 private SimpleStringProperty depart;// 部门
protected SimpleStringProperty message; // 行动 private SimpleStringProperty message; // 行动
protected CheckBox shYes = new CheckBox();// 是 private CheckBox shYes = new CheckBox();// 是
protected CheckBox shNo = new CheckBox();// 否 private CheckBox shNo = new CheckBox();// 否
// protected TextField user = new TextField();// ÔðÈÎÈË // protected TextField user = new TextField();// ÔðÈÎÈË
protected TextField compDate = new TextField();// 更改后 private TextField compDate = new TextField();// 更改后
protected Object userPane; private Object userPane;
private TextField userText; private TextField userText;
private Button userBtn; private Button userBtn;
private String userUUid; //¼Ç¼OA»Ø´«µÄÓû§UUID private String userUUid; //¼Ç¼OA»Ø´«µÄÓû§UUID
@ -128,10 +128,9 @@ public class RefTableBean {
shNo.setSelected(true); shNo.setSelected(true);
shYes.selectedProperty().addListener(new ChangeListener<Boolean>() { shYes.selectedProperty().addListener(new ChangeListener<Boolean>() {
@Override @Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) { public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
// TODO Auto-generated method stub // Auto-generated method stub
// System.out.println("oldValue"+oldValue); // System.out.println("oldValue"+oldValue);
if (newValue) { if (newValue) {
shNo.setSelected(false); shNo.setSelected(false);
@ -139,10 +138,9 @@ public class RefTableBean {
} }
}); });
shNo.selectedProperty().addListener(new ChangeListener<Boolean>() { shNo.selectedProperty().addListener(new ChangeListener<Boolean>() {
@Override @Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) { public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
// TODO Auto-generated method stub // Auto-generated method stub
// System.out.println("oldValue"+oldValue); // System.out.println("oldValue"+oldValue);
if (newValue) { if (newValue) {
shYes.setSelected(false); shYes.setSelected(false);

@ -272,6 +272,8 @@ public class CreateBOMDifferenceDialogWh extends AbstractAIFDialog {
for (int i = 0, len = compares.size(); i < len; i++) { for (int i = 0, len = compares.size(); i < len; i++) {
System.out.println(i + "--" + compares.get(i)); System.out.println(i + "--" + compares.get(i));
tm_part.addRow(compares.get(i).getRowData(i + 1)); tm_part.addRow(compares.get(i).getRowData(i + 1));
//TODO
t_part.setValueAt("自动生成", i, HEADER.length - 1);
} }
pb.disposeDialog(); pb.disposeDialog();
} catch (Exception e) { } catch (Exception e) {
@ -829,14 +831,14 @@ public class CreateBOMDifferenceDialogWh extends AbstractAIFDialog {
* @param val * @param val
* @return * @return
*/ */
public static boolean isEmpty(Object val) { private static boolean isEmpty(Object val) {
return val == null || ("" + val).isEmpty(); return val == null || ("" + val).isEmpty();
} }
/** /**
* *
* *
*/ */
public static void refrashNo(JTable t_part) { private static void refrashNo(JTable t_part) {
for(int i = 0; i < t_part.getRowCount(); i++) { for(int i = 0; i < t_part.getRowCount(); i++) {
t_part.setValueAt(i + 1, i, 0); t_part.setValueAt(i + 1, i, 0);
} }

Loading…
Cancel
Save