优化

com/kingdee/eas/custom/newbill/app/ArVerificationRecordControllerBean.java

@@ -42,7 +42,7 @@ public class ArVerificationRecordControllerBean extends AbstractArVerificationRe
 		for (int i = 0; i < entrys.size(); i++) {
 		for (int i = 0; i < entrys.size(); i++) {
 			ArVerificationRecordEntryInfo entry = entrys.get(i);
 			ArVerificationRecordEntryInfo entry = entrys.get(i);
 			ServeProjectInfo recServeProject = entry.getRecServeProject();
 			ServeProjectInfo recServeProject = entry.getRecServeProject();
-			if ("crYAAAJeQECIb4YR".equals(recServeProject.getString("id")) || "crYAAAJfGyGIb4YR".equals(recServeProject.getString("id"))) {
+			if ("crYAAAJeQECIb4YR".equals(recServeProject.getString("id")) || "crYAAAJfGyGIb4YR".equals(recServeProject.getString("id")) || "crYAAAJfGyCIb4YR".equals(recServeProject.getString("id"))) {
 				// 垫付货款核销 出代理费
 				// 垫付货款核销 出代理费
 				String entrustBillNo = entry.getEntrustBillNo();
 				String entrustBillNo = entry.getEntrustBillNo();
 				if (entrustBillNo.startsWith("E")) {
 				if (entrustBillNo.startsWith("E")) {
@@ -91,10 +91,10 @@ public class ArVerificationRecordControllerBean extends AbstractArVerificationRe
 			String formula = verifyAmt + "*" + rate + "/100*" + diffDays;
 			String formula = verifyAmt + "*" + rate + "/100*" + diffDays;
 			createDLfFundPool(ctx, info, billInfo, DCConstant.serviceProjectdlfGoodAmount, dlfAmt, formula);
 			createDLfFundPool(ctx, info, billInfo, DCConstant.serviceProjectdlfGoodAmount, dlfAmt, formula);
 		}
 		}
-//		if (zdDlfAmt.compareTo(dlfAmt) > 0) {
-//			String formula = zdDlfAmt + "-" + dlfAmt;
-//			createDLfFundPool(ctx, info, billInfo, DCConstant.serviceProjectLowdlfGoodAmount, zdDlfAmt.subtract(dlfAmt), formula);
-//		}
+		if (zdDlfAmt.compareTo(dlfAmt) > 0) {
+			String formula = zdDlfAmt + "-" + dlfAmt;
+			createDLfFundPool(ctx, info, billInfo, DCConstant.serviceProjectLowdlfGoodAmount, zdDlfAmt.subtract(dlfAmt), formula);
+		}
 	}
 	}
 
 
 	/**
 	/**
@@ -117,10 +117,10 @@ public class ArVerificationRecordControllerBean extends AbstractArVerificationRe
 		BigDecimal zdDlfAmt = bussPlan.getDflLowAmount2();
 		BigDecimal zdDlfAmt = bussPlan.getDflLowAmount2();
 		String formula = verifyAmt + "*" + rate + "/100";
 		String formula = verifyAmt + "*" + rate + "/100";
 		createDLfFundPool(ctx, info, billInfo, DCConstant.serviceProjectdlfGoodAmount, dlfAmt, formula);
 		createDLfFundPool(ctx, info, billInfo, DCConstant.serviceProjectdlfGoodAmount, dlfAmt, formula);
-//		if (zdDlfAmt.compareTo(dlfAmt) > 0) {
-//			formula = zdDlfAmt + "-" + dlfAmt;
-//			createDLfFundPool(ctx, info, billInfo, DCConstant.serviceProjectLowdlfGoodAmount, zdDlfAmt.subtract(dlfAmt), formula);
-//		}
+		if (zdDlfAmt.compareTo(dlfAmt) > 0) {
+			formula = zdDlfAmt + "-" + dlfAmt;
+			createDLfFundPool(ctx, info, billInfo, DCConstant.serviceProjectLowdlfGoodAmount, zdDlfAmt.subtract(dlfAmt), formula);
+		}
 	}
 	}
 
 
 	/**
 	/**

com/kingdee/eas/hse/scm/planandorder/app/EntrustBillControllerBean.java

@@ -2124,12 +2124,12 @@ public class EntrustBillControllerBean extends AbstractEntrustBillControllerBean
 		new Thread(new Runnable() {
 		new Thread(new Runnable() {
 			public void run() {
 			public void run() {
 				try {
 				try {
+					// 生成付汇申请单
+					createPaymentBill(ctx, entrustInfo);
 					// 生成采购订单,收货通知单
 					// 生成采购订单,收货通知单
 					createBotpPurOrder(ctx, entrustInfo);
 					createBotpPurOrder(ctx, entrustInfo);
 					// 生成发货通知单
 					// 生成发货通知单
 					generateSZPostBillByBtop(ctx, entrustInfo);
 					generateSZPostBillByBtop(ctx, entrustInfo);
-					// 生成付汇申请单
-					createPaymentBill(ctx, entrustInfo);
 				} catch (Exception e) {
 				} catch (Exception e) {
 					XZAppUtil.insertJKJsonParam(ctx, entrustInfo.getNumber() + "委托单审核自动生成下游失败", e.getMessage());
 					XZAppUtil.insertJKJsonParam(ctx, entrustInfo.getNumber() + "委托单审核自动生成下游失败", e.getMessage());
 				}
 				}

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

@@ -591,14 +591,14 @@ public class ArRPWriteOffBillListUI extends AbstractArRPWriteOffBillListUI {
 		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  (ServeProject.FGroup = '" + serviceGroup.FEIGHT_VALUE + "' and FArap = '" + ArApType.AR_VALUE + "') "); // 费用组
-		where.append("\n  ServeProject.FNumber = '" + DCConstant.serviceProjectdfkGoodAmount + "' "); // 垫付货款
+		where.append("\n  or 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 + "' and entry.FServeProjectID != 'crYAAAJeQECIb4YR' ");
+		sql.append("\n 		where bill.CFBillStatus = '" + HSEBillStatusEnum.AUDITED_VALUE + "' ");
 		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 and entry.FServeProjectID != 'crYAAAJeQECIb4YR' ");
+		sql.append("\n 		where bill.CFBillStatus = '" + HSEBillStatusEnum.AUDITED_VALUE + "' and isnull(entry.CFAdjSAT,0)!=0 ");
 		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 in ('" + DCConstant.serviceProjectContractTax1 + "', '" + DCConstant.serviceProjectdfkGoodAmount + "') and FArap = " + ArApType.ar.getValue() + " ");// 合同应收税金
+		sql.append("\n      where sp.fnumber = '" + DCConstant.serviceProjectContractTax1 + "' 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 '%猎芯科技%'");