Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
		
						commit
						3c544648ec
					
				| 
						 | 
				
			
			@ -65,18 +65,18 @@ public class EcContractFromPlugin extends AbstractBillPlugIn implements Plugin {
 | 
			
		|||
                this.getView().updateView();
 | 
			
		||||
            } else if (name.equals("zcgj_pjnhbhshte")) {
 | 
			
		||||
//                Object zcgjPjnhhshte = this.getModel().getValue("zcgj_pjnhbhshte");
 | 
			
		||||
                Object zcgjPjnhhshte = changeData.getNewValue();
 | 
			
		||||
                if (zcgjPjnhhshte != null) {
 | 
			
		||||
                    amount = new BigDecimal(zcgjPjnhhshte.toString());
 | 
			
		||||
                }
 | 
			
		||||
                ofamount = amount.multiply(pRate);
 | 
			
		||||
                rate = ofamount.subtract(amount);
 | 
			
		||||
//                this.getModel().setValue("zcgj_pjnhhshte", ofamount);
 | 
			
		||||
//                this.getModel().setValue("zcgj_pjnhse", rate);
 | 
			
		||||
                dataEntity.set("zcgj_pjnhbhshte", amount);
 | 
			
		||||
                dataEntity.set("zcgj_pjnhhshte", ofamount);
 | 
			
		||||
                dataEntity.set("zcgj_pjnhse", rate);
 | 
			
		||||
                this.getView().updateView();
 | 
			
		||||
//                Object zcgjPjnhhshte = changeData.getNewValue();
 | 
			
		||||
//                if (zcgjPjnhhshte != null) {
 | 
			
		||||
//                    amount = new BigDecimal(zcgjPjnhhshte.toString());
 | 
			
		||||
//                }
 | 
			
		||||
//                ofamount = amount.multiply(pRate);
 | 
			
		||||
//                rate = ofamount.subtract(amount);
 | 
			
		||||
////              this.getModel().setValue("zcgj_pjnhhshte", ofamount);
 | 
			
		||||
////                this.getModel().setValue("zcgj_pjnhse", rate);
 | 
			
		||||
//                dataEntity.set("zcgj_pjnhbhshte", amount);
 | 
			
		||||
//                dataEntity.set("zcgj_pjnhhshte", ofamount);
 | 
			
		||||
//                dataEntity.set("zcgj_pjnhse", rate);
 | 
			
		||||
//                this.getView().updateView();
 | 
			
		||||
            }else if (name.equals("zcgj_yjhshtsr")) {
 | 
			
		||||
                Object zcgjyjhshtsr = this.getModel().getValue("zcgj_yjhshtsr");
 | 
			
		||||
                if (zcgjyjhshtsr != null) {
 | 
			
		||||
| 
						 | 
				
			
			@ -130,15 +130,15 @@ public class EcContractFromPlugin extends AbstractBillPlugIn implements Plugin {
 | 
			
		|||
                dataEntity.set("zcgj_bnyjse", rate);
 | 
			
		||||
                this.getView().updateView();
 | 
			
		||||
            } else if (name.equals("zcgj_bnyjbhshte")) {
 | 
			
		||||
                Object zcgjbnyjhshte = this.getModel().getValue("zcgj_bnyjbhshte");
 | 
			
		||||
                if (zcgjbnyjhshte != null) {
 | 
			
		||||
                    amount = new BigDecimal(zcgjbnyjhshte.toString());
 | 
			
		||||
                }
 | 
			
		||||
                ofamount = amount.multiply(pRate);
 | 
			
		||||
                rate = ofamount.subtract(amount);
 | 
			
		||||
                dataEntity.set("zcgj_bnyjhshte", ofamount);
 | 
			
		||||
                dataEntity.set("zcgj_bnyjse", rate);
 | 
			
		||||
                this.getView().updateView();
 | 
			
		||||
//                Object zcgjbnyjhshte = this.getModel().getValue("zcgj_bnyjbhshte");
 | 
			
		||||
//                if (zcgjbnyjhshte != null) {
 | 
			
		||||
//                    amount = new BigDecimal(zcgjbnyjhshte.toString());
 | 
			
		||||
//                }
 | 
			
		||||
//                ofamount = amount.multiply(pRate);
 | 
			
		||||
//                rate = ofamount.subtract(amount);
 | 
			
		||||
//                dataEntity.set("zcgj_bnyjhshte", ofamount);
 | 
			
		||||
//                dataEntity.set("zcgj_bnyjse", rate);
 | 
			
		||||
//                this.getView().updateView();
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
        }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue