ZT_CODE
/
chint_wuhan
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '1、更改单中的更改类型默认值改为“临时更改”特性等级默认为“C”' (#25) from ldy into main

Browse Source 
Reviewed-on: http://yunpi.tpddns.cn:3000/ZT_CODE/chint_wuhan/pulls/25
main
李冬阳 9 months ago
parent cc4da5d194 79d21d17b0
commit 45e3a05384
4 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File

3
com.connor.chint.wuhan/META-INF/MANIFEST.MF
Unescape View File

@ -115,4 +115,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

25
com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnController.java
Unescape View File

@ -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<EcnBean> 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<EcnBean> data = FXCollections.observableArrayList(ecnBeans);
tableView.getItems().clear();
tableView.setItems(data);

2
com.connor.chint.wuhan/src/com/chint/plm/createEcn/EcnBean.java
Unescape View File

@ -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);
}

19
com.connor.chint.wuhan/src/com/chint/plm/createKjBom/KjController.java
Unescape View File

@ -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<ClassProperty> propList = new ArrayList<ClassProperty>();
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<TCComponentBOMLine> listBoms = BomToSapUtil.listBoms(newTopline);
//存放名称对应的BOM行
List<BomBean> 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();

Write Preview
Loading…
Cancel
Save