|  | @@ -162,9 +162,9 @@ public class AutoSynVoucher extends AbstractTask {
 | 
	
		
			
				|  |  |                      "LEFT JOIN T_BD_period BD ON VOU.FPERIODID = BD.FID " +
 | 
	
		
			
				|  |  |                      "LEFT JOIN T_BD_Account ACC ON VOUE.faccountid  = ACC.FID " +
 | 
	
		
			
				|  |  |                      "WHERE VOU.fispost='1' " +
 | 
	
		
			
				|  |  | -//                    "AND VOU.fk_nckd_issynyy='1'\n" +
 | 
	
		
			
				|  |  | +                    "AND VOU.fk_nckd_issynyy='1' " +
 | 
	
		
			
				|  |  |                  ") TEMP " +
 | 
	
		
			
				|  |  | -                "GROUP BY TEMP.orgid,TEMP.yearv,TEMP.periodv,TEMP.subjcd,TEMP.subjnm,TEMP.currentid,TEMP.direction";
 | 
	
		
			
				|  |  | +                "GROUP BY TEMP.orgid,TEMP.yearv,TEMP.periodv,TEMP.subjcd,TEMP.subjnm,TEMP.currentid,TEMP.entrydc";
 | 
	
		
			
				|  |  |          DataSet ds = DB.queryDataSet(this.getClass().getName(), new DBRoute("fi"), sql, null);
 | 
	
		
			
				|  |  |          JSONArray jsonArray = new JSONArray();
 | 
	
		
			
				|  |  |          Map currentList = new HashMap();
 | 
	
	
		
			
				|  | @@ -175,7 +175,7 @@ public class AutoSynVoucher extends AbstractTask {
 | 
	
		
			
				|  |  |              String orgnm = orgMapName.get(row.getString("orgid"))!=null?orgMapName.get(row.getString("orgid")).toString():"";
 | 
	
		
			
				|  |  |              jsonObj.put("orgnm",orgnm);
 | 
	
		
			
				|  |  |              jsonObj.put("yearv",row.getString("yearv"));
 | 
	
		
			
				|  |  | -            String periodv = tranPeriodv(row.getString("yearv"));
 | 
	
		
			
				|  |  | +            String periodv = tranPeriodv(row.getString("periodv"));
 | 
	
		
			
				|  |  |              jsonObj.put("periodv",periodv);
 | 
	
		
			
				|  |  |              jsonObj.put("subjcd",row.getString("subjcd"));
 | 
	
		
			
				|  |  |              jsonObj.put("subjnm",row.getString("subjnm"));
 | 
	
	
		
			
				|  | @@ -266,7 +266,7 @@ public class AutoSynVoucher extends AbstractTask {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      private void updateBillSign(String ids) {
 | 
	
		
			
				|  |  |          ids = ids.substring(1);
 | 
	
		
			
				|  |  | -        String sql = "UPDATE T_GL_VOUCHER SET fk_nckd_issynyy=0 WHERE FID IN ("+ids+")";
 | 
	
		
			
				|  |  | +        String sql = "UPDATE T_GL_VOUCHER SET fk_nckd_issynyy=1 WHERE FID IN ("+ids+")";
 | 
	
		
			
				|  |  |          DB.update(DBRoute.of("fi"), sql);
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -386,10 +386,11 @@ public class AutoSynVoucher extends AbstractTask {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      private DynamicObject[] getVoucherDatas() {
 | 
	
		
			
				|  |  |          Date beginDate = getBeginDate();
 | 
	
		
			
				|  |  | -        QFilter qFilter_beginDate = new QFilter("",QCP.large_equals,beginDate);
 | 
	
		
			
				|  |  | +        QFilter qFilter_beginDate = new QFilter("bookeddate",QCP.large_equals,beginDate);
 | 
	
		
			
				|  |  |          QFilter qFilter_ispost = new QFilter("ispost", QCP.equals,"1");
 | 
	
		
			
				|  |  | +        QFilter qFilter_issynyy = new QFilter("nckd_issynyy", QCP.equals,"0");
 | 
	
		
			
				|  |  |          DynamicObject[] voucherCol = BusinessDataServiceHelper.load(
 | 
	
		
			
				|  |  | -                "gl_voucher",SELECTFIELDS,new QFilter[]{qFilter_ispost,qFilter_beginDate});
 | 
	
		
			
				|  |  | +                "gl_voucher",SELECTFIELDS,new QFilter[]{qFilter_ispost,qFilter_beginDate,qFilter_issynyy});
 | 
	
		
			
				|  |  |          return voucherCol;
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -414,7 +415,8 @@ public class AutoSynVoucher extends AbstractTask {
 | 
	
		
			
				|  |  |          String port =  jkpzxx.getString("nckd_port");
 | 
	
		
			
				|  |  |          String username = jkpzxx.getString("nckd_user");
 | 
	
		
			
				|  |  |          String password = jkpzxx.getString("nckd_password");
 | 
	
		
			
				|  |  | -        String jdbcUrl = "jdbc:oracle:thin:@"+servername+":"+port+"/service";
 | 
	
		
			
				|  |  | +        String nckd_orclname = jkpzxx.getString("nckd_orclname");
 | 
	
		
			
				|  |  | +        String jdbcUrl = "jdbc:oracle:thin:@"+servername+":"+port+"/"+nckd_orclname;
 | 
	
		
			
				|  |  |          // 加载Oracle JDBC驱动
 | 
	
		
			
				|  |  |          Class.forName("oracle.jdbc.driver.OracleDriver");
 | 
	
		
			
				|  |  |          // 建立连接
 |