Browse Source

电子发票(航空运输电子客票行程单)类型不做处理

yaoyu 3 months ago
parent
commit
0987f0ad65

+ 1 - 9
pu/pu/src/client/nc/pub/filesystem/newui/ThOCRAction.java

@@ -236,15 +236,7 @@ public class ThOCRAction extends AbstractNCAction{
 				}else {
 					amount = price.getString("amount");//无税金额
 					ttax = extobj.getString("ttax");//税额
-				}
-				
-				if("电子发票(航空运输电子客票行程单)".equals(cname)) {
-					UFDouble fuel_surcharge = new UFDouble(extobj.get("fuel_surcharge") == null ? 0.00 : Double.valueOf(extobj.get("fuel_surcharge").toString()),2);//燃油附加费
-					UFDouble caac_development_fund =  new UFDouble(extobj.get("caac_development_fund") == null ? 0.00 : Double.valueOf(extobj.get("caac_development_fund").toString()),2);//民航发展基金
-					UFDouble norigmnys = new UFDouble(amount ==  null ? 0.00 : Double.parseDouble(amount),2);//发票无税金额
-					norigmnys = norigmnys.add(fuel_surcharge).add(caac_development_fund);
-					amount = norigmnys.toString();
-				}
+				}				
 				JSONObject buyer = comm_info.getJSONObject("buyer");
 				String mnecode = buyer.getString("tcode");//购买方纳税人识别号
 				String name2 = buyer.getString("company");//购买方公司名称

+ 0 - 8
pu/pu/src/client/nc/ui/pubapp/uif2app/actions/MultiSelectDialog.java

@@ -223,14 +223,6 @@ public class MultiSelectDialog extends UIDialog {
 					UFDouble norigtaxmnys = new UFDouble(total ==  null ? 0.00 : Double.parseDouble(total),2);//发票价税合计
 					UFDouble norigmnys = new UFDouble(amount ==  null ? 0.00 : Double.parseDouble(amount),2);//发票无税金额
 					UFDouble ntaxs = new UFDouble(ttax ==  null ? 0.00 : Double.parseDouble(ttax),2);//发票税额
-					
-					if("电子发票(航空运输电子客票行程单)".equals(cname)) {
-						UFDouble fuel_surcharge = new UFDouble(extobj.get("fuel_surcharge") == null ? 0.00 : Double.valueOf(extobj.get("fuel_surcharge").toString()),2);//燃油附加费
-						UFDouble caac_development_fund =  new UFDouble(extobj.get("caac_development_fund") == null ? 0.00 : Double.valueOf(extobj.get("caac_development_fund").toString()),2);//民航发展基金
-						norigmnys = norigmnys.add(fuel_surcharge).add(caac_development_fund);
-						amount = norigmnys.toString();
-					}
-					
 					DefdocVO defvo = new DefdocVO();
 					long l = System.currentTimeMillis();
 					//发票可以重复获取,避免自定义档案保存保存,加上时间戳保证唯一