From 79d21d17b04521418a4737b042d123b670228ddf Mon Sep 17 00:00:00 2001 From: "lidy@connor.net.cn" Date: Wed, 11 Sep 2024 15:50:25 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=9B=B4=E6=94=B9=E5=8D=95=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=9B=B4=E6=94=B9=E7=B1=BB=E5=9E=8B=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC=E6=94=B9=E4=B8=BA=E2=80=9C=E4=B8=B4=E6=97=B6=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E2=80=9D=E7=89=B9=E6=80=A7=E7=AD=89=E7=BA=A7=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E4=B8=BA=E2=80=9CC=E2=80=9D=202=E3=80=81=E7=89=A9?= =?UTF-8?q?=E6=96=99=E7=BC=96=E7=A0=81=E6=89=B9=E9=87=8F=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=90=88=E5=B9=B6=203=E3=80=81=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=A1=86=E6=9E=B6BOM=E8=AF=BB=E5=8F=96CHINT=5FkjbomTe?= =?UTF-8?q?mp=5FFL=E9=A6=96=E9=80=89=E9=A1=B9=E6=A0=B9=E6=8D=AE=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E3=80=81=E5=9B=BE=E7=BA=B8=E6=AF=8D=E5=8F=B7=E6=89=BE?= =?UTF-8?q?=E5=88=B0=E5=AF=B9=E5=BA=94=E7=9A=84=E5=88=86=E7=B1=BB=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- com.connor.chint.wuhan/META-INF/MANIFEST.MF | 3 ++- .../plm/createEcn/CreateEcnController.java | 25 ++++++++++++++++--- .../src/com/chint/plm/createEcn/EcnBean.java | 2 +- .../chint/plm/createKjBom/KjController.java | 19 ++++++++++++-- 4 files changed, 41 insertions(+), 8 deletions(-) diff --git a/com.connor.chint.wuhan/META-INF/MANIFEST.MF b/com.connor.chint.wuhan/META-INF/MANIFEST.MF index 7ac9057..331c246 100644 --- a/com.connor.chint.wuhan/META-INF/MANIFEST.MF +++ b/com.connor.chint.wuhan/META-INF/MANIFEST.MF @@ -116,4 +116,5 @@ Bundle-ClassPath: ., poi/okhttp-2.7.4.jar, json_lib/jfxrt.jar, poi/Spire.Xls.jar -Export-Package: com.chint.plm.createbomdifference +Export-Package: com.chint.plm.applyMatnr, + com.chint.plm.createbomdifference 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 a12fcd5..3dc59b7 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 @@ -174,7 +174,7 @@ public class CreateEcnController extends KFXPanelController { // 实现单选功能 rb_formalChange.setToggleGroup(group); rb_tempChange.setToggleGroup(group); - rb_formalChange.setSelected(true); + rb_tempChange.setSelected(true);//更改类型默认值改为“临时更改” referencePane.setExpanded(true); ToggleGroup groupGc = new ToggleGroup(); // 变更类型组 @@ -1212,8 +1212,15 @@ public class CreateEcnController extends KFXPanelController { String encodeQuery = URIUtil.encodeQuery(userVal); System.out.println("setOnAction" + encodeQuery); String[][] datas = getUserItemOA(encodeQuery); - if(datas == null || datas.length == 0) + if(datas == null || datas.length == 0) { + //提示指派失败就清空这个值 + for (int i = start; i < end; i++) { + refTableBeans.get(i).setUserUUid(""); + refTableBeans.get(i).setUserPane(""); + } + refTable.refresh(); return; + } if(datas.length == 1) { Platform.runLater(() -> { for (int i = start; i < end; i++) { @@ -1245,6 +1252,12 @@ public class CreateEcnController extends KFXPanelController { // Auto-generated catch block e1.printStackTrace(); showAlertBox("指派失败:" + e1, "提示", AlertType.ERROR); + //提示指派失败就清空这个值 + for (int i = start; i < end; i++) { + refTableBeans.get(i).setUserUUid(""); + refTableBeans.get(i).setUserPane(""); + } + refTable.refresh(); } }); @@ -1445,7 +1458,9 @@ 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, products)); + EcnBean bean = new EcnBean(ecnBeans.size() + 1, reasons, wips, products); + bean.getProductSz().setValue("C");//特性等级默认为“C” + ecnBeans.add(bean); } ObservableList data = FXCollections.observableArrayList(ecnBeans); tableView.getItems().clear(); @@ -1458,7 +1473,9 @@ public class CreateEcnController extends KFXPanelController { */ @FXML void addRow(ActionEvent event) { - ecnBeans.add(new EcnBean(ecnBeans.size() + 1, reasons, wips, products)); + EcnBean bean = new EcnBean(ecnBeans.size() + 1, reasons, wips, products); + bean.getProductSz().setValue("C");//特性等级默认为“C” + ecnBeans.add(bean); 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 4d42c05..4c2f2bd 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 @@ -52,7 +52,7 @@ public class EcnBean { afterVersion.setPrefSize(200, 40); wipTreat.getItems().addAll(wips); productSz.getItems().addAll(products); - productSz.getSelectionModel().selectFirst(); +// productSz.getSelectionModel().selectFirst(); changeReason.getItems().addAll(reasons); } diff --git a/com.connor.chint.wuhan/src/com/chint/plm/createKjBom/KjController.java b/com.connor.chint.wuhan/src/com/chint/plm/createKjBom/KjController.java index 8ab86e8..5ffd4b2 100644 --- a/com.connor.chint.wuhan/src/com/chint/plm/createKjBom/KjController.java +++ b/com.connor.chint.wuhan/src/com/chint/plm/createKjBom/KjController.java @@ -43,6 +43,7 @@ import com.teamcenter.rac.kernel.TCComponentUser; import com.teamcenter.rac.kernel.TCPreferenceService; import com.teamcenter.rac.kernel.TCSession; import com.teamcenter.rac.kernel.TCTypeService; +import com.teamcenter.rac.util.MessageBox; import com.teamcenter.services.rac.cad._2007_01.StructureManagement.ExpandPSData; import com.teamcenter.services.rac.structuremanagement._2014_10.Structure.CloneStructureInputInfo; import com.teamcenter.services.rac.structuremanagement._2014_10.Structure.CloneStructureResponse; @@ -352,7 +353,21 @@ public class KjController { } } List propList = new ArrayList(); - sendToClass(find.getUid(), "ICM230101", objectToJson(propList)); + //TODO 读取CHINT_kjbomTemp_FL首选项根据组织、图纸母号找到对应的分类库 ICM230101 + TCComponentGroup group = session.getCurrentGroup(); + String groupId = group.getProperty(TCComponentGroup.PROP_GROUP_NAME); + String prefId = groupId + ":" + bean.kjbomId, classID = ""; + String[] prefs = ChintPreferenceUtil.getPreferences("CHINT_kjbomTemp_FL", session); + for(String pref : prefs) { + if(!pref.startsWith(prefId)) + continue; + classID = pref.substring(pref.indexOf("|") + 1); + } + System.out.println("classID==>" + classID); + if(classID.isEmpty()) { + MessageBox.post(prefId + "未找到对应分类库", "提示", MessageBox.WARNING); + }else + sendToClass(find.getUid(), "ICM230101", objectToJson(propList)); List listBoms = BomToSapUtil.listBoms(newTopline); //存放名称对应的BOM行 List bomBeans = new ArrayList<>(); @@ -368,7 +383,7 @@ public class KjController { TCComponentBOMLine qgdBomline = window2.setWindowTopLine(tqqgdItem, tqqgdItem.getLatestItemRevision(), null, null); AIFComponentContext[] children = qgdBomline.getChildren(); //遍历物料提前请购单 根据备注添加BOM到对应位置 - //TODO lidy20240710创建框架BOM中功能中的从提前请购组件BOM中抓取成分搭建进生成的框架BOM， + // lidy20240710创建框架BOM中功能中的从提前请购组件BOM中抓取成分搭建进生成的框架BOM， //需要将抓取的物料明细在复制后增加注释信息BOM行属性：数据来源：bl_occ_zt2_wlsource，写入“提前请购单” for(int i = 0; i < children.length; i++) { TCComponentBOMLine wlLine = (TCComponentBOMLine) children[i].getComponent();