weiloong_zhang/zhyManagement
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: weiloong_zhang:0b333d98ea01806d8147e0c308a0c0416bd5344c
Branches Tags
weiloong_zhang:master
..
compare: weiloong_zhang:0724d574df984af7dcfc17d0cdb4d33d566a3494
Branches Tags
weiloong_zhang:master

No commits in common. "0b333d98ea01806d8147e0c308a0c0416bd5344c" and "0724d574df984af7dcfc17d0cdb4d33d566a3494" have entirely different histories.
0b333d98ea ... 0724d574df

2 changed files with 22 additions and 57 deletions
Show Stats Expand all files Collapse all files

2
src/main/java/com/management/controller/GoodsPlanController.java
View File

@ -280,7 +280,7 @@ public class GoodsPlanController {
erpGoodsPlanDetailReq.put("f9w5_delivarydate", deliveryDateDate);
//是否最新程序
String isLatestProgram = goodsPlanDetailData.getString("is_latest__c__v") != null ? goodsPlanDetailData.getString("is_latest__c__v") : "";
String isLatestProgram = goodsPlanDetailData.getString("is_latest__c") != null ? goodsPlanDetailData.getString("is_latest__c") : "";
switch (isLatestProgram) {
case "yes":
erpGoodsPlanDetailReq.put("f9w5_latest", true);

77
src/main/java/com/management/controller/XSHTController.java
View File

@ -311,63 +311,16 @@ public class XSHTController {
//销售方式
erpContractReq.put("salesmethod", contractData.getString("sales_method__c") != null ? contractData.getString("sales_method__c") : "");
List payMethodList = contractData.getJSONArray("payment_method__c") != null ? contractData.getJSONArray("payment_method__c") : new ArrayList();
//付款方式
Map paymentMethodMap = new HashMap<>();
//收款比例
paymentMethodMap.put("payrate", contractData.getBigDecimal("prepayment_ratio__c") != null ? contractData.getBigDecimal("prepayment_ratio__c") : BigDecimal.ZERO);
//预付款金额
paymentMethodMap.put("payamount", contractData.getBigDecimal("pre_invoice_amount__c") != null ? contractData.getBigDecimal("pre_invoice_amount__c") : BigDecimal.ZERO);
//是否预收
paymentMethodMap.put("isprepay", false);
List payMethodListMap = new ArrayList();
if (payMethodList != null && !payMethodList.isEmpty()) {
for (Object payMethodStr : payMethodList) {
String payMethod = payMethodStr.toString();
//单个付款方式
Map paymentMethodMap = new HashMap<>();
if ("1".equals(payMethod)) {
//预付款
//款项名称
paymentMethodMap.put("payname_number", "1");
//收款比例
paymentMethodMap.put("payrate", contractData.getBigDecimal("prepayment_ratio__c") != null ? contractData.getBigDecimal("prepayment_ratio__c") : BigDecimal.ZERO);
//预付款金额
paymentMethodMap.put("payamount", contractData.getBigDecimal("pre_invoice_amount__c") != null ? contractData.getBigDecimal("pre_invoice_amount__c") : BigDecimal.ZERO);
//是否预收
paymentMethodMap.put("isprepay", true);
} else if ("2".equals(payMethod)) {
//到货款
//款项名称
paymentMethodMap.put("payname_number", "2");
//收款比例
paymentMethodMap.put("payrate", contractData.getBigDecimal("arrival_payment_ratio__c") != null ? contractData.getBigDecimal("arrival_payment_ratio__c") : BigDecimal.ZERO);
//预付款金额
paymentMethodMap.put("payamount", contractData.getBigDecimal("received_amount__c") != null ? contractData.getBigDecimal("received_amount__c") : BigDecimal.ZERO);
//是否预收
paymentMethodMap.put("isprepay", false);
} else if ("3".equals(payMethod)) {
//投运款
//款项名称
paymentMethodMap.put("payname_number", "3");
//收款比例
paymentMethodMap.put("payrate", contractData.getBigDecimal("commission_ratio__c") != null ? contractData.getBigDecimal("commission_ratio__c") : BigDecimal.ZERO);
//预付款金额
paymentMethodMap.put("payamount", contractData.getBigDecimal("commission_amount__c") != null ? contractData.getBigDecimal("commission_amount__c") : BigDecimal.ZERO);
//是否预收
paymentMethodMap.put("isprepay", false);
} else if ("4".equals(payMethod)) {
//质保金
//款项名称
paymentMethodMap.put("payname_number", "4");
//收款比例
paymentMethodMap.put("payrate", contractData.getBigDecimal("warranty_deposit__c") != null ? contractData.getBigDecimal("warranty_deposit__c") : BigDecimal.ZERO);
//预付款金额
paymentMethodMap.put("payamount", contractData.getBigDecimal("warranty_amount__c") != null ? contractData.getBigDecimal("warranty_amount__c") : BigDecimal.ZERO);
//是否预收
paymentMethodMap.put("isprepay", false);
}
payMethodListMap.add(paymentMethodMap);
}
}
erpContractReq.put("payentry", payMethodListMap);
erpContractReq.put("payentry", Arrays.asList(paymentMethodMap));
//根据合同号查询合同明细
JSONObject contractDetailReq = crmRequestUtil.getCRMList(Arrays.asList(
@ -867,6 +820,18 @@ public class XSHTController {
contractBGDetailList.add(contractBGDetailMap);
}
if (contractBGDetailList.isEmpty()) {
log.info("没用符合条件的变更明细数据，将不再继续向下执行");
try {
System.out.println("暂停3秒");
Thread.sleep(3000);//单位：毫秒
System.out.println("继续执行");
} catch (InterruptedException e) {
e.printStackTrace();//处理中断异常
}
continue;
}
contractBGMap.put("entryList", contractBGDetailList);
//开始获取token