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

Merge pull request '1、创建编辑更改通知单增加空值处理逻辑' (#33) from ldy into main

Browse Source 
Reviewed-on: http://yunpi.tpddns.cn:3000/ZT_CODE/chint_wuhan/pulls/33
李冬阳 6 months ago
parent 64c15090ce 6451df480e
commit 851bb624f3
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File

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

@ -972,6 +972,8 @@ public class CreateEcnController extends KFXPanelController {
refTableBean.setCompDate(read.getString("pctime"));
refTableBean.setMark(read.getString("remark"));
String principal = read.getString("principal");
if(principal == null)
principal = "";
String[] split = principal.split(";");
if (split.length >= 2) {
refTableBean.setUserUUid(split[1]);

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

@ -407,6 +407,7 @@ public class KjController {
continue;
bomBean.bomLine.add(wlLine2, false).setProperty("bl_occ_zt2_wlsource", "瓊품헝뭔데");
bomBean.bomLine.save();
bomBean.bomLine.unlock();//unlock
}else if(object_name.equals("") && objName.contains("배멀係죕")) {
if(bomBeans.contains(new BomBean("배멀튬"))) {
BomBean bomBean = bomBeans.get(bomBeans.indexOf(new BomBean("배멀튬")));
@ -414,6 +415,7 @@ public class KjController {
continue;
bomBean.bomLine.add(wlLine2, false).setProperty("bl_occ_zt2_wlsource", "瓊품헝뭔데");
bomBean.bomLine.save();
bomBean.bomLine.unlock();//unlock
}
}else {
if(checkSource(newTopline, wlLine2))
@ -422,6 +424,7 @@ public class KjController {
add.setProperty("bl_occ_zt2_wlsource", "瓊품헝뭔데");
System.out.println(add);
newTopline.save();
newTopline.unlock();//unlock
}
}
}else {
@ -434,6 +437,7 @@ public class KjController {
continue;
bomBean.bomLine.add(wlLine, false).setProperty("bl_occ_zt2_wlsource", "瓊품헝뭔데");
bomBean.bomLine.save();
bomBean.bomLine.unlock();//unlock
}else if(object_name.equals("") && objName.equals("배멀係죕")) {
if(bomBeans.contains(new BomBean("배멀튬"))) {
BomBean bomBean = bomBeans.get(bomBeans.indexOf(new BomBean("배멀튬")));
@ -441,6 +445,7 @@ public class KjController {
continue;
bomBean.bomLine.add(wlLine, false).setProperty("bl_occ_zt2_wlsource", "瓊품헝뭔데");
bomBean.bomLine.save();
bomBean.bomLine.unlock();//unlock
}
}
else {
@ -450,6 +455,7 @@ public class KjController {
add.setProperty("bl_occ_zt2_wlsource", "瓊품헝뭔데");
System.out.println(add);
newTopline.save();
newTopline.unlock();//unlock
}
}
}
@ -472,7 +478,8 @@ public class KjController {
}
@SuppressWarnings("deprecation")
private void updateKjBom(Map<String, TCComponentItem> findMap, Map<String, ExpandPSData[]> bomLineTreeNodeSOA, String uid) throws Exception {
private void updateKjBom(Map<String, TCComponentItem> findMap, Map<String, ExpandPSData[]> bomLineTreeNodeSOA,
String uid) throws Exception {
// Auto-generated method stub
ExpandPSData[] expandPSDatas = bomLineTreeNodeSOA.get(uid);
for(ExpandPSData expandPSData : expandPSDatas) {
@ -487,9 +494,16 @@ public class KjController {
TCComponentItemRevision lastRev = tcItem.getLatestItemRevision();
bomLine.replace(tcItem, lastRev, null);
bomLine.save();
// bomLine.unlock();
bomLine.unlock();
}
TCComponent[] views = itemRevOfBOMLine.getRelatedComponents("view");
if(views.length > 0) {//lidy20241213 优化“BOM 模块接收的标记无效。”报错
views[0].lock();
bomLine.lock();
updateKjBom(findMap, bomLineTreeNodeSOA, bomLine.getUid());
bomLine.unlock();
views[0].unlock();
}
updateKjBom(findMap, bomLineTreeNodeSOA, bomLine.getUid());//ExpandPSData[] expandPSDatas2 = bomLineTreeNodeSOA.get(bomLine.getUid());
}
}
@SuppressWarnings("deprecation")

Write Preview
Loading…
Cancel
Save