赋值逻辑修改

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

@@ -109,17 +109,23 @@ public class M30PfxxPlugin extends 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.setNtaxprice(nqtorigtaxprice);//主本币含税单价
  					bodyvo.setNpiece(nqtorigprice);//主本币无税单价
- 					bodyvo.setNtaxnetprice(nqtorigtaxprice);//主本币含税净价
+// 					bodyvo.setNtaxnetprice(nqtorigtaxprice);//主本币含税净价
  					bodyvo.setNnetprice(nqtorigprice);//主本币无税净价
  					bodyvo.setNmny(norigmny);//本币无税金额
  					bodyvo.setNtaxmny(norigtaxmny);//本币价税合计
  					bodyvo.setNqtorigtaxnetprc(nqtorigtaxprice);//含税净价
 					bodyvo.setNqtorignetprice(nqtorigprice);//无税净价
+					
+					
+					bodyvo.setNorignetprice(bodyvo.getNorigprice());//本无税净价
+					bodyvo.setNorigtaxnetprice(bodyvo.getNorigtaxprice());//主含税净价
+					bodyvo.setNtaxnetprice(bodyvo.getNorigtaxprice());//主本币含税净价
+					bodyvo.setNtaxprice(bodyvo.getNorigtaxprice());//主本币含税单价
  					continue;
  				}
  				
@@ -131,7 +137,7 @@ public class M30PfxxPlugin extends AbstractSOPfxxPlugin {
  				UFDouble norigprice=bodyvo.getNorigtaxprice();//主原币含税单价
  				UFDouble foreignAmount=	currRateUtil.getAmountByOpp(corigcurrencyid,
  						ccurrencyid, norigprice, foreignrate, headvo.getDbilldate());
- 				bodyvo.setNtaxprice(foreignAmount);//主本币含税单价
+// 				bodyvo.setNtaxprice(foreignAmount);//主本币含税单价
  				
  				UFDouble ngprice=currRateUtil.getAmountByOpp(corigcurrencyid,
  						ccurrencyid, bodyvo.getNorigprice()/*主原币无税单价*/, foreignrate, headvo.getDbilldate());
@@ -153,17 +159,24 @@ public class M30PfxxPlugin extends AbstractSOPfxxPlugin {
  				
  				bodyvo.setNtaxmny(ntaxmny);//ntaxmny 本币价税合计
  				
- 				bodyvo.setNcaltaxmny(nmny);//计税金额
+ 				bodyvo.setNcaltaxmny(ntaxmny);//计税金额
  				bodyvo.setNqtnetprice(ngprice);//本币无税净价
  				bodyvo.setNnetprice(ngprice);//主本币无税净价
  				
  				bodyvo.setNqttaxnetprice(foreignAmount);//本币含税净价
- 				bodyvo.setNorigtaxnetprice(foreignAmount);//本含税净价
-				bodyvo.setNorignetprice(ngprice);//本无税净价
- 				bodyvo.setNtaxnetprice(foreignAmount);//主本币含税净价
+// 				bodyvo.setNorigtaxnetprice(foreignAmount);//本含税净价
+//				bodyvo.setNorignetprice(ngprice);//本无税净价
+// 				bodyvo.setNtaxnetprice(foreignAmount);//主本币含税净价
  				bodyvo.setNtax(ntaxmny.sub(nmny));//税额=价税合计-无税金额
  				bodyvo.setNqtorigtaxnetprc(foreignAmount);//含税净价
 				bodyvo.setNqtorignetprice(ngprice);//无税净价
+				
+				
+				
+				bodyvo.setNorignetprice(bodyvo.getNorigprice());//本无税净价
+				bodyvo.setNorigtaxnetprice(bodyvo.getNorigtaxprice());//主含税净价
+				bodyvo.setNtaxnetprice(bodyvo.getNorigtaxprice());//主本币含税净价
+				bodyvo.setNtaxprice(bodyvo.getNorigtaxprice());//主本币含税单价
  			}
  			
  		} catch (BusinessException e1) {

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

@@ -60,12 +60,12 @@ 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.setNtaxprice(nqtorigtaxprice);//主本币含税单价
 					bodyvo.setNpiece(nqtorigprice);//主本币无税单价
-					bodyvo.setNtaxnetprice(nqtorigtaxprice);//主本币含税净价
+//					bodyvo.setNtaxnetprice(nqtorigtaxprice);//主本币含税净价
 					bodyvo.setNnetprice(nqtorigprice);//主本币无税净价
 					bodyvo.setNmny(norigmny);//本币无税金额
 					bodyvo.setNtaxmny(norigtaxmny);//本币价税合计
@@ -80,7 +80,7 @@ public class M4331PfxxPlugin extends nc.pubimpl.so.pfxx.AbstractSOPfxxPlugin {
 				UFDouble norigprice=bodyvo.getNorigtaxprice();//主原币含税单价
 				UFDouble foreignAmount=	currRateUtil.getAmountByOpp(corigcurrencyid,
 						ccurrencyid, norigprice, foreignrate, headvo.getDbilldate());
-				bodyvo.setNtaxprice(foreignAmount);//主本币含税单价
+//				bodyvo.setNtaxprice(foreignAmount);//主本币含税单价
 				UFDouble ngprice=currRateUtil.getAmountByOpp(corigcurrencyid,
 						ccurrencyid, bodyvo.getNorigprice()/*主原币无税单价*/, foreignrate, headvo.getDbilldate());
 				bodyvo.setNprice(ngprice); // 主本币无税单价
@@ -92,16 +92,22 @@ public class M4331PfxxPlugin extends nc.pubimpl.so.pfxx.AbstractSOPfxxPlugin {
 				UFDouble ntaxmny=currRateUtil.getAmountByOpp(corigcurrencyid,
 						ccurrencyid, bodyvo.getNorigtaxmny()/*原币价税合计*/, foreignrate, headvo.getDbilldate());
 				bodyvo.setNtaxmny(ntaxmny);//ntaxmny 本币价税合计
-				bodyvo.setNcaltaxmny(nmny);//计税金额
+				bodyvo.setNcaltaxmny(ntaxmny);//计税金额
 				bodyvo.setNqtnetprice(ngprice);//本币无税净价
 				bodyvo.setNnetprice(ngprice);//主本币无税净价
-				bodyvo.setNorigtaxnetprice(foreignAmount);//主含税净价
-				bodyvo.setNorignetprice(ngprice);//主无税净价
-				bodyvo.setNqttaxnetprice(foreignAmount);//本币含税净价
+//				bodyvo.setNorigtaxnetprice(foreignAmount);//主含税净价
+//				bodyvo.setNorignetprice(ngprice);//主无税净价
+//				bodyvo.setNqttaxnetprice(foreignAmount);//本币含税净价
 				bodyvo.setNtaxnetprice(foreignAmount);//主本币含税净价
 				bodyvo.setNtax(ntaxmny.sub(nmny));//税额=价税合计-无税金额
 				bodyvo.setNqtorigtaxnetprc(foreignAmount);//含税净价
 				bodyvo.setNqtorignetprice(ngprice);//无税净价
+				
+				
+				bodyvo.setNorignetprice(bodyvo.getNorigprice());//本无税净价
+				bodyvo.setNorigtaxnetprice(bodyvo.getNorigtaxprice());//主含税净价
+				bodyvo.setNtaxnetprice(bodyvo.getNorigtaxprice());//主本币含税净价
+				bodyvo.setNtaxprice(bodyvo.getNorigtaxprice());//主本币含税单价
 		} catch (BusinessException e) {
 			// TODO 自动生成的 catch 块
 			ExceptionUtils.wrappBusinessException(e.getMessage());

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

@@ -112,12 +112,12 @@ public class GeneralDefdocPlugin extends AbstractPfxxPlugin {
     					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.setNtaxprice(nqtorigtaxprice);//主本币含税单价
     					bodyvo.setNpiece(nqtorigprice);//主本币无税单价
-    					bodyvo.setNtaxnetprice(nqtorigtaxprice);//主本币含税净价
+//    					bodyvo.setNtaxnetprice(nqtorigtaxprice);//主本币含税净价
     					bodyvo.setNorigtaxnetprice(nqtorigtaxprice);//主含税净价
     					bodyvo.setNorignetprice(nqtorigprice);//主无税净价
     					bodyvo.setNnetprice(nqtorigprice);//主本币无税净价
@@ -134,7 +134,7 @@ public class GeneralDefdocPlugin extends AbstractPfxxPlugin {
     				UFDouble norigprice=bodyvo.getNorigtaxprice();//主原币含税单价
     				UFDouble foreignAmount=	currRateUtil.getAmountByOpp(corigcurrencyid,
     						ccurrencyid, norigprice, foreignrate, headvo.getDbilldate());
-    				bodyvo.setNtaxprice(foreignAmount);//主本币含税单价
+//    				bodyvo.setNtaxprice(foreignAmount);//主本币含税单价
     				UFDouble ngprice=currRateUtil.getAmountByOpp(corigcurrencyid,
     						ccurrencyid, bodyvo.getNorigprice()/*主原币无税单价*/, foreignrate, headvo.getDbilldate());
     				bodyvo.setNprice(ngprice); // 主本币无税单价
@@ -146,18 +146,24 @@ public class GeneralDefdocPlugin extends AbstractPfxxPlugin {
     				UFDouble ntaxmny=currRateUtil.getAmountByOpp(corigcurrencyid,
     						ccurrencyid, bodyvo.getNorigtaxmny()/*原币价税合计*/, foreignrate, headvo.getDbilldate());
     				bodyvo.setNtaxmny(ntaxmny);//ntaxmny 本币价税合计
-    				bodyvo.setNcaltaxmny(nmny);//计税金额
+    				bodyvo.setNcaltaxmny(ntaxmny);//计税金额
     				bodyvo.setNqtnetprice(ngprice);//本币无税净价
     				bodyvo.setNnetprice(ngprice);//主本币无税净价
     				bodyvo.setNorignetprice(ngprice);//主无税净价
     				bodyvo.setNqttaxnetprice(foreignAmount);//本币含税净价
-    				bodyvo.setNorigtaxnetprice(foreignAmount);//本含税净价
-    				bodyvo.setNorignetprice(ngprice);//本无税净价
-    				bodyvo.setNtaxnetprice(foreignAmount);//主本币含税净价
+//    				bodyvo.setNorigtaxnetprice(foreignAmount);//本含税净价
+//    				bodyvo.setNorignetprice(ngprice);//本无税净价
+//    				bodyvo.setNtaxnetprice(foreignAmount);//主本币含税净价
     				bodyvo.setNorigtaxnetprice(foreignAmount);//主含税净价
     				bodyvo.setNtax(ntaxmny.sub(nmny));//税额=价税合计-无税金额
     				bodyvo.setNqtorigtaxnetprc(foreignAmount);//含税净价
     				bodyvo.setNqtorignetprice(ngprice);//无税净价
+    				
+    				
+    				bodyvo.setNorignetprice(bodyvo.getNorigprice());//本无税净价
+    				bodyvo.setNorigtaxnetprice(bodyvo.getNorigtaxprice());//主含税净价
+    				bodyvo.setNtaxnetprice(bodyvo.getNorigtaxprice());//主本币含税净价
+    				bodyvo.setNtaxprice(bodyvo.getNorigtaxprice());//主本币含税单价
     		} catch (BusinessException e) {
     			// TODO 自动生成的 catch 块
     			ExceptionUtils.wrappBusinessException(e.getMessage());