含税净价无税净价

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

@@ -118,7 +118,8 @@ public class M30PfxxPlugin extends AbstractSOPfxxPlugin {
  					bodyvo.setNnetprice(nqtorigprice);//主本币无税净价
  					bodyvo.setNmny(norigmny);//本币无税金额
  					bodyvo.setNtaxmny(norigtaxmny);//本币价税合计
- 					
+ 					bodyvo.setNqtorigtaxnetprc(nqtorigtaxprice);//含税净价
+					bodyvo.setNqtorignetprice(nqtorigprice);//无税净价
  					continue;
  				}
  				
@@ -160,10 +161,9 @@ public class M30PfxxPlugin extends AbstractSOPfxxPlugin {
  				bodyvo.setNorigtaxnetprice(foreignAmount);//本含税净价
 				bodyvo.setNorignetprice(ngprice);//本无税净价
  				bodyvo.setNtaxnetprice(foreignAmount);//主本币含税净价
-
- 				
-
  				bodyvo.setNtax(ntaxmny.sub(nmny));//税额=价税合计-无税金额
+ 				bodyvo.setNqtorigtaxnetprc(foreignAmount);//含税净价
+				bodyvo.setNqtorignetprice(ngprice);//无税净价
  			}
  			
  		} catch (BusinessException e1) {

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

@@ -60,8 +60,8 @@ public class M4331PfxxPlugin extends nc.pubimpl.so.pfxx.AbstractSOPfxxPlugin {
 					bodyvo.setNqttaxprice(nqtorigtaxprice);//本币含税单价
 					bodyvo.setNqtprice(nqtorigprice);//本币无税单价
 					bodyvo.setNqttaxnetprice(nqtorigtaxprice);//本币含税净价
-					bodyvo.setNorigtaxnetprice(nqtorigtaxprice);//本含税净价
-					bodyvo.setNorignetprice(nqtorigprice);//本无税净价
+					bodyvo.setNorigtaxnetprice(nqtorigtaxprice);//主含税净价
+					bodyvo.setNorignetprice(nqtorigprice);//主无税净价
 					bodyvo.setNqtnetprice(nqtorigprice);//本币无税净价
 					bodyvo.setNtaxprice(nqtorigtaxprice);//主本币含税单价
 					bodyvo.setNpiece(nqtorigprice);//主本币无税单价
@@ -69,6 +69,8 @@ public class M4331PfxxPlugin extends nc.pubimpl.so.pfxx.AbstractSOPfxxPlugin {
 					bodyvo.setNnetprice(nqtorigprice);//主本币无税净价
 					bodyvo.setNmny(norigmny);//本币无税金额
 					bodyvo.setNtaxmny(norigtaxmny);//本币价税合计
+					bodyvo.setNqtorigtaxnetprc(nqtorigtaxprice);//含税净价
+					bodyvo.setNqtorignetprice(nqtorigprice);//无税净价
 					continue;
 				}
 				UFDouble foreignrate = currRateUtil.getRate(corigcurrencyid,/*原币*/
@@ -93,11 +95,13 @@ public class M4331PfxxPlugin extends nc.pubimpl.so.pfxx.AbstractSOPfxxPlugin {
 				bodyvo.setNcaltaxmny(nmny);//计税金额
 				bodyvo.setNqtnetprice(ngprice);//本币无税净价
 				bodyvo.setNnetprice(ngprice);//主本币无税净价
-				bodyvo.setNorigtaxnetprice(foreignAmount);//本含税净价
-				bodyvo.setNorignetprice(ngprice);//本无税净价
+				bodyvo.setNorigtaxnetprice(foreignAmount);//主含税净价
+				bodyvo.setNorignetprice(ngprice);//主无税净价
 				bodyvo.setNqttaxnetprice(foreignAmount);//本币含税净价
 				bodyvo.setNtaxnetprice(foreignAmount);//主本币含税净价
 				bodyvo.setNtax(ntaxmny.sub(nmny));//税额=价税合计-无税金额
+				bodyvo.setNqtorigtaxnetprc(foreignAmount);//含税净价
+				bodyvo.setNqtorignetprice(ngprice);//无税净价
 		} catch (BusinessException e) {
 			// TODO 自动生成的 catch 块
 			ExceptionUtils.wrappBusinessException(e.getMessage());

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

@@ -123,6 +123,8 @@ public class GeneralDefdocPlugin extends AbstractPfxxPlugin {
     					bodyvo.setNnetprice(nqtorigprice);//主本币无税净价
     					bodyvo.setNmny(norigmny);//本币无税金额
     					bodyvo.setNtaxmny(norigtaxmny);//本币价税合计
+    					bodyvo.setNqtorigtaxnetprc(nqtorigtaxprice);//含税净价
+    					bodyvo.setNqtorignetprice(nqtorigprice);//无税净价
     					continue;
     				}
     				UFDouble foreignrate = currRateUtil.getRate(corigcurrencyid,/*原币*/
@@ -154,6 +156,8 @@ public class GeneralDefdocPlugin extends AbstractPfxxPlugin {
     				bodyvo.setNtaxnetprice(foreignAmount);//主本币含税净价
     				bodyvo.setNorigtaxnetprice(foreignAmount);//主含税净价
     				bodyvo.setNtax(ntaxmny.sub(nmny));//税额=价税合计-无税金额
+    				bodyvo.setNqtorigtaxnetprc(foreignAmount);//含税净价
+    				bodyvo.setNqtorignetprice(ngprice);//无税净价
     		} catch (BusinessException e) {
     			// TODO 自动生成的 catch 块
     			ExceptionUtils.wrappBusinessException(e.getMessage());