优化

com/kingdee/eas/hse/common/FundPoolBranchOfArLoacl.java

@@ -45,8 +45,8 @@ public class FundPoolBranchOfArLoacl extends FundPoolBranchBase {
 					"	ServeProject.FNumber = '" + DCConstant.serviceProjectdfGoodAmount + "' or " +//代付货款
 					"	ServeProject.FNumber = '" + DCConstant.serviceProjectdfGoodAmount + "' or " +//代付货款
 					"	ServeProject.FNumber = '" + DCConstant.serviceProjectdfGoodDIffAmount + "' or " +//代付差异
 					"	ServeProject.FNumber = '" + DCConstant.serviceProjectdfGoodDIffAmount + "' or " +//代付差异
 					"	ServeProject.FNumber = '" + DCConstant.serviceProjectGoodAmount + "' or " +//货值
 					"	ServeProject.FNumber = '" + DCConstant.serviceProjectGoodAmount + "' or " +//货值
-					"	ServeProject.FNumber = '" + DCConstant.serviceProjectInvoiceDIffAmount + "' or " +//开票费差
-					"	ServeProject.FNumber = '" + DCConstant.serviceProjectdfkGoodAmount + "'" +//垫付货款
+					"	ServeProject.FNumber = '" + DCConstant.serviceProjectInvoiceDIffAmount + "' " +//开票费差
+//					"	ServeProject.FNumber = '" + DCConstant.serviceProjectdfkGoodAmount + "'" +//垫付货款
 							" )"); 
 							" )"); 
 			where.append("\n or (" +
 			where.append("\n or (" +
 					" ServeProject.FGroup = '" + serviceGroup.FEIGHT_VALUE + "' " +
 					" ServeProject.FGroup = '" + serviceGroup.FEIGHT_VALUE + "' " +

com/kingdee/eas/hse/scm/planandorder/client/EntrustBillEditUICTEx.java

@@ -108,6 +108,7 @@ public class EntrustBillEditUICTEx extends EntrustBillEditUI {
 		this.tabPanelMain.remove(panelInlandDelivery);
 		this.tabPanelMain.remove(panelInlandDelivery);
 		this.tabPanelMain.remove(panelPurInw);
 		this.tabPanelMain.remove(panelPurInw);
 		this.tabPanelMain.remove(panelAttachment);
 		this.tabPanelMain.remove(panelAttachment);
+		this.tabPanelMain.remove(panelPay);
 	}
 	}
 
 
 	@Override
 	@Override

com/kingdee/eas/hse/scm/settlemanager/client/ArRPWriteOffBillListUI.java

@@ -109,11 +109,11 @@ public class ArRPWriteOffBillListUI extends AbstractArRPWriteOffBillListUI {
 		
 		
 		// 补充核销生成记录
 		// 补充核销生成记录
 		// 可批量操作的人员权限
 		// 可批量操作的人员权限
-		String batchOperatUsers = DCUtil.getInitSysValueByParamNumber(null, "batchOperatUsers");
-		String user = XZClientUtil.getUserInfo().getNumber();
-		if(new HashSet(Arrays.asList(batchOperatUsers.split(","))).contains(user)) {
-			addVerifyRecordBtn();
-		}
+//		String batchOperatUsers = DCUtil.getInitSysValueByParamNumber(null, "batchOperatUsers");
+//		String user = XZClientUtil.getUserInfo().getNumber();
+//		if(new HashSet(Arrays.asList(batchOperatUsers.split(","))).contains(user)) {
+//			addVerifyRecordBtn();
+//		}
 	}
 	}
 
 
 	/**
 	/**
@@ -590,15 +590,15 @@ public class ArRPWriteOffBillListUI extends AbstractArRPWriteOffBillListUI {
 		StringBuffer where = new StringBuffer();
 		StringBuffer where = new StringBuffer();
 		where.append("\n and ");
 		where.append("\n and ");
 		where.append("\n ( ");
 		where.append("\n ( ");
-		where.append("\n  (ServeProject.FGroup = '" + serviceGroup.FEIGHT_VALUE + "' and FArap = '" + ArApType.AR_VALUE + "') "); // 费用组
-		where.append("\n  or ServeProject.FNumber = '" + DCConstant.serviceProjectdfkGoodAmount + "' "); // 垫付货款
+//		where.append("\n  (ServeProject.FGroup = '" + serviceGroup.FEIGHT_VALUE + "' and FArap = '" + ArApType.AR_VALUE + "') "); // 费用组
+		where.append("\n  ServeProject.FNumber = '" + DCConstant.serviceProjectdfkGoodAmount + "' "); // 垫付货款
 		// where.append("\n  or ServeProject.FNumber = '" +
 		// where.append("\n  or ServeProject.FNumber = '" +
 		// DCConstant.serviceProjectdfGoodDIffAmount + "' "); //代付差异
 		// DCConstant.serviceProjectdfGoodDIffAmount + "' "); //代付差异
 		where.append("\n  or ServeProject.FNumber = '" + DCConstant.serviceProjectvatAmount + "' "); // 关税
 		where.append("\n  or ServeProject.FNumber = '" + DCConstant.serviceProjectvatAmount + "' "); // 关税
 		where.append("\n  or ServeProject.FNumber = '" + DCConstant.serviceProjecttarrfiAmount + "' "); // 增值税
 		where.append("\n  or ServeProject.FNumber = '" + DCConstant.serviceProjecttarrfiAmount + "' "); // 增值税
-		where.append("\n  or ServeProject.FNumber = '" + DCConstant.serviceProjectdlfGoodAmount + "' "); // 代理费
-		where.append("\n  or ServeProject.FNumber = '" + DCConstant.serviceProjectLowdlfGoodAmount + "' "); // 最低代理费
-		where.append("\n  or ServeProject.FNumber = '" + DCConstant.serviceProjectisTaxAmount + "' "); // 税金
+//		where.append("\n  or ServeProject.FNumber = '" + DCConstant.serviceProjectdlfGoodAmount + "' "); // 代理费
+//		where.append("\n  or ServeProject.FNumber = '" + DCConstant.serviceProjectLowdlfGoodAmount + "' "); // 最低代理费
+//		where.append("\n  or ServeProject.FNumber = '" + DCConstant.serviceProjectisTaxAmount + "' "); // 税金
 		where.append("\n  or ServeProject.FNumber = '" + DCConstant.serviceProjectdfGoodAmount + "' "); // 代付货款
 		where.append("\n  or ServeProject.FNumber = '" + DCConstant.serviceProjectdfGoodAmount + "' "); // 代付货款
 		where.append("\n ) ");
 		where.append("\n ) ");
 
 
@@ -636,7 +636,7 @@ public class ArRPWriteOffBillListUI extends AbstractArRPWriteOffBillListUI {
 		sql.append("\n 		sum(FSettlementAmount) as CFChargeAmount ");
 		sql.append("\n 		sum(FSettlementAmount) as CFChargeAmount ");
 		sql.append("\n 		from CT_SM_ArChargeSettleE1 entry ");
 		sql.append("\n 		from CT_SM_ArChargeSettleE1 entry ");
 		sql.append("\n 		left outer join CT_SM_ArChargeSettle bill on bill.FID = entry.FParentID ");
 		sql.append("\n 		left outer join CT_SM_ArChargeSettle bill on bill.FID = entry.FParentID ");
-		sql.append("\n 		where bill.CFBillStatus = '" + HSEBillStatusEnum.AUDITED_VALUE + "' ");
+		sql.append("\n 		where bill.CFBillStatus = '" + HSEBillStatusEnum.AUDITED_VALUE + "' and entry.FServeProjectID != 'crYAAAJeQECIb4YR' ");
 		sql.append("\n 		group by entry.FFeePoolId ");
 		sql.append("\n 		group by entry.FFeePoolId ");
 		sql.append("\n 		union all ");
 		sql.append("\n 		union all ");
 		sql.append("\n 		select to_char(entry.CFAdjfeePoolId) CFScsfundPoolID, ");
 		sql.append("\n 		select to_char(entry.CFAdjfeePoolId) CFScsfundPoolID, ");
@@ -644,12 +644,12 @@ public class ArRPWriteOffBillListUI extends AbstractArRPWriteOffBillListUI {
 		sql.append("\n 		sum(entry.CFAdjSAT) as CFChargeAmount ");
 		sql.append("\n 		sum(entry.CFAdjSAT) as CFChargeAmount ");
 		sql.append("\n 		from CT_SM_ArChargeSettleE1 entry ");
 		sql.append("\n 		from CT_SM_ArChargeSettleE1 entry ");
 		sql.append("\n 		left outer join CT_SM_ArChargeSettle bill on bill.FID = entry.FParentID ");
 		sql.append("\n 		left outer join CT_SM_ArChargeSettle bill on bill.FID = entry.FParentID ");
-		sql.append("\n 		where bill.CFBillStatus = '" + HSEBillStatusEnum.AUDITED_VALUE + "' and isnull(entry.CFAdjSAT,0)!=0 ");
+		sql.append("\n 		where bill.CFBillStatus = '" + HSEBillStatusEnum.AUDITED_VALUE + "' and isnull(entry.CFAdjSAT,0)!=0 and entry.FServeProjectID != 'crYAAAJeQECIb4YR' ");
 		sql.append("\n 		group by entry.CFAdjfeePoolId ");
 		sql.append("\n 		group by entry.CFAdjfeePoolId ");
 		sql.append("\n 		union all ");
 		sql.append("\n 		union all ");
 		sql.append("\n 		select to_char(pl.fid) CFScsfundPoolID,pl.FOrgAmount CFOriginalAmount,pl.FSettleAmount CFChargeAmount from CT_SRV_ScsfundPool pl ");
 		sql.append("\n 		select to_char(pl.fid) CFScsfundPoolID,pl.FOrgAmount CFOriginalAmount,pl.FSettleAmount CFChargeAmount from CT_SRV_ScsfundPool pl ");
 		sql.append("\n      inner join CT_BAS_ServeProject sp on pl.FServerProjectID = sp.FID");
 		sql.append("\n      inner join CT_BAS_ServeProject sp on pl.FServerProjectID = sp.FID");
-		sql.append("\n      where sp.fnumber = '" + DCConstant.serviceProjectContractTax1 + "' and FArap = " + ArApType.ar.getValue() + " ");// 合同应收税金
+		sql.append("\n      where sp.fnumber in ('" + DCConstant.serviceProjectContractTax1 + "', '" + DCConstant.serviceProjectdfkGoodAmount + "') and FArap = " + ArApType.ar.getValue() + " ");// 合同应收税金
 		sql.append("\n ) tempTable ");
 		sql.append("\n ) tempTable ");
 		sql.append("\n ) rp on pl.FID=rp.CFScsfundPoolID");
 		sql.append("\n ) rp on pl.FID=rp.CFScsfundPoolID");
 //		sql.append("\n ) dt where dt.principalAllName not like '%猎芯科技%'");
 //		sql.append("\n ) dt where dt.principalAllName not like '%猎芯科技%'");