Skip to content

熊智 / scm-gc-src

Go to a project
Commit 27968fa5 by 熊智
Options

迭代

parent 0ad586ae
Inline Side-by-side
Showing with 59 additions and 52 deletions
com/kingdee/eas/custom/newbill/app/ArVerificationRecordControllerBean.java
...@@ -91,11 +91,14 @@ public class ArVerificationRecordControllerBean extends AbstractArVerificationRe ...@@ -91,11 +91,14 @@ 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);
} }
ServeProjectInfo recServeProject = entry.getRecServeProject();
if ("crYAAAJeQECIb4YR".equals(recServeProject.getString("id"))) {
if (zdDlfAmt.compareTo(dlfAmt) > 0) { if (zdDlfAmt.compareTo(dlfAmt) > 0) {
String formula = zdDlfAmt + "-" + dlfAmt; String formula = zdDlfAmt + "-" + dlfAmt;
createDLfFundPool(ctx, info, billInfo, DCConstant.serviceProjectLowdlfGoodAmount, zdDlfAmt.subtract(dlfAmt), formula); createDLfFundPool(ctx, info, billInfo, DCConstant.serviceProjectLowdlfGoodAmount, zdDlfAmt.subtract(dlfAmt), formula);
} }
} }
}
/** /**
* 标准比例 * 标准比例
...@@ -117,11 +120,16 @@ public class ArVerificationRecordControllerBean extends AbstractArVerificationRe ...@@ -117,11 +120,16 @@ 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);
ServeProjectInfo recServeProject = entry.getRecServeProject();
if ("crYAAAJeQECIb4YR".equals(recServeProject.getString("id"))) {
// 只有垫款才需要最低代理费
if (zdDlfAmt.compareTo(dlfAmt) > 0) { if (zdDlfAmt.compareTo(dlfAmt) > 0) {
formula = zdDlfAmt + "-" + dlfAmt; formula = zdDlfAmt + "-" + dlfAmt;
createDLfFundPool(ctx, info, billInfo, DCConstant.serviceProjectLowdlfGoodAmount, zdDlfAmt.subtract(dlfAmt), formula); createDLfFundPool(ctx, info, billInfo, DCConstant.serviceProjectLowdlfGoodAmount, zdDlfAmt.subtract(dlfAmt), formula);
} }
} }
}
/** /**
* 阶梯代理费 * 阶梯代理费
...@@ -142,8 +150,6 @@ public class ArVerificationRecordControllerBean extends AbstractArVerificationRe ...@@ -142,8 +150,6 @@ public class ArVerificationRecordControllerBean extends AbstractArVerificationRe
int diffDays = XZUtil.getDiffDate(recBizDate, recedBizDate, DateType.Day); int diffDays = XZUtil.getDiffDate(recBizDate, recedBizDate, DateType.Day);
BigDecimal rate = BigDecimal.ZERO; BigDecimal rate = BigDecimal.ZERO;
BigDecimal dlfAmt = BigDecimal.ZERO; BigDecimal dlfAmt = BigDecimal.ZERO;
BigDecimal zdDlfAmt = bussPlan.getDflLowAmount2();
if (diffDays >= 0) { if (diffDays >= 0) {
TFProtocolEntryE8Collection e8s = bussPlan.getE8(); TFProtocolEntryE8Collection e8s = bussPlan.getE8();
for (int i = 0; i < e8s.size(); i++) { for (int i = 0; i < e8s.size(); i++) {
......
com/kingdee/eas/hse/scm/planandorder/app/EntrustBillControllerBean.java
...@@ -2108,6 +2108,9 @@ public class EntrustBillControllerBean extends AbstractEntrustBillControllerBean ...@@ -2108,6 +2108,9 @@ public class EntrustBillControllerBean extends AbstractEntrustBillControllerBean
selector.add(new SelectorItemInfo("AuditDate")); selector.add(new SelectorItemInfo("AuditDate"));
_updatePartial(ctx, entrustInfo, selector);// ( _updatePartial(ctx, entrustInfo, selector);// (
serviceController.execCommand(new Command(ctx, "classfiyAudit", (SCSBillBaseInfo) entrustInfo)); serviceController.execCommand(new Command(ctx, "classfiyAudit", (SCSBillBaseInfo) entrustInfo));
// 生成付汇申请单
createPaymentBill(ctx, entrustInfo);
createNextBill(ctx, entrustInfo); createNextBill(ctx, entrustInfo);
String log = XZAppUtil.getUserInfo(ctx).getName() + XZUtil.formatDate(new Date()) + "操作单号:" + entrustInfo.getNumber(); String log = XZAppUtil.getUserInfo(ctx).getName() + XZUtil.formatDate(new Date()) + "操作单号:" + entrustInfo.getNumber();
XZUtil.logInfo("委托单", "审核", "info", entrustBillLogger, log, getJsonString(entrustInfo)); XZUtil.logInfo("委托单", "审核", "info", entrustBillLogger, log, getJsonString(entrustInfo));
...@@ -2124,8 +2127,6 @@ public class EntrustBillControllerBean extends AbstractEntrustBillControllerBean ...@@ -2124,8 +2127,6 @@ 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);
// 生成发货通知单 // 生成发货通知单
......
com/kingdee/eas/hse/scm/planandorder/client/EntrustBillEditUICTEx.java
...@@ -438,7 +438,7 @@ public class EntrustBillEditUICTEx extends EntrustBillEditUI { ...@@ -438,7 +438,7 @@ public class EntrustBillEditUICTEx extends EntrustBillEditUI {
*/ */
private void personalFunction() throws Exception { private void personalFunction() throws Exception {
// synPaymentPanel(); // synPaymentPanel();
// addPersonalTabUI(); addPersonalTabUI();
// 增加原始资料页签分录上下移动按钮 // 增加原始资料页签分录上下移动按钮
addMoveBtn(); addMoveBtn();
// 加载附件 // 加载附件
...@@ -453,21 +453,21 @@ public class EntrustBillEditUICTEx extends EntrustBillEditUI { ...@@ -453,21 +453,21 @@ public class EntrustBillEditUICTEx extends EntrustBillEditUI {
* @date 2020-2-14 上午09:33:27 * @date 2020-2-14 上午09:33:27
*/ */
private void addPersonalTabUI() throws Exception { private void addPersonalTabUI() throws Exception {
ExecutionPlanUI planUI = new ExecutionPlanUI(); // ExecutionPlanUI planUI = new ExecutionPlanUI();
if (this.editData.getId() != null && this.editData.getBussPlan() != null) { // if (this.editData.getId() != null && this.editData.getBussPlan() != null) {
planUI.getUIContext().put("bussPlanID", this.editData.getBussPlan().getString("id")); // planUI.getUIContext().put("bussPlanID", this.editData.getBussPlan().getString("id"));
} // }
planUI.initUIContentLayout(); // planUI.initUIContentLayout();
planUI.onLoad(); // planUI.onLoad();
this.tabPanelMain.add(planUI, "执行方案"); // this.tabPanelMain.add(planUI, "执行方案");
MainCashFlowUI flowUI = new MainCashFlowUI(); // MainCashFlowUI flowUI = new MainCashFlowUI();
if (this.editData.getId() != null) { // if (this.editData.getId() != null) {
flowUI.getUIContext().put("sourceBillID", this.editData.getString("id")); // flowUI.getUIContext().put("sourceBillID", this.editData.getString("id"));
} // }
flowUI.initUIContentLayout(); // flowUI.initUIContentLayout();
flowUI.onLoad(); // flowUI.onLoad();
this.tabPanelMain.add(flowUI, "主资金流"); // this.tabPanelMain.add(flowUI, "主资金流");
F7FeightManagerListUI feightManagerUI = new F7FeightManagerListUI(); F7FeightManagerListUI feightManagerUI = new F7FeightManagerListUI();
feightManagerUI.getUIContext().put("srcUI", this); feightManagerUI.getUIContext().put("srcUI", this);
...@@ -480,38 +480,38 @@ public class EntrustBillEditUICTEx extends EntrustBillEditUI { ...@@ -480,38 +480,38 @@ public class EntrustBillEditUICTEx extends EntrustBillEditUI {
this.tabPanelMain.add(feightManagerUI, "应收费用"); this.tabPanelMain.add(feightManagerUI, "应收费用");
// 香港交货方式 、国内物流信息 // 香港交货方式 、国内物流信息
EntrustBillExEditUI hkDeliveryUI = new EntrustBillExEditUI(); // EntrustBillExEditUI hkDeliveryUI = new EntrustBillExEditUI();
EntrustBillEx2EditUI inlandDeliveryUI = new EntrustBillEx2EditUI(); // EntrustBillEx2EditUI inlandDeliveryUI = new EntrustBillEx2EditUI();
EntrustBillExInfo exInfo = null; // EntrustBillExInfo exInfo = null;
if (UIRuleUtil.isNotNull(this.editData.getId())) { // if (UIRuleUtil.isNotNull(this.editData.getId())) {
IEntrustBillEx iFactory = EntrustBillExFactory.getRemoteInstance(); // IEntrustBillEx iFactory = EntrustBillExFactory.getRemoteInstance();
String oql = "select * where description = '" + this.editData.getId() + "'"; // String oql = "select * where description = '" + this.editData.getId() + "'";
if (iFactory.exists(oql)) { // if (iFactory.exists(oql)) {
exInfo = iFactory.getEntrustBillExCollection(oql).get(0); // exInfo = iFactory.getEntrustBillExCollection(oql).get(0);
} // }
} // }
if (UIRuleUtil.isNotNull(exInfo)) { // if (UIRuleUtil.isNotNull(exInfo)) {
hkDeliveryUI.getUIContext().put("ID", exInfo.getString("id")); // hkDeliveryUI.getUIContext().put("ID", exInfo.getString("id"));
hkDeliveryUI.setOprtState("VIEW"); // hkDeliveryUI.setOprtState("VIEW");
inlandDeliveryUI.getUIContext().put("ID", exInfo.getString("id")); // inlandDeliveryUI.getUIContext().put("ID", exInfo.getString("id"));
inlandDeliveryUI.setOprtState("VIEW"); // inlandDeliveryUI.setOprtState("VIEW");
} else { // } else {
exInfo = (EntrustBillExInfo) hkDeliveryUI.createNewData(); // exInfo = (EntrustBillExInfo) hkDeliveryUI.createNewData();
hkDeliveryUI.setOprtState("ADDNEW"); // hkDeliveryUI.setOprtState("ADDNEW");
inlandDeliveryUI.setOprtState("ADDNEW"); // inlandDeliveryUI.setOprtState("ADDNEW");
} // }
hkDeliveryUI.editData = exInfo; // hkDeliveryUI.editData = exInfo;
inlandDeliveryUI.editData = exInfo; // inlandDeliveryUI.editData = exInfo;
//
hkDeliveryUI.initUIContentLayout(); // hkDeliveryUI.initUIContentLayout();
hkDeliveryUI.onLoad(); // hkDeliveryUI.onLoad();
hkDeliveryUI.loadFields(); // hkDeliveryUI.loadFields();
this.ctnHKDelivery.getContentPane().add(hkDeliveryUI, BorderLayout.CENTER); // this.ctnHKDelivery.getContentPane().add(hkDeliveryUI, BorderLayout.CENTER);
//
inlandDeliveryUI.initUIContentLayout(); // inlandDeliveryUI.initUIContentLayout();
inlandDeliveryUI.onLoad(); // inlandDeliveryUI.onLoad();
inlandDeliveryUI.loadFields(); // inlandDeliveryUI.loadFields();
this.ctnInlandDelivery.getContentPane().add(inlandDeliveryUI, BorderLayout.CENTER); // this.ctnInlandDelivery.getContentPane().add(inlandDeliveryUI, BorderLayout.CENTER);
} }
@Override @Override
......
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