Skip to content

熊智 / scm-gc-src

Go to a project
Commit 7c1a7331 by 熊智
Options

迭代

parent 8b618757
Inline Side-by-side
Showing with 23 additions and 18 deletions
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++) {
ArVerificationRecordEntryInfo entry = entrys.get(i);
ServeProjectInfo recServeProject = entry.getRecServeProject();
if ("crYAAAJeQECIb4YR".equals(recServeProject.getString("id"))) {
if ("crYAAAJeQECIb4YR".equals(recServeProject.getString("id")) || "crYAAAJfGyGIb4YR".equals(recServeProject.getString("id"))) {
// 垫付货款核销 出代理费
String entrustBillNo = entry.getEntrustBillNo();
if (entrustBillNo.startsWith("E")) {
......@@ -91,10 +91,10 @@ public class ArVerificationRecordControllerBean extends AbstractArVerificationRe
String formula = verifyAmt + "*" + rate + "/100*" + diffDays;
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();
String formula = verifyAmt + "*" + rate + "/100";
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);
// }
}
/**
......@@ -144,7 +144,7 @@ public class ArVerificationRecordControllerBean extends AbstractArVerificationRe
BigDecimal dlfAmt = BigDecimal.ZERO;
BigDecimal zdDlfAmt = bussPlan.getDflLowAmount2();
if (diffDays > 0) {
if (diffDays >= 0) {
TFProtocolEntryE8Collection e8s = bussPlan.getE8();
for (int i = 0; i < e8s.size(); i++) {
TFProtocolEntryE8Info e8 = e8s.get(i);
......@@ -162,10 +162,10 @@ public class ArVerificationRecordControllerBean extends AbstractArVerificationRe
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);
// }
}
private void createDLfFundPool(Context ctx, ArVerificationRecordInfo srcInfo, EntrustBillInfo info, String dlfNumber, BigDecimal amt, String formula) throws EASBizException, BOSException {
......
com/kingdee/eas/hse/common/FundPoolBranchOfArLoacl.java
......@@ -45,8 +45,8 @@ public class FundPoolBranchOfArLoacl extends FundPoolBranchBase {
" ServeProject.FNumber = '" + DCConstant.serviceProjectdfGoodAmount + "' or " +//代付货款
" ServeProject.FNumber = '" + DCConstant.serviceProjectdfGoodDIffAmount + "' or " +//代付差异
" ServeProject.FNumber = '" + DCConstant.serviceProjectGoodAmount + "' or " +//货值
" ServeProject.FNumber = '" + DCConstant.serviceProjectInvoiceDIffAmount + "' " +//开票费差
// " ServeProject.FNumber = '" + DCConstant.serviceProjectdfkGoodAmount + "'" +//垫付货款
" ServeProject.FNumber = '" + DCConstant.serviceProjectInvoiceDIffAmount + "' or " +//开票费差
" ServeProject.FNumber = '" + DCConstant.serviceProjectdfkGoodAmount + "'" +//垫付货款
" )");
where.append("\n or (" +
" ServeProject.FGroup = '" + serviceGroup.FEIGHT_VALUE + "' " +
......
com/kingdee/eas/hse/scm/settlemanager/app/PayLoaclGoodControllerBean.java
......@@ -100,7 +100,12 @@ public class PayLoaclGoodControllerBean extends AbstractPayLoaclGoodControllerBe
checkPayData(ctx,model);
super._passAudit(ctx, pk, model);
// 自动生成付款单
createNextBill(ctx, (PayLoaclGoodInfo)model);
// createNextBill(ctx, (PayLoaclGoodInfo)model);
try {
createPaymentBill(ctx, (PayLoaclGoodInfo)model);
} catch (Exception e) {
throw new BOSException(e);
}
}
/**
......
com/kingdee/eas/hse/scm/settlemanager/client/ArRPWriteOffBillListUI.java
......@@ -590,7 +590,7 @@ public class ArRPWriteOffBillListUI extends AbstractArRPWriteOffBillListUI {
StringBuffer where = new StringBuffer();
where.append("\n and ");
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.serviceProjectdfGoodDIffAmount + "' "); //代付差异
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment