1.返利系统采购订单变更单
This commit is contained in:
parent
a43f967fe3
commit
d79a171b47
|
|
@ -51,7 +51,7 @@ public class PayBillOperationPlugin extends AbstractOperationServicePlugIn imple
|
||||||
new QFilter[]{new QFilter("number", QCP.equals, "EqmDatabase_password")});
|
new QFilter[]{new QFilter("number", QCP.equals, "EqmDatabase_password")});
|
||||||
PASSWORD = passWord != null ? passWord.getString("name") : null;
|
PASSWORD = passWord != null ? passWord.getString("name") : null;
|
||||||
url = BusinessDataServiceHelper.loadSingle("tqq9_thirdconfig", "name",
|
url = BusinessDataServiceHelper.loadSingle("tqq9_thirdconfig", "name",
|
||||||
new QFilter[]{new QFilter("number", QCP.equals, "FLXT_BillCreate_Url")});
|
new QFilter[]{new QFilter("number", QCP.equals, "FLXT_Deduct_Url")});
|
||||||
Use_URL = url != null ? url.getString("name") : null;
|
Use_URL = url != null ? url.getString("name") : null;
|
||||||
DynamicObject token = BusinessDataServiceHelper.loadSingle("tqq9_thirdconfig", "name",
|
DynamicObject token = BusinessDataServiceHelper.loadSingle("tqq9_thirdconfig", "name",
|
||||||
new QFilter[]{new QFilter("number", QCP.equals, "FLXT_TOKEN")});
|
new QFilter[]{new QFilter("number", QCP.equals, "FLXT_TOKEN")});
|
||||||
|
|
@ -101,7 +101,7 @@ public class PayBillOperationPlugin extends AbstractOperationServicePlugIn imple
|
||||||
Boolean tqq9_isrebatecalculate = pm_purorderbill.getBoolean("tqq9_isrebatecalculate");//是否已计算返利
|
Boolean tqq9_isrebatecalculate = pm_purorderbill.getBoolean("tqq9_isrebatecalculate");//是否已计算返利
|
||||||
BigDecimal tqq9_hshfsyje = pm_purorderbill.getBigDecimal("tqq9_hshfsyje");//含税货返使用金额
|
BigDecimal tqq9_hshfsyje = pm_purorderbill.getBigDecimal("tqq9_hshfsyje");//含税货返使用金额
|
||||||
BigDecimal tqq9_hsxfsyje = pm_purorderbill.getBigDecimal("tqq9_hsxfsyje");//含税现返使用金额
|
BigDecimal tqq9_hsxfsyje = pm_purorderbill.getBigDecimal("tqq9_hsxfsyje");//含税现返使用金额
|
||||||
if (pm_purorderbill != null && !tqq9_isrebatecalculate&&(tqq9_hshfsyje.compareTo(BigDecimal.ZERO)>0||tqq9_hsxfsyje.compareTo(BigDecimal.ZERO)>0)) {
|
if (pm_purorderbill != null && !tqq9_isrebatecalculate && (tqq9_hshfsyje.compareTo(BigDecimal.ZERO) > 0 || tqq9_hsxfsyje.compareTo(BigDecimal.ZERO) > 0)) {
|
||||||
if (actpayamt.compareTo(tqq9_hshfsyje.add(tqq9_hsxfsyje)) < 0) {
|
if (actpayamt.compareTo(tqq9_hshfsyje.add(tqq9_hsxfsyje)) < 0) {
|
||||||
this.addErrorMessage(dataEntity, "单据号:" + billno + ",付款金额小于采购订单返利金额,不允许付款");
|
this.addErrorMessage(dataEntity, "单据号:" + billno + ",付款金额小于采购订单返利金额,不允许付款");
|
||||||
}
|
}
|
||||||
|
|
@ -171,7 +171,7 @@ public class PayBillOperationPlugin extends AbstractOperationServicePlugIn imple
|
||||||
DynamicObject pm_purorderbill = BusinessDataServiceHelper.loadSingle("pm_purorderbill", new QFilter[]{new QFilter("billno", QCP.equals, corebillno)});
|
DynamicObject pm_purorderbill = BusinessDataServiceHelper.loadSingle("pm_purorderbill", new QFilter[]{new QFilter("billno", QCP.equals, corebillno)});
|
||||||
Boolean tqq9_isrebatecalculate = pm_purorderbill.getBoolean("tqq9_isrebatecalculate");//是否已计算返利
|
Boolean tqq9_isrebatecalculate = pm_purorderbill.getBoolean("tqq9_isrebatecalculate");//是否已计算返利
|
||||||
String operationKey = e.getOperationKey();
|
String operationKey = e.getOperationKey();
|
||||||
if (pm_purorderbill != null &&tqq9_isrebatecalculate&&StringUtils.equals("pay",operationKey)) {
|
if (pm_purorderbill != null && !tqq9_isrebatecalculate && StringUtils.equals("pay", operationKey)) {
|
||||||
BigDecimal tqq9_hshfsyje = pm_purorderbill.getBigDecimal("tqq9_hshfsyje");//含税货返使用金额
|
BigDecimal tqq9_hshfsyje = pm_purorderbill.getBigDecimal("tqq9_hshfsyje");//含税货返使用金额
|
||||||
BigDecimal tqq9_hsxfsyje = pm_purorderbill.getBigDecimal("tqq9_hsxfsyje");//含税现返使用金额
|
BigDecimal tqq9_hsxfsyje = pm_purorderbill.getBigDecimal("tqq9_hsxfsyje");//含税现返使用金额
|
||||||
String tqq9_hfid = pm_purorderbill.getString("tqq9_hfid");//货返id
|
String tqq9_hfid = pm_purorderbill.getString("tqq9_hfid");//货返id
|
||||||
|
|
@ -190,19 +190,20 @@ public class PayBillOperationPlugin extends AbstractOperationServicePlugIn imple
|
||||||
HashMap map = gson.fromJson(bodyString, HashMap.class);
|
HashMap map = gson.fromJson(bodyString, HashMap.class);
|
||||||
Boolean data = (Boolean) map.get("data");
|
Boolean data = (Boolean) map.get("data");
|
||||||
if (data == null || !data) {
|
if (data == null || !data) {
|
||||||
lcLogService.savelog("FL-使用返利金额",Use_URL,false,false, bodyMap.toString(), bodyString);
|
lcLogService.savelog("FL-使用返利金额", Use_URL, false, false, bodyMap.toString(), bodyString);
|
||||||
this.getOperationResult().setMessage("付款单:" + billno + ",审核时扣除订单金额失败");
|
this.getOperationResult().setMessage("付款单:" + billno + ",审核时扣除订单金额失败");
|
||||||
} else {
|
} else {
|
||||||
pm_purorderbill.set("tqq9_isrebatecalculate", true);
|
pm_purorderbill.set("tqq9_isrebatecalculate", true);
|
||||||
lcLogService.savelog("FL-使用返利金额",Use_URL,false,true, bodyMap.toString(), bodyString);
|
lcLogService.savelog("FL-使用返利金额", Use_URL, false, true, bodyMap.toString(), bodyString);
|
||||||
SaveServiceHelper.save(new DynamicObject[]{pm_purorderbill});
|
SaveServiceHelper.save(new DynamicObject[]{pm_purorderbill});
|
||||||
}
|
}
|
||||||
} catch (IOException ex) {
|
} catch (IOException ex) {
|
||||||
lcLogService.savelog("FL-使用返利金额",Use_URL,false,true, bodyMap.toString(), "接口调用报错,errormessage:"+ex.getMessage());
|
lcLogService.savelog("FL-使用返利金额", Use_URL, false, true, bodyMap.toString(), "接口调用报错,errormessage:" + ex.getMessage());
|
||||||
throw new RuntimeException(ex);
|
throw new RuntimeException(ex);
|
||||||
}
|
}
|
||||||
//现返审核
|
}
|
||||||
} else if (tqq9_hsxfsyje.compareTo(BigDecimal.ZERO) > 0 && actpayamt.compareTo(BigDecimal.ZERO) > 0) {
|
//现返审核
|
||||||
|
if (tqq9_hsxfsyje.compareTo(BigDecimal.ZERO) > 0 && actpayamt.compareTo(BigDecimal.ZERO) > 0) {
|
||||||
BigDecimal notaxamount = tqq9_hsxfsyje.multiply(oneHundred.divide(oneHundred.add(new BigDecimal(13)), 10, RoundingMode.HALF_UP)).setScale(2, RoundingMode.HALF_UP);
|
BigDecimal notaxamount = tqq9_hsxfsyje.multiply(oneHundred.divide(oneHundred.add(new BigDecimal(13)), 10, RoundingMode.HALF_UP)).setScale(2, RoundingMode.HALF_UP);
|
||||||
BigDecimal taxamount = tqq9_hsxfsyje.subtract(notaxamount);//税额
|
BigDecimal taxamount = tqq9_hsxfsyje.subtract(notaxamount);//税额
|
||||||
HashMap<String, Object> bodyMap = new HashMap<>();
|
HashMap<String, Object> bodyMap = new HashMap<>();
|
||||||
|
|
@ -215,15 +216,15 @@ public class PayBillOperationPlugin extends AbstractOperationServicePlugIn imple
|
||||||
HashMap map = gson.fromJson(bodyString, HashMap.class);
|
HashMap map = gson.fromJson(bodyString, HashMap.class);
|
||||||
Boolean data = (Boolean) map.get("data");
|
Boolean data = (Boolean) map.get("data");
|
||||||
if (data == null || !data) {
|
if (data == null || !data) {
|
||||||
lcLogService.savelog("FL-使用返利金额",Use_URL,false,false, bodyMap.toString(), bodyString);
|
lcLogService.savelog("FL-使用返利金额", Use_URL, false, false, bodyMap.toString(), bodyString);
|
||||||
this.getOperationResult().setMessage("付款单:" + billno + ",审核时扣除订单金额失败");
|
this.getOperationResult().setMessage("付款单:" + billno + ",审核时扣除订单金额失败");
|
||||||
} else {
|
} else {
|
||||||
pm_purorderbill.set("tqq9_isrebatecalculate", true);
|
pm_purorderbill.set("tqq9_isrebatecalculate", true);
|
||||||
lcLogService.savelog("FL-使用返利金额",Use_URL,false,true, bodyMap.toString(), bodyString);
|
lcLogService.savelog("FL-使用返利金额", Use_URL, false, true, bodyMap.toString(), bodyString);
|
||||||
SaveServiceHelper.save(new DynamicObject[]{pm_purorderbill});
|
SaveServiceHelper.save(new DynamicObject[]{pm_purorderbill});
|
||||||
}
|
}
|
||||||
} catch (IOException ex) {
|
} catch (IOException ex) {
|
||||||
lcLogService.savelog("FL-使用返利金额",Use_URL,false,true, bodyMap.toString(), "接口调用报错,errormessage:"+ex.getMessage());
|
lcLogService.savelog("FL-使用返利金额", Use_URL, false, true, bodyMap.toString(), "接口调用报错,errormessage:" + ex.getMessage());
|
||||||
throw new RuntimeException(ex);
|
throw new RuntimeException(ex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ public class ValiddaysSavePlugin extends AbstractOperationServicePlugIn implemen
|
||||||
e.getFieldKeys().add("tqq9_datefield22");
|
e.getFieldKeys().add("tqq9_datefield22");
|
||||||
e.getFieldKeys().add("tqq9_validdays_yljg");
|
e.getFieldKeys().add("tqq9_validdays_yljg");
|
||||||
e.getFieldKeys().add("tqq9_licenseenddate");
|
e.getFieldKeys().add("tqq9_licenseenddate");
|
||||||
e.getFieldKeys().add("tqq9_validdays_hzp");
|
e.getFieldKeys().add("tqq9_integerfield");//
|
||||||
e.getFieldKeys().add("tqq9_zlbzxyyxqz");
|
e.getFieldKeys().add("tqq9_zlbzxyyxqz");
|
||||||
e.getFieldKeys().add("tqq9_validdays_zlbz");
|
e.getFieldKeys().add("tqq9_validdays_zlbz");
|
||||||
e.getFieldKeys().add("tqq9_datefield2");
|
e.getFieldKeys().add("tqq9_datefield2");
|
||||||
|
|
@ -101,7 +101,7 @@ public class ValiddaysSavePlugin extends AbstractOperationServicePlugIn implemen
|
||||||
Date tqq9_licenseenddate = dataEntity.getDate("tqq9_licenseenddate");//失效日期
|
Date tqq9_licenseenddate = dataEntity.getDate("tqq9_licenseenddate");//失效日期
|
||||||
if (tqq9_licenseenddate != null) {
|
if (tqq9_licenseenddate != null) {
|
||||||
remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_licenseenddate, currentDate);
|
remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_licenseenddate, currentDate);
|
||||||
dataEntity.set("tqq9_validdays_hzp", remainingDays);
|
dataEntity.set("tqq9_integerfield", remainingDays);
|
||||||
Long tqq9_minvaliddays = dataEntity.getLong("tqq9_minvaliddays");
|
Long tqq9_minvaliddays = dataEntity.getLong("tqq9_minvaliddays");
|
||||||
if (Long.compare(remainingDays, tqq9_minvaliddays) < 0) {
|
if (Long.compare(remainingDays, tqq9_minvaliddays) < 0) {
|
||||||
dataEntity.set("tqq9_minvaliddays", remainingDays);
|
dataEntity.set("tqq9_minvaliddays", remainingDays);
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ public class DaysRemainingTask extends AbstractTask implements Plugin {
|
||||||
QFilter f2 = new QFilter("status", QCP.equals, "C");
|
QFilter f2 = new QFilter("status", QCP.equals, "C");
|
||||||
DynamicObject[] suppliers = BusinessDataServiceHelper.load("bd_supplier",
|
DynamicObject[] suppliers = BusinessDataServiceHelper.load("bd_supplier",
|
||||||
"id,number,name,tqq9_datefield1,tqq9_validdays_ylqxsc,tqq9_datefield21,tqq9_validdays_ylqxjy,tqq9_datefield4,tqq9_validdays_ylqxjy2,tqq9_datefield22," +
|
"id,number,name,tqq9_datefield1,tqq9_validdays_ylqxsc,tqq9_datefield21,tqq9_validdays_ylqxjy,tqq9_datefield4,tqq9_validdays_ylqxjy2,tqq9_datefield22," +
|
||||||
"tqq9_validdays_yljg,tqq9_licenseenddate,tqq9_validdays_hzp,tqq9_zlbzxyyxqz,tqq9_validdays_zlbz,tqq9_datefield2,tqq9_validdays_gmp,tqq9_datefield7," +
|
"tqq9_validdays_yljg,tqq9_licenseenddate,tqq9_integerfield,tqq9_zlbzxyyxqz,tqq9_validdays_zlbz,tqq9_datefield2,tqq9_validdays_gmp,tqq9_datefield7," +
|
||||||
"tqq9_validdays_frsq,tqq9_datefield9,tqq9_validdays_yyzz,tqq9_gspyxqz,tqq9_validdays_gsp,tqq9_minvaliddays,creator.email",
|
"tqq9_validdays_frsq,tqq9_datefield9,tqq9_validdays_yyzz,tqq9_gspyxqz,tqq9_validdays_gsp,tqq9_minvaliddays,creator.email",
|
||||||
new QFilter[]{f1, f2});
|
new QFilter[]{f1, f2});
|
||||||
Date currentDate = new Date();//当前日期
|
Date currentDate = new Date();//当前日期
|
||||||
|
|
@ -107,7 +107,7 @@ public class DaysRemainingTask extends AbstractTask implements Plugin {
|
||||||
Date tqq9_licenseenddate = supplier.getDate("tqq9_licenseenddate");//失效日期
|
Date tqq9_licenseenddate = supplier.getDate("tqq9_licenseenddate");//失效日期
|
||||||
if (tqq9_licenseenddate != null) {
|
if (tqq9_licenseenddate != null) {
|
||||||
remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_licenseenddate, currentDate);
|
remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_licenseenddate, currentDate);
|
||||||
supplier.set("tqq9_validdays_hzp", remainingDays);
|
supplier.set("tqq9_integerfield", remainingDays);
|
||||||
Long tqq9_minvaliddays = supplier.getLong("tqq9_minvaliddays");
|
Long tqq9_minvaliddays = supplier.getLong("tqq9_minvaliddays");
|
||||||
if (remainingDays < tqq9_minvaliddays) {
|
if (remainingDays < tqq9_minvaliddays) {
|
||||||
supplier.set("tqq9_minvaliddays", remainingDays);
|
supplier.set("tqq9_minvaliddays", remainingDays);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue