|  | @@ -21,7 +21,7 @@ public class BusinessProcessingConvertPlugIn extends AbstractConvertPlugIn imple
 | 
	
		
			
				|  |  |              String bdsupplier = this.getOption().getVariableValue("bdsupplier");
 | 
	
		
			
				|  |  |              String billtype = this.getOption().getVariableValue("billtype");
 | 
	
		
			
				|  |  |              QFilter numberQFilter = new QFilter("ap_finapbill.org.number", QCP.equals, orgnumber);
 | 
	
		
			
				|  |  | -//            numberQFilter.and("ap_finapbill.asstacttype", QCP.equals, billtype);
 | 
	
		
			
				|  |  | +            numberQFilter.and("ap_finapbill.billstatus", QCP.equals, "C");
 | 
	
		
			
				|  |  |              numberQFilter.and("ap_finapbill.asstact.id", QCP.equals, Long.valueOf(bdsupplier));
 | 
	
		
			
				|  |  |              for(int i=0;i<objects.size();i++){
 | 
	
		
			
				|  |  |                  JSONObject jsonObject = objects.getJSONObject(i);
 | 
	
	
		
			
				|  | @@ -33,7 +33,7 @@ public class BusinessProcessingConvertPlugIn extends AbstractConvertPlugIn imple
 | 
	
		
			
				|  |  |              String bdsupplier = this.getOption().getVariableValue("bdsupplier");
 | 
	
		
			
				|  |  |              String billtype = this.getOption().getVariableValue("billtype");
 | 
	
		
			
				|  |  |              QFilter numberQFilter = new QFilter("ar_finarbill.org.number", QCP.equals, orgnumber);
 | 
	
		
			
				|  |  | -//            numberQFilter.and("ar_finarbill.asstacttype", QCP.equals, billtype);
 | 
	
		
			
				|  |  | +            numberQFilter.and("ar_finarbill.billstatus", QCP.equals, "C");
 | 
	
		
			
				|  |  |              numberQFilter.and("ar_finarbill.asstact.id", QCP.equals, Long.valueOf(bdsupplier));
 | 
	
		
			
				|  |  |              for(int i=0;i<objects.size();i++){
 | 
	
		
			
				|  |  |                  JSONObject jsonObject = objects.getJSONObject(i);
 | 
	
	
		
			
				|  | @@ -42,11 +42,9 @@ public class BusinessProcessingConvertPlugIn extends AbstractConvertPlugIn imple
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |              e.getCustQFilters().add(numberQFilter);
 | 
	
		
			
				|  |  |          }else if("drawzlht".equals(type)){
 | 
	
		
			
				|  |  | -            //String bdsupplier = this.getOption().getVariableValue("bdsupplier");
 | 
	
		
			
				|  |  | -            String billtype = this.getOption().getVariableValue("billtype");
 | 
	
		
			
				|  |  |              QFilter numberQFilter = new QFilter("fa_lease_contract.org.number", QCP.equals, orgnumber);
 | 
	
		
			
				|  |  | -//            numberQFilter.and("fa_lease_contract.asstacttype", QCP.equals, billtype);
 | 
	
		
			
				|  |  | -            //numberQFilter.and("fa_lease_contract.leaser.number", QCP.equals, bdsupplier);
 | 
	
		
			
				|  |  | +            numberQFilter.and("fa_lease_contract.status", QCP.equals,"C");
 | 
	
		
			
				|  |  | +            numberQFilter.and("fa_lease_contract.nckd_combofield", QCP.equals,"2");
 | 
	
		
			
				|  |  |              for(int i=0;i<objects.size();i++){
 | 
	
		
			
				|  |  |                  JSONObject jsonObject = objects.getJSONObject(i);
 | 
	
		
			
				|  |  |                  String id = jsonObject.getString("id");
 | 
	
	
		
			
				|  | @@ -55,6 +53,7 @@ public class BusinessProcessingConvertPlugIn extends AbstractConvertPlugIn imple
 | 
	
		
			
				|  |  |              e.getCustQFilters().add(numberQFilter);
 | 
	
		
			
				|  |  |          }else if("draw-yf".equals(type)){
 | 
	
		
			
				|  |  |              QFilter numberQFilter = new QFilter("er_prepaybill.costdept.number", QCP.equals, orgnumber);
 | 
	
		
			
				|  |  | +            numberQFilter.and("er_prepaybill.billstatus", QCP.equals, "G");
 | 
	
		
			
				|  |  |              for(int i=0;i<objects.size();i++){
 | 
	
		
			
				|  |  |                  JSONObject jsonObject = objects.getJSONObject(i);
 | 
	
		
			
				|  |  |                  String id = jsonObject.getString("id");
 | 
	
	
		
			
				|  | @@ -65,6 +64,7 @@ public class BusinessProcessingConvertPlugIn extends AbstractConvertPlugIn imple
 | 
	
		
			
				|  |  |              String bdsupplier = this.getOption().getVariableValue("bdsupplier");
 | 
	
		
			
				|  |  |              QFilter numberQFilter = new QFilter("ar_finarbill.org.number", QCP.equals, orgnumber);
 | 
	
		
			
				|  |  |              numberQFilter.and("ar_finarbill.asstact.id", QCP.equals, Long.valueOf(bdsupplier));
 | 
	
		
			
				|  |  | +            numberQFilter.and("ar_finarbill.billstatus", QCP.equals, "C");
 | 
	
		
			
				|  |  |              for(int i=0;i<objects.size();i++){
 | 
	
		
			
				|  |  |                  JSONObject jsonObject = objects.getJSONObject(i);
 | 
	
		
			
				|  |  |                  String id = jsonObject.getString("id");
 |