From 29488495c053d822f794dcb0a1956d2113f1763f Mon Sep 17 00:00:00 2001 From: "lidy@connor.net.cn" Date: Tue, 4 Jun 2024 10:56:44 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=A0=A1=E5=AF=B9=E8=A1=A8=E5=A1=AB?= =?UTF-8?q?=E5=86=99=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=8A=A0null=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91=202=E3=80=81=E5=88=9B=E5=BB=BA/?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=9B=B4=E6=94=B9=E9=80=9A=E7=9F=A5=E5=8D=95?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=A0=87=E8=AE=B0=E5=88=97=E5=A4=84=E7=90=86?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/chint/plm/createEcn/CreateEcnController.java | 5 +++-- .../src/com/connor/chint/JDBPackage/MySceneController.java | 4 +++- 2 files changed, 6 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 a28c001..5c844aa 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 @@ -477,8 +477,9 @@ public class CreateEcnController extends KFXPanelController { cell.setCellValue(i + 1);//序号 cell = POIUtil.getCell(row, 1); cell.setCellValue(changeDrawingNo[i]);//图样代号（文件编号） - cell = POIUtil.getCell(row, 3); - cell.setCellValue(sign[i]);//标记 + cell = POIUtil.getCell(row, 3);//21，改为通过公式取值 +// cell.setCellValue(sign[i]); + cell.setCellFormula("IFERROR(CONCATENATE(VLOOKUP(\"" + sign[i] + "\",标记符!A:B,2,0)),\"\")");//标记 cell = POIUtil.getCell(row, 4); cell.setCellValue(partition[i]);//处数 cell = POIUtil.getCell(row, 5); diff --git a/com.connor.chint.wuhan/src/com/connor/chint/JDBPackage/MySceneController.java b/com.connor.chint.wuhan/src/com/connor/chint/JDBPackage/MySceneController.java index 03931c7..0e8023b 100644 --- a/com.connor.chint.wuhan/src/com/connor/chint/JDBPackage/MySceneController.java +++ b/com.connor.chint.wuhan/src/com/connor/chint/JDBPackage/MySceneController.java @@ -394,13 +394,15 @@ public class MySceneController extends KFXPanelController { if(sjz instanceof ComboBox) { ComboBox box = (ComboBox)sjz; valSjz = box.getEditor().getText(); + System.out.println("ComboBox:" + valSjz); }else if(sjz instanceof TextArea){ TextArea area = (TextArea)sjz; valSjz = area.getText(); + System.out.println("TextArea:" + valSjz); }else { valSjz = "NA"; } - if(valSjz.isEmpty()) { + if(valSjz == null || valSjz.isEmpty()) { flag = true; // break; cbff.append("第").append(i+1).append("行");