From 6451df480e480ba4dc3aa651457851ea6569d6e1 Mon Sep 17 00:00:00 2001 From: "lidy@connor.net.cn" Date: Mon, 23 Dec 2024 14:07:48 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=88=9B=E5=BB=BA=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=80=9A=E7=9F=A5=E5=8D=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=A9=BA=E5=80=BC=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91=202?= =?UTF-8?q?=E3=80=81=E5=88=9B=E5=BB=BA=E6=A1=86=E6=9E=B6BOM=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=A7=A3=E9=94=81=E9=98=B2=E6=AD=A2=E9=94=81=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plm/createEcn/CreateEcnController.java | 2 ++ .../chint/plm/createKjBom/KjController.java | 20 ++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) 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 ee9add5..fc65d97 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 @@ -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]); 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 435d5c6..1d13bfc 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 @@ -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 findMap, Map bomLineTreeNodeSOA, String uid) throws Exception { + private void updateKjBom(Map findMap, Map 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")