Browse Source

中英文括号处理

yaoyu 1 năm trước cách đây
mục cha
commit
79721af0d9

+ 1 - 0
pu/pu/src/client/nc/ui/pu/m25/editor/card/afteredit/body/OcrRefaft.java

@@ -171,6 +171,7 @@ public class OcrRefaft implements ICardBodyAfterEditEventListener{
 				String name = (String) iuap.executeQuery(sql, new ColumnProcessor());
 				// 使用正则表达式替换中文括号为英文括号
 				name = name.replaceAll("(", "(").replaceAll(")", ")");
+				vbdef15 = vbdef15.replaceAll("(", "(").replaceAll(")", ")");
 				if(vbdef15.equals(name)) {
 					//一致
 					arg0.getBillCardPanel().setBodyValueAt("一致", arg0.getRow(), "vbdef14");

+ 1 - 0
pu/pu/src/client/nc/ui/pu/m25/editor/card/afteredit/header/Supplier.java

@@ -131,6 +131,7 @@ public class Supplier implements ICardHeadTailAfterEditEventListener {
     			String name = (String) iuap.executeQuery(sql, new ColumnProcessor());
     			// 使用正则表达式替换中文括号为英文括号
 				name = name.replaceAll("(", "(").replaceAll(")", ")");
+				vbdef15 = vbdef15.replaceAll("(", "(").replaceAll(")", ")");
     			if(vbdef15.equals(name)) {
     				//一致
     				event.getBillCardPanel().setBodyValueAt("一致", i, "vbdef14");

+ 2 - 1
pu/pu/src/private/nc/bs/ic/base/InvoiceAfterCheckEvent.java

@@ -123,7 +123,8 @@ public class InvoiceAfterCheckEvent implements IRule<InvoiceVO>{
 								String orgname = (String) bs.executeQuery(sql1, new ColumnProcessor());
 								// 使用正则表达式替换中文括号为英文括号
 								String orgnames = orgname.replaceAll("(", "(").replaceAll(")", ")");
-								if(!orgnames.equals(defdocVO.getName2())) {
+								String name2 = defdocVO.getName2().replaceAll("(", "(").replaceAll(")", ")");
+								if(!orgnames.equals(name2)) {
 									ExceptionUtils.wrappBusinessException("发票抬头与财务组织不一致,请修改财务组织!");
 								}
 								//比较纳税人识别号