Merge pull request '1、校对表填写功能增加null处理逻辑' (#16) from ldy into main

Reviewed-on: http://yunpi.tpddns.cn:3000/ZT_CODE/chint_wuhan/pulls/16

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 = POIUtil.getCell(row, 3);//21，改为通过公式取值
-                cell.setCellValue(sign[i]);//񈬀
+//                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);

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<String> box = (ComboBox<String>)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("ĐĐ");