diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/DetailsController.class b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/DetailsController.class index e229bf3..bf91ebc 100644 Binary files a/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/DetailsController.class and b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/DetailsController.class differ diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/applyMatnr/Test.class b/com.connor.chint.wuhan/bin/com/chint/plm/applyMatnr/Test.class index 7265f07..4903047 100644 Binary files a/com.connor.chint.wuhan/bin/com/chint/plm/applyMatnr/Test.class and b/com.connor.chint.wuhan/bin/com/chint/plm/applyMatnr/Test.class differ 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 d0b15ec..bb06ce4 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 54bde88..554ea03 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/RefTableBean$1.class b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/RefTableBean$1.class index 97c5db9..7a4101b 100644 Binary files a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/RefTableBean$1.class and b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/RefTableBean$1.class differ diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/RefTableBean$2.class b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/RefTableBean$2.class index bad967e..47e8f63 100644 Binary files a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/RefTableBean$2.class and b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/RefTableBean$2.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 15ac212..6946eea 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/Util.class b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/Util.class index c84f519..11fd432 100644 Binary files a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/Util.class and b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/Util.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/chint/sap2/util/BomToSapUtil.class b/com.connor.chint.wuhan/bin/com/connor/chint/sap2/util/BomToSapUtil.class index fbf2055..c184465 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/chint/sap2/util/BomToSapUtil.class and b/com.connor.chint.wuhan/bin/com/connor/chint/sap2/util/BomToSapUtil.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/chint/yunpi/command/BomSendSapKjController.class b/com.connor.chint.wuhan/bin/com/connor/chint/yunpi/command/BomSendSapKjController.class index a18cf48..8f0cc0f 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/chint/yunpi/command/BomSendSapKjController.class and b/com.connor.chint.wuhan/bin/com/connor/chint/yunpi/command/BomSendSapKjController.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/ButtonCellEditor.class b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/ButtonCellEditor.class index 6ac76db..70da761 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/ButtonCellEditor.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/ButtonCellEditor.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/ButtonCellRenderer.class b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/ButtonCellRenderer.class index de2d8f1..5f2561b 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/ButtonCellRenderer.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/ButtonCellRenderer.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/CostListManagementHandler$1.class b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/CostListManagementHandler$1.class index 6665ce2..60f7df4 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/CostListManagementHandler$1.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/CostListManagementHandler$1.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/CostListManagementHandler.class b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/CostListManagementHandler.class index cd654b5..5237e5e 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/CostListManagementHandler.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/CostListManagementHandler.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/NewJFrame$1$1.class b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/NewJFrame$1$1.class index 2c1dad5..da5c5be 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/NewJFrame$1$1.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/NewJFrame$1$1.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/NewJFrame$1.class b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/NewJFrame$1.class index dd4ab10..65511bd 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/NewJFrame$1.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/NewJFrame$1.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/NewJFrame$2.class b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/NewJFrame$2.class index 0499569..7feb383 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/NewJFrame$2.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/NewJFrame$2.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/NewJFrame.class b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/NewJFrame.class index a4209e4..c9e4f37 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/NewJFrame.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/NewJFrame.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/QueryQuotationFram$1.class b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/QueryQuotationFram$1.class index 14ad8b4..0d0bcdb 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/QueryQuotationFram$1.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/QueryQuotationFram$1.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/QueryQuotationFram.class b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/QueryQuotationFram.class index ea1c77b..d265d4a 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/QueryQuotationFram.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/QueryQuotationFram.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/pojo/Cusquotation.class b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/pojo/Cusquotation.class index 7a22175..aa3f258 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/pojo/Cusquotation.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/pojo/Cusquotation.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/pojo/GzxqBean.class b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/pojo/GzxqBean.class index 629933e..3180b45 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/pojo/GzxqBean.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/pojo/GzxqBean.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/pojo/Quotation.class b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/pojo/Quotation.class index 1363a88..5cdc17e 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/pojo/Quotation.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/pojo/Quotation.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/pojo/QuotationMX.class b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/pojo/QuotationMX.class index 71a76f8..b75f470 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/pojo/QuotationMX.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CostListManagement/pojo/QuotationMX.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/EditingCell.class b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/EditingCell.class index 37c0131..b3d615b 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/EditingCell.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/EditingCell.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/EditingCellOR.class b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/EditingCellOR.class index 3a4c658..fc55156 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/EditingCellOR.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/EditingCellOR.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/JDBFrame.class b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/JDBFrame.class index 886b806..f7b615a 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/JDBFrame.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/JDBFrame.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/JDBfxPanel.class b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/JDBfxPanel.class index 46dfbcc..190195a 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/JDBfxPanel.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/JDBfxPanel.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/KFXPanel$1.class b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/KFXPanel$1.class index d364664..df5a87e 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/KFXPanel$1.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/KFXPanel$1.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/KFXPanel.class b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/KFXPanel.class index b251968..2e05a10 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/KFXPanel.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/KFXPanel.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/KFXPanelController$1.class b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/KFXPanelController$1.class index 0906848..1f14941 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/KFXPanelController$1.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/KFXPanelController$1.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/KFXPanelController.class b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/KFXPanelController.class index 4fa2df7..c2431bc 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/KFXPanelController.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/KFXPanelController.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/MainApp.class b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/MainApp.class index 8f7fd40..f992f58 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/MainApp.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/MainApp.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/MyController$1.class b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/MyController$1.class index 6acf544..a376156 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/MyController$1.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/MyController$1.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/MyController$2.class b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/MyController$2.class index 6737ae3..ab472b2 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/MyController$2.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/MyController$2.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/MyController.class b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/MyController.class index 448be6e..836518a 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/MyController.class and b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/MyController.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/SendGXToMOM/Process.class b/com.connor.chint.wuhan/bin/com/connor/plm/SendGXToMOM/Process.class index 180ac2e..15f2b96 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/SendGXToMOM/Process.class and b/com.connor.chint.wuhan/bin/com/connor/plm/SendGXToMOM/Process.class differ diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/SendGXToMOM/sendGXToMOMOperation.class b/com.connor.chint.wuhan/bin/com/connor/plm/SendGXToMOM/sendGXToMOMOperation.class index ec0170a..e2fd5da 100644 Binary files a/com.connor.chint.wuhan/bin/com/connor/plm/SendGXToMOM/sendGXToMOMOperation.class and b/com.connor.chint.wuhan/bin/com/connor/plm/SendGXToMOM/sendGXToMOMOperation.class differ diff --git a/com.connor.chint.wuhan/plugin.xml b/com.connor.chint.wuhan/plugin.xml index b4fe6ab..d4ca55a 100644 --- a/com.connor.chint.wuhan/plugin.xml +++ b/com.connor.chint.wuhan/plugin.xml @@ -25,14 +25,16 @@ - - + + + + @@ -65,6 +67,28 @@ + + @@ -452,6 +476,27 @@ + + + + + + + + + + + + + + + + + + diff --git a/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/DetailsController.java b/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/DetailsController.java index 6d1c2ce..2867ce6 100644 --- a/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/DetailsController.java +++ b/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/DetailsController.java @@ -221,7 +221,7 @@ public class DetailsController { Util.setCellValue(row1.getCell(7), 7, row1, detailsBean.getCreateTime());// BOMʱ Util.setCellValue(row1.getCell(8), 8, row1, detailsBean.getReturnDate());// BOMͬ Util.setCellValue(row1.getCell(9), 9, row1, detailsBean.getReturnTime());// BOMͬʱ - Util.setCellValue(row1.getCell(9), 9, row1, detailsBean.getPlmStatus());// PLM״̬ + Util.setCellValue(row1.getCell(10), 10, row1, detailsBean.getPlmStatus());// PLM״̬ } } // diff --git a/com.connor.chint.wuhan/src/com/chint/plm/applyMatnr/Test.java b/com.connor.chint.wuhan/src/com/chint/plm/applyMatnr/Test.java index 21b41b9..d177fb1 100644 --- a/com.connor.chint.wuhan/src/com/chint/plm/applyMatnr/Test.java +++ b/com.connor.chint.wuhan/src/com/chint/plm/applyMatnr/Test.java @@ -94,10 +94,10 @@ public class Test { return val; } public static void main(String[] args) { - String drawNo = "1ZDB510000X"; - String pattern = "1ZDB5*0000X"; - System.out.println( pattern.replaceAll("\\*", ".*")); - System.out.println(Pattern.matches(pattern.replaceAll("\\*", ".*"), drawNo)); +// String drawNo = "1ZDB510000X"; +// String pattern = "1ZDB5*0000X"; +// System.out.println( pattern.replaceAll("\\*", ".*")); +// System.out.println(Pattern.matches(pattern.replaceAll("\\*", ".*"), drawNo)); // Object[] options = {"",""}; // String ma = "^1ZDB5.*\\d{1,}1000X.*"; // @@ -114,11 +114,15 @@ public class Test { // System.out.println(builder.toString()); // String substring = builder.substring(0, builder.length() - 1); // System.out.println(substring.toString()); - String itemId = "1ZDB51000X-A-00089"; - String substring = itemId.substring(0,itemId.lastIndexOf("-")); - String substring2 = itemId.substring(itemId.lastIndexOf("-")+1); - System.out.println(substring); - System.out.println(substring2); + String itemId = "1ZDB51000X"; + String itemId2 = "1ZDB51000X-01-000024"; + String itemId3 = "1ZDB51000X-000024"; + System.out.println(Pattern.matches(itemId+"-\\d{6}$", itemId3)); + System.out.println(Pattern.matches(itemId+"-\\d{6}$", itemId2)); +// String substring = itemId.substring(0,itemId.lastIndexOf("-")); +// String substring2 = itemId.substring(itemId.lastIndexOf("-")+1); +// System.out.println(substring); +// System.out.println(substring2); // List> bb = new ArrayList>(); // List b = new ArrayList(); // b.add("1"); 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 fc59eec..b5fc47f 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 @@ -18,6 +18,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.commons.httpclient.util.URIUtil; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; @@ -57,6 +58,7 @@ import com.teamcenter.rac.kernel.TCSession; import com.teamcenter.rac.util.MessageBox; import edu.emory.mathcs.backport.java.util.Arrays; +import javafx.application.Platform; import javafx.beans.property.SimpleIntegerProperty; import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; @@ -282,49 +284,49 @@ public class CreateEcnController extends KFXPanelController { RefTableBean refTableBean = items.get(i); String result = refTableBean.getShYes().isSelected() ? "" : ""; SqlUtil.write(new String[] { endCode, "1", refTableBean.getDepart(), String.valueOf(i + 1), - refTableBean.getMessage(), result, refTableBean.getUserVal(), + refTableBean.getMessage(), result, refTableBean.getUserVal() + ";" + refTableBean.getUserUUid(), refTableBean.getCompDate().getText(), refTableBean.getMark().getText() }, insertSql); } for (int i = 7; i < 11; i++) { RefTableBean refTableBean = items.get(i); String result = refTableBean.getShYes().isSelected() ? "" : ""; SqlUtil.write(new String[] { endCode, "2", refTableBean.getDepart(), String.valueOf(i - 6), - refTableBean.getMessage(), result, refTableBean.getUserVal(), + refTableBean.getMessage(), result, refTableBean.getUserVal() + ";" + refTableBean.getUserUUid(), refTableBean.getCompDate().getText(), refTableBean.getMark().getText() }, insertSql); } for (int i = 11; i < 15; i++) { RefTableBean refTableBean = items.get(i); String result = refTableBean.getShYes().isSelected() ? "" : ""; SqlUtil.write(new String[] { endCode, "3", refTableBean.getDepart(), String.valueOf(i - 10), - refTableBean.getMessage(), result, refTableBean.getUserVal(), + refTableBean.getMessage(), result, refTableBean.getUserVal() + ";" + refTableBean.getUserUUid(), refTableBean.getCompDate().getText(), refTableBean.getMark().getText() }, insertSql); } for (int i = 15; i < 19; i++) { RefTableBean refTableBean = items.get(i); String result = refTableBean.getShYes().isSelected() ? "" : ""; SqlUtil.write(new String[] { endCode, "4", refTableBean.getDepart(), String.valueOf(i - 14), - refTableBean.getMessage(), result, refTableBean.getUserVal(), + refTableBean.getMessage(), result, refTableBean.getUserVal() + ";" + refTableBean.getUserUUid(), refTableBean.getCompDate().getText(), refTableBean.getMark().getText() }, insertSql); } for (int i = 19; i < 24; i++) { RefTableBean refTableBean = items.get(i); String result = refTableBean.getShYes().isSelected() ? "" : ""; SqlUtil.write(new String[] { endCode, "5", refTableBean.getDepart(), String.valueOf(i - 18), - refTableBean.getMessage(), result, refTableBean.getUserVal(), + refTableBean.getMessage(), result, refTableBean.getUserVal() + ";" + refTableBean.getUserUUid(), refTableBean.getCompDate().getText(), refTableBean.getMark().getText() }, insertSql); } for (int i = 24; i < 27; i++) { RefTableBean refTableBean = items.get(i); String result = refTableBean.getShYes().isSelected() ? "" : ""; SqlUtil.write(new String[] { endCode, "6", refTableBean.getDepart(), String.valueOf(i - 23), - refTableBean.getMessage(), result, refTableBean.getUserVal(), + refTableBean.getMessage(), result, refTableBean.getUserVal() + ";" + refTableBean.getUserUUid(), refTableBean.getCompDate().getText(), refTableBean.getMark().getText() }, insertSql); } for (int i = 27; i < 28; i++) { RefTableBean refTableBean = items.get(i); String result = refTableBean.getShYes().isSelected() ? "" : ""; SqlUtil.write(new String[] { endCode, "7", refTableBean.getDepart(), String.valueOf(i - 26), - refTableBean.getMessage(), result, refTableBean.getUserVal(), + refTableBean.getMessage(), result, refTableBean.getUserVal() + ";" + refTableBean.getUserUUid(), refTableBean.getCompDate().getText(), refTableBean.getMark().getText() }, insertSql); } } catch (Exception e) { @@ -662,9 +664,13 @@ public class CreateEcnController extends KFXPanelController { RefTableBean refTableBean = items.get(i); refTableBean.setCompDate(read.getString("pctime")); refTableBean.setMark(read.getString("remark")); - refTableBean.setUserPane(read.getString("principal")); + String principal = read.getString("principal"); + String[] split = principal.split(";"); + if (split.length >= 2) { + refTableBean.setUserUUid(split[1]); + } + refTableBean.setUserPane(split[0]); String result = read.getString("result"); - System.out.println("refTableSql==>" + read.getString("principal")); if (result.equals("")) { refTableBean.setShNo(true); } @@ -927,14 +933,13 @@ public class CreateEcnController extends KFXPanelController { private void addAssignAction(List refTableBeans) { // TODO Auto-generated method stub Button userBtn = refTableBeans.get(0).getUserBtn(); - String userVal = refTableBeans.get(0).getUserVal(); - assignBtnAction(userBtn, 0, 7, userVal, refTableBeans); - assignBtnAction(refTableBeans.get(7).getUserBtn(), 7, 11, refTableBeans.get(7).getUserVal(), refTableBeans); - assignBtnAction(refTableBeans.get(11).getUserBtn(), 11, 15, refTableBeans.get(11).getUserVal(), refTableBeans); - assignBtnAction(refTableBeans.get(15).getUserBtn(), 15, 19, refTableBeans.get(15).getUserVal(), refTableBeans); - assignBtnAction(refTableBeans.get(19).getUserBtn(), 19, 24, refTableBeans.get(19).getUserVal(), refTableBeans); - assignBtnAction(refTableBeans.get(24).getUserBtn(), 24, 27, refTableBeans.get(24).getUserVal(), refTableBeans); - assignBtnAction(refTableBeans.get(27).getUserBtn(), 27, 28, refTableBeans.get(27).getUserVal(), refTableBeans); + assignBtnAction(userBtn, 0, 7, refTableBeans); + assignBtnAction(refTableBeans.get(7).getUserBtn(), 7, 11, refTableBeans); + assignBtnAction(refTableBeans.get(11).getUserBtn(), 11, 15, refTableBeans); + assignBtnAction(refTableBeans.get(15).getUserBtn(), 15, 19, refTableBeans); + assignBtnAction(refTableBeans.get(19).getUserBtn(), 19, 24, refTableBeans); + assignBtnAction(refTableBeans.get(24).getUserBtn(), 24, 27, refTableBeans); + assignBtnAction(refTableBeans.get(27).getUserBtn(), 27, 28, refTableBeans); } /** @@ -945,14 +950,24 @@ public class CreateEcnController extends KFXPanelController { * @param refTableBeans * @function */ - private void assignBtnAction(Button userBtn, int start, int end, String userVal, List refTableBeans) { + private void assignBtnAction(Button userBtn, int start, int end, List refTableBeans) { // TODO Auto-generated method stub userBtn.setOnAction(e -> { try { - Map userItemMap = getUserItemOA(userVal); - for (int i = start; i < end; i++) { - refTableBeans.get(i).setUserPane(userItemMap.keySet().iterator().next()); - } + String userVal = refTableBeans.get(start).getUserVal(); + String encodeQuery = URIUtil.encodeQuery(userVal); + System.out.println("setOnAction" + encodeQuery); + Map userItemMap = getUserItemOA(encodeQuery); + Platform.runLater(() -> { + for (int i = start; i < end; i++) { + String next = userItemMap.keySet().iterator().next(); + refTableBeans.get(i).setUserUUid(userItemMap.get(next)); + refTableBeans.get(i).setUserPane(userVal); + } + System.out.println("setOnAction" + encodeQuery); + refTable.refresh(); + }); + } catch (Exception e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -970,19 +985,20 @@ public class CreateEcnController extends KFXPanelController { OkHttpClient client = new OkHttpClient(); Map emailMap = new HashMap<>(); MediaType mediaType = MediaType.parse("application/x-www-form-urlencoded"); - RequestBody body = RequestBody.create(mediaType, "Name=" + name + "&Email="); + RequestBody body = RequestBody.create(mediaType, "Email=&Name=" + name); Request request = new Request.Builder() .url("http://10.207.0.245:8012/Portal/Webservices/EH/EH_Q_BPM_Two_Service.asmx/GetUserItems") .method("POST", body).addHeader("Content-Type", "application/x-www-form-urlencoded").build(); Response response = client.newCall(request).execute(); String string = response.body().string(); + System.out.println("xml==>" + string); Document document = DocumentHelper.parseText(string); Element rootElement = document.getRootElement(); String type = rootElement.elementText("TYPE"); String message = rootElement.elementText("MESSAGE"); if (type.equals("S")) { List elements = rootElement.elements("items"); - + for (Element element : elements) { Element userItemCs = element.element("EH_HR_UserItems_CS"); String email = userItemCs.elementText("Email"); 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 205a060..5656019 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 @@ -22,7 +22,13 @@ public class RefTableBean { protected Object userPane; private TextField userText; private Button userBtn; - + private String userUUid; //¼OAشûUUID + public String getUserUUid() { + return userUUid; + } + public void setUserUUid(String userUUid) { + this.userUUid = userUUid; + } public Button getUserBtn() { return userBtn; } @@ -41,6 +47,7 @@ public class RefTableBean { SimpleStringProperty userProp = (SimpleStringProperty) userPane; return userProp.get(); } + System.out.println("userText.getText()===>"+userText.getText()); return userText.getText(); } public void setUserPane(String val) { 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 aa8c309..d89311c 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 @@ -34,6 +34,11 @@ import com.teamcenter.rac.kernel.TCSession; import com.teamcenter.rac.util.MessageBox; public class Util { + public static final String ZT_PROP_PBOM = "zt2_ifpbom"; + public static final String ZT_VAL_PBOM = "P"; + 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 Connection connect(Connection conn, TCSession session) { String[] database = session.getPreferenceService().getStringValues("database_tc"); String JdbcDriverClass = "oracle.jdbc.driver.OracleDriver"; @@ -56,7 +61,23 @@ public class Util { return conn; } - + /** + * @param string + * @return Unicode + * @function תUnicode + */ + public static String unicodeEncode(String string) { + char[] utfBytes = string.toCharArray(); + String unicodeBytes = ""; + for (int i = 0; i < utfBytes.length; i++) { + String hexB = Integer.toHexString(utfBytes[i]); + if (hexB.length() <= 2) { + hexB = "00" + hexB; + } + unicodeBytes = unicodeBytes + "\\u" + hexB; + } + return unicodeBytes; + } /** * * @param session diff --git a/com.connor.chint.wuhan/src/com/connor/chint/sap2/util/BomToSapUtil.java b/com.connor.chint.wuhan/src/com/connor/chint/sap2/util/BomToSapUtil.java index dac16e7..c8e287d 100644 --- a/com.connor.chint.wuhan/src/com/connor/chint/sap2/util/BomToSapUtil.java +++ b/com.connor.chint.wuhan/src/com/connor/chint/sap2/util/BomToSapUtil.java @@ -22,104 +22,116 @@ import com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSData //import io.minio.MinioClient; public class BomToSapUtil { - - - //BOMȫչ, Mapص BOMеUIDͶӦ - public static Map getBomLineTreeNodeSOA(TCComponentBOMLine bomLine) { + + // BOMȫչ, Mapص BOMеUIDͶӦ + public static Map getBomLineTreeNodeSOA(TCComponentBOMLine bomLine) { // List bomLineNodes = list; - - //ԤBOMӶmapItemRev map - Map bomLineMap = new HashMap(); - try { - TCComponentItemRevision object = bomLine.getItemRevision(); - String object_type = object.getType(); + + // ԤBOMӶmapItemRev map + Map bomLineMap = new HashMap(); + try { + TCComponentItemRevision object = bomLine.getItemRevision(); + String object_type = object.getType(); // if (!sparePartRevision.equals(object_type)) { - // SOAչBOM - com.teamcenter.services.rac.cad._2007_01.StructureManagement structureService = com.teamcenter.services.rac.cad.StructureManagementService.getService(RACUIUtil.getTCSession()); - com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsInfo levelInfo = new com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsInfo(); - com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsPref levelPref = new com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsPref(); - levelInfo.parentBomLines = new TCComponentBOMLine[] {bomLine}; //붥BOMLine - levelInfo.excludeFilter="None"; - levelPref.expItemRev = false; - levelPref.info = new com.teamcenter.services.rac.cad._2007_01.StructureManagement.RelationAndTypesFilter[0]; - //ʹ·չBOM - com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsResponse levelResp = structureService.expandPSAllLevels(levelInfo, levelPref); - if (levelResp.output.length > 0){ - //BOMuidӶԹϵ - for (ExpandPSAllLevelsOutput data : levelResp.output) { - ExpandPSData[] children = data.children; - TCComponentBOMLine parentBomLine = (TCComponentBOMLine) data.parent.bomLine; - bomLineMap.put(parentBomLine.getUid(), children); - } - } - } catch (Exception e) { - e.printStackTrace(); - } - return bomLineMap; - } - public static List listBoms(TCComponentBOMLine bomLine) { + // SOAչBOM + com.teamcenter.services.rac.cad._2007_01.StructureManagement structureService = com.teamcenter.services.rac.cad.StructureManagementService + .getService(RACUIUtil.getTCSession()); + com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsInfo levelInfo = new com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsInfo(); + com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsPref levelPref = new com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsPref(); + levelInfo.parentBomLines = new TCComponentBOMLine[] { bomLine }; // 붥BOMLine + levelInfo.excludeFilter = "None"; + levelPref.expItemRev = false; + levelPref.info = new com.teamcenter.services.rac.cad._2007_01.StructureManagement.RelationAndTypesFilter[0]; + // ʹ·չBOM + com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsResponse levelResp = structureService + .expandPSAllLevels(levelInfo, levelPref); + if (levelResp.output.length > 0) { + // BOMuidӶԹϵ + for (ExpandPSAllLevelsOutput data : levelResp.output) { + ExpandPSData[] children = data.children; + TCComponentBOMLine parentBomLine = (TCComponentBOMLine) data.parent.bomLine; + bomLineMap.put(parentBomLine.getUid(), children); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + return bomLineMap; + } + + public static List listBoms(TCComponentBOMLine bomLine) { // List bomLineNodes = list; - - //ԤBOMӶmapItemRev map - List listBoms = new ArrayList<>(); - try { - TCComponentItemRevision object = bomLine.getItemRevision(); - String object_type = object.getType(); - com.teamcenter.services.rac.cad._2007_01.StructureManagement structureService = com.teamcenter.services.rac.cad.StructureManagementService.getService(RACUIUtil.getTCSession()); - com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsInfo levelInfo = new com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsInfo(); - com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsPref levelPref = new com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsPref(); - levelInfo.parentBomLines = new TCComponentBOMLine[] {bomLine}; //붥BOMLine - levelInfo.excludeFilter="None"; - levelPref.expItemRev = false; - levelPref.info = new com.teamcenter.services.rac.cad._2007_01.StructureManagement.RelationAndTypesFilter[0]; - //ʹ·չBOM - com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsResponse levelResp = structureService.expandPSAllLevels(levelInfo, levelPref); - if (levelResp.output.length > 0){ - //BOMuidӶԹϵ - for (ExpandPSAllLevelsOutput data : levelResp.output) { - TCComponentBOMLine parentBomLine = (TCComponentBOMLine) data.parent.bomLine; - listBoms.add(parentBomLine); - } - } - } catch (Exception e) { - e.printStackTrace(); - } - return listBoms; - } - public static List getBomLineTreeNodeSOA2(TCComponentBOMLine bomLine) { + + // ԤBOMӶmapItemRev map + List listBoms = new ArrayList<>(); + try { + TCComponentItemRevision object = bomLine.getItemRevision(); + String object_type = object.getType(); + com.teamcenter.services.rac.cad._2007_01.StructureManagement structureService = com.teamcenter.services.rac.cad.StructureManagementService + .getService(RACUIUtil.getTCSession()); + com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsInfo levelInfo = new com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsInfo(); + com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsPref levelPref = new com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsPref(); + levelInfo.parentBomLines = new TCComponentBOMLine[] { bomLine }; // 붥BOMLine + levelInfo.excludeFilter = "None"; + levelPref.expItemRev = false; + levelPref.info = new com.teamcenter.services.rac.cad._2007_01.StructureManagement.RelationAndTypesFilter[0]; + // ʹ·չBOM + com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsResponse levelResp = structureService + .expandPSAllLevels(levelInfo, levelPref); + if (levelResp.output.length > 0) { + // BOMuidӶԹϵ + for (ExpandPSAllLevelsOutput data : levelResp.output) { + TCComponentBOMLine parentBomLine = (TCComponentBOMLine) data.parent.bomLine; + listBoms.add(parentBomLine); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + return listBoms; + } + + /** + * @param bomLine + * @return BOMм + * @function BOM + */ + public static List getBomLineTreeNodeSOA2(TCComponentBOMLine bomLine) { // List bomLineNodes = list; - - //ԤBOMӶmapItemRev map - List bomLineMap = new ArrayList(); - Map bomLineItemRevMap = new HashMap(); - try { - TCComponentItemRevision object = bomLine.getItemRevision(); - String object_type = object.getType(); + + // ԤBOMӶmapItemRev map + List bomLineMap = new ArrayList(); + Map bomLineItemRevMap = new HashMap(); + try { + TCComponentItemRevision object = bomLine.getItemRevision(); + String object_type = object.getType(); // if (!sparePartRevision.equals(object_type)) { - // SOAչBOM - com.teamcenter.services.rac.cad._2007_01.StructureManagement structureService = com.teamcenter.services.rac.cad.StructureManagementService.getService(RACUIUtil.getTCSession()); - com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsInfo levelInfo = new com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsInfo(); - com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsPref levelPref = new com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsPref(); - levelInfo.parentBomLines = new TCComponentBOMLine[] {bomLine}; //붥BOMLine - levelInfo.excludeFilter="None"; - levelPref.expItemRev = false; - levelPref.info = new com.teamcenter.services.rac.cad._2007_01.StructureManagement.RelationAndTypesFilter[0]; - //ʹ·չBOM - com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsResponse levelResp = structureService.expandPSAllLevels(levelInfo, levelPref); - if (levelResp.output.length > 0){ - //BOMuidӶԹϵ - for (ExpandPSAllLevelsOutput data : levelResp.output) { - ExpandPSData[] children = data.children; - for(ExpandPSData child:children) { - TCComponentItemRevision itemRevOfBOMLine = child.itemRevOfBOMLine; - if(!bomLineMap.contains(itemRevOfBOMLine)) { - bomLineMap.add(itemRevOfBOMLine); - } - } + // SOAչBOM + com.teamcenter.services.rac.cad._2007_01.StructureManagement structureService = com.teamcenter.services.rac.cad.StructureManagementService + .getService(RACUIUtil.getTCSession()); + com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsInfo levelInfo = new com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsInfo(); + com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsPref levelPref = new com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsPref(); + levelInfo.parentBomLines = new TCComponentBOMLine[] { bomLine }; // 붥BOMLine + levelInfo.excludeFilter = "None"; + levelPref.expItemRev = false; + levelPref.info = new com.teamcenter.services.rac.cad._2007_01.StructureManagement.RelationAndTypesFilter[0]; + // ʹ·չBOM + com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSAllLevelsResponse levelResp = structureService + .expandPSAllLevels(levelInfo, levelPref); + if (levelResp.output.length > 0) { + // BOMuidӶԹϵ + for (ExpandPSAllLevelsOutput data : levelResp.output) { + ExpandPSData[] children = data.children; + for (ExpandPSData child : children) { + TCComponentItemRevision itemRevOfBOMLine = child.itemRevOfBOMLine; + if (!bomLineMap.contains(itemRevOfBOMLine)) { + bomLineMap.add(itemRevOfBOMLine); + } + } // TCComponentBOMLine parentBomLine = (TCComponentBOMLine) data.parent.bomLine; // bomLineMap.put(parentBomLine.getUid(), children); - } - //BOMLineӦİ汾󹹽uidmap + } + // BOMLineӦİ汾󹹽uidmap // for(int i=0;i