多币种修改

ic/ic/src/private/nc/pubimpl/so/m30/pfxx/M30PfxxPlugin.java

@@ -112,6 +112,8 @@ public class M30PfxxPlugin extends AbstractSOPfxxPlugin {
  					bodyvo.setNtaxprice(nqtorigtaxprice);//主本币含税单价
  					bodyvo.setNpiece(nqtorigprice);//主本币无税单价
  					bodyvo.setNtaxnetprice(nqtorigtaxprice);//主本币含税净价
+ 					bodyvo.setNorigtaxnetprice(nqtorigtaxprice);//主含税净价
+					bodyvo.setNorignetprice(nqtorigprice);//主无税净价
  					bodyvo.setNnetprice(nqtorigprice);//主本币无税净价
  					bodyvo.setNmny(norigmny);//本币无税金额
  					bodyvo.setNtaxmny(norigtaxmny);//本币价税合计
@@ -128,36 +130,24 @@ public class M30PfxxPlugin extends AbstractSOPfxxPlugin {
  				UFDouble foreignAmount=	currRateUtil.getAmountByOpp(corigcurrencyid,
  						ccurrencyid, norigprice, foreignrate, headvo.getDbilldate());
  				bodyvo.setNtaxprice(foreignAmount);//主本币含税单价
- 				
  				UFDouble ngprice=currRateUtil.getAmountByOpp(corigcurrencyid,
  						ccurrencyid, bodyvo.getNorigprice()/*主原币无税单价*/, foreignrate, headvo.getDbilldate());
- 				
  				bodyvo.setNprice(ngprice); // 主本币无税单价
- 				
  				bodyvo.setNqtprice(ngprice); //报价本币无税单价
- 				
  				bodyvo.setNqttaxprice(foreignAmount);//报价本币含税单价
- 				
- 				
  				UFDouble nmny=currRateUtil.getAmountByOpp(corigcurrencyid,
  						ccurrencyid, bodyvo.getNorigmny()/*原币无税金额*/, foreignrate, headvo.getDbilldate());
- 				
  				bodyvo.setNmny(nmny);//本币无税金额  
- 				
  				UFDouble ntaxmny=currRateUtil.getAmountByOpp(corigcurrencyid,
  						ccurrencyid, bodyvo.getNorigtaxmny()/*原币价税合计*/, foreignrate, headvo.getDbilldate());
- 				
  				bodyvo.setNtaxmny(ntaxmny);//ntaxmny 本币价税合计
- 				
  				bodyvo.setNcaltaxmny(nmny);//计税金额
  				bodyvo.setNqtnetprice(ngprice);//本币无税净价
  				bodyvo.setNnetprice(ngprice);//主本币无税净价
- 				
+ 				bodyvo.setNorignetprice(ngprice);//主无税净价
  				bodyvo.setNqttaxnetprice(foreignAmount);//本币含税净价
  				bodyvo.setNtaxnetprice(foreignAmount);//主本币含税净价
-
- 				
-
+ 				bodyvo.setNorigtaxnetprice(foreignAmount);//主含税净价
  				bodyvo.setNtax(ntaxmny.sub(nmny));//税额=价税合计-无税金额
  			}
  			

ic/ic/src/private/nc/pubimpl/so/m4331/pfxx/M4331PfxxPlugin.java

@@ -64,6 +64,8 @@ public class M4331PfxxPlugin extends nc.pubimpl.so.pfxx.AbstractSOPfxxPlugin {
 					bodyvo.setNtaxprice(nqtorigtaxprice);//主本币含税单价
 					bodyvo.setNpiece(nqtorigprice);//主本币无税单价
 					bodyvo.setNtaxnetprice(nqtorigtaxprice);//主本币含税净价
+					bodyvo.setNorigtaxnetprice(nqtorigtaxprice);//主含税净价
+					bodyvo.setNorignetprice(nqtorigprice);//主无税净价
 					bodyvo.setNnetprice(nqtorigprice);//主本币无税净价
 					bodyvo.setNmny(norigmny);//本币无税金额
 					bodyvo.setNtaxmny(norigtaxmny);//本币价税合计
@@ -91,8 +93,10 @@ public class M4331PfxxPlugin extends nc.pubimpl.so.pfxx.AbstractSOPfxxPlugin {
 				bodyvo.setNcaltaxmny(nmny);//计税金额
 				bodyvo.setNqtnetprice(ngprice);//本币无税净价
 				bodyvo.setNnetprice(ngprice);//主本币无税净价
+				bodyvo.setNorignetprice(ngprice);//主无税净价
 				bodyvo.setNqttaxnetprice(foreignAmount);//本币含税净价
 				bodyvo.setNtaxnetprice(foreignAmount);//主本币含税净价
+				bodyvo.setNorigtaxnetprice(foreignAmount);//主含税净价
 				bodyvo.setNtax(ntaxmny.sub(nmny));//税额=价税合计-无税金额
 		} catch (BusinessException e) {
 			// TODO 自动生成的 catch 块

ic/ic/src/public/nc/bs/ic/general/plugins/GeneralDefdocPlugin.java

@@ -116,6 +116,8 @@ public class GeneralDefdocPlugin extends AbstractPfxxPlugin {
     					bodyvo.setNtaxprice(nqtorigtaxprice);//主本币含税单价
     					bodyvo.setNpiece(nqtorigprice);//主本币无税单价
     					bodyvo.setNtaxnetprice(nqtorigtaxprice);//主本币含税净价
+    					bodyvo.setNorigtaxnetprice(nqtorigtaxprice);//主含税净价
+    					bodyvo.setNorignetprice(nqtorigprice);//主无税净价
     					bodyvo.setNnetprice(nqtorigprice);//主本币无税净价
     					bodyvo.setNmny(norigmny);//本币无税金额
     					bodyvo.setNtaxmny(norigtaxmny);//本币价税合计
@@ -143,8 +145,10 @@ public class GeneralDefdocPlugin extends AbstractPfxxPlugin {
     				bodyvo.setNcaltaxmny(nmny);//计税金额
     				bodyvo.setNqtnetprice(ngprice);//本币无税净价
     				bodyvo.setNnetprice(ngprice);//主本币无税净价
+    				bodyvo.setNorignetprice(ngprice);//主无税净价
     				bodyvo.setNqttaxnetprice(foreignAmount);//本币含税净价
     				bodyvo.setNtaxnetprice(foreignAmount);//主本币含税净价
+    				bodyvo.setNorigtaxnetprice(foreignAmount);//主含税净价
     				bodyvo.setNtax(ntaxmny.sub(nmny));//税额=价税合计-无税金额
     		} catch (BusinessException e) {
     			// TODO 自动生成的 catch 块