【泛微采购合同】增加明细

This commit is contained in:
tanfengling@x-ri.com 2025-11-11 15:04:20 +08:00
parent 446c2e9067
commit 3a001dfae6
1 changed files with 41 additions and 13 deletions

View File

@ -3345,6 +3345,8 @@ public class FWImpl {
//返利规则
JSONObject detail1 = new JSONObject();
JSONArray recordsArr1 = new JSONArray();
JSONObject detail2 = new JSONObject();
JSONArray recordsArr2 = new JSONArray();
QFilter f1 = new QFilter("tqq9_conm_purcontract.number", "=", bill.getString("billno"));
QFilter f2 = new QFilter("enable", "=", "1");
DynamicObject[] ruleArr = BusinessDataServiceHelper.load("tqq9_pur_rebate", "id", new QFilter[]{f1,f2});
@ -3478,9 +3480,6 @@ public class FWImpl {
if("1".equals(tqq9_calc_procurement)){
jscgzb = 1;
}
BigDecimal ksjsjsbbh = rule.getBigDecimal("tqq9_excl_start_base");
BigDecimal jsjsjsbbh = rule.getBigDecimal("tqq9_excl_end_base");
BigDecimal bl = rule.getBigDecimal("tqq9_proportion");
BigDecimal flje = rule.getBigDecimal("tqq9_rebateamount");
String flgys = "";
DynamicObjectCollection tqq9_supplier = rule.getDynamicObjectCollection("tqq9_supplier");
@ -3492,6 +3491,36 @@ public class FWImpl {
if(StringUtils.isNotBlank(flgys)){
flgys = flgys.substring(1);
}
DynamicObjectCollection entries = rule.getDynamicObjectCollection("tqq9_rebate_entry");
for (DynamicObject entry : entries) {
BigDecimal ksjsjsbbh = entry.getBigDecimal("tqq9_excl_start_base");
BigDecimal jsjsjsbbh = entry.getBigDecimal("tqq9_excl_end_base");
BigDecimal bl = entry.getBigDecimal("tqq9_proportion");
JSONObject e0 = new JSONObject();
e0.put("fieldName", "flgzdjh");
e0.put("fieldValue", flgzdjh);
JSONObject e1 = new JSONObject();
e1.put("fieldName", "ksjsjsbbh");
e1.put("fieldValue", ksjsjsbbh!=null&&ksjsjsbbh.compareTo(BigDecimal.ZERO)!=0?ksjsjsbbh:0);
JSONObject e2 = new JSONObject();
e2.put("fieldName", "jsjsjsbbh");
e2.put("fieldValue", jsjsjsbbh!=null&&jsjsjsbbh.compareTo(BigDecimal.ZERO)!=0?jsjsjsbbh:0);
JSONObject e3 = new JSONObject();
e3.put("fieldName", "bl");
e3.put("fieldValue", bl!=null&&bl.compareTo(BigDecimal.ZERO)!=0?bl:0);
List<JSONObject> elist = Arrays.asList(e0,e1,e2,e3);
JSONArray recordsArr = new JSONArray();
recordsArr.addAll(elist);
JSONObject recordObj = new JSONObject();
recordObj.put("recordOrder", 0);
recordObj.put("workflowRequestTableFields", recordsArr);
recordsArr2.add(recordObj);
}
JSONObject e0 = new JSONObject();
e0.put("fieldName", "flgzdjh");
e0.put("fieldValue", flgzdjh);
@ -3567,15 +3596,6 @@ public class FWImpl {
JSONObject e24 = new JSONObject();
e24.put("fieldName", "jscgzb");
e24.put("fieldValue", jscgzb);
JSONObject e25 = new JSONObject();
e25.put("fieldName", "ksjsjsbbh");
e25.put("fieldValue", ksjsjsbbh!=null&&ksjsjsbbh.compareTo(BigDecimal.ZERO)!=0?ksjsjsbbh:0);
JSONObject e26 = new JSONObject();
e26.put("fieldName", "jsjsjsbbh");
e26.put("fieldValue", jsjsjsbbh!=null&&jsjsjsbbh.compareTo(BigDecimal.ZERO)!=0?jsjsjsbbh:0);
JSONObject e27 = new JSONObject();
e27.put("fieldName", "bl");
e27.put("fieldValue", bl!=null&&bl.compareTo(BigDecimal.ZERO)!=0?bl:0);
JSONObject e28 = new JSONObject();
e28.put("fieldName", "flje");
e28.put("fieldValue", flje!=null&&flje.compareTo(BigDecimal.ZERO)!=0?flje:0);
@ -3584,7 +3604,7 @@ public class FWImpl {
e29.put("fieldValue", flgys);
List<JSONObject> elist = Arrays.asList(e0,e1,e2,e3,e4,e5,e6,e7,e8,e9,e10,e11,e12,e13,e14,e15,e16,e17,e18
,e19,e20,e21,e22,e23,e24,e25,e26,e27,e28,e29);
,e19,e20,e21,e22,e23,e24,e28,e29);
JSONArray recordsArr = new JSONArray();
recordsArr.addAll(elist);
@ -3598,8 +3618,16 @@ public class FWImpl {
if(StringUtils.isNotBlank(tqq9_fwrequestid)){
detail1.put("deleteAll", "1");
}
detail2.put("tableDBName", "formtable_main_101_dt2");
detail2.put("workflowRequestTableRecords", recordsArr2);
if(StringUtils.isNotBlank(tqq9_fwrequestid)){
detail2.put("deleteAll", "1");
}
JSONArray detailRootArr = new JSONArray();
detailRootArr.add(detail1);
detailRootArr.add(detail2);
//构建主表数据
JSONObject ma = new JSONObject();