zhangzhiguo
/
zhongcaiguoji
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

This commit is contained in:
xiaoshi 2025-06-20 15:27:39 +08:00
parent 4865e3cf61
commit 7d4682e389
1 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractSettlementValidator.java
View File

@ -25,72 +25,72 @@ public class OutContractSettlementValidator extends OutContractSettleValidator {
if(dataEntity1.getBoolean("zcgj_is_reversabillid") || dataEntity1.getBoolean("zcgj_is_invalid")){ if(dataEntity1.getBoolean("zcgj_is_reversabillid") || dataEntity1.getBoolean("zcgj_is_invalid")){
return true; return true;
} }
DynamicObjectCollection listmodelentrys = dataEntity1.getDynamicObjectCollection("listmodelentry");//分录 // DynamicObjectCollection listmodelentrys = dataEntity1.getDynamicObjectCollection("listmodelentry");//分录
for (DynamicObject payitemdetailentry : dataEntity1.getDynamicObjectCollection("payitemdetailentry")) { // for (DynamicObject payitemdetailentry : dataEntity1.getDynamicObjectCollection("payitemdetailentry")) {
long referbillid = payitemdetailentry.getLong("referbillid"); // long referbillid = payitemdetailentry.getLong("referbillid");
QFilter f1 = new QFilter("id", "=", referbillid); // QFilter f1 = new QFilter("id", "=", referbillid);
DynamicObject outcontractmeasure = BusinessDataServiceHelper.loadSingle("ec_outcontractmeasure", new QFilter[]{f1}); // DynamicObject outcontractmeasure = BusinessDataServiceHelper.loadSingle("ec_outcontractmeasure", new QFilter[]{f1});
if(outcontractmeasure!=null){ // if(outcontractmeasure!=null){
DynamicObjectCollection listmodelentry = outcontractmeasure.getDynamicObjectCollection("listmodelentry"); // DynamicObjectCollection listmodelentry = outcontractmeasure.getDynamicObjectCollection("listmodelentry");
//判断是否有含有计量单id 若有跳过 避免多次新增 // //判断是否有含有计量单id 若有跳过 避免多次新增
Set<String> set = new HashSet(); // Set<String> set = new HashSet();
// QFilter f2 = new QFilter("id", "!=", "0"); //// QFilter f2 = new QFilter("id", "!=", "0");
DynamicObjectCollection query = QueryServiceHelper.query(dataEntity1.getDynamicObjectType().getName(), "listmodelentry.zcgj_jldenrtyid", null); // DynamicObjectCollection query = QueryServiceHelper.query(dataEntity1.getDynamicObjectType().getName(), "listmodelentry.zcgj_jldenrtyid", null);
// DynamicObject[] jldenrtyids = BusinessDataServiceHelper.load(listmodelentrys.getDynamicObjectType().getName(),"zcgj_jldenrtyid", new QFilter[]{f2}); //// DynamicObject[] jldenrtyids = BusinessDataServiceHelper.load(listmodelentrys.getDynamicObjectType().getName(),"zcgj_jldenrtyid", new QFilter[]{f2});
for (DynamicObject object : query) { // for (DynamicObject object : query) {
String id = object.getString("listmodelentry.zcgj_jldenrtyid"); // String id = object.getString("listmodelentry.zcgj_jldenrtyid");
if (id != null) { // if (id != null) {
set.add(id); // set.add(id);
} // }
} // }
for (DynamicObject listmodelEntry : listmodelentry) { // for (DynamicObject listmodelEntry : listmodelentry) {
String id = listmodelEntry.getString("id"); // String id = listmodelEntry.getString("id");
if (set.contains(id)) { // if (set.contains(id)) {
continue; // continue;
} // }
DynamicObject addNew = listmodelentrys.addNew(); // DynamicObject addNew = listmodelentrys.addNew();
addNew.set("modelname", listmodelEntry.getString("modelname"));//清单模板名称 // addNew.set("modelname", listmodelEntry.getString("modelname"));//清单模板名称
addNew.set("cmptype", listmodelEntry.getString("cmptype"));//文本 // addNew.set("cmptype", listmodelEntry.getString("cmptype"));//文本
addNew.set("totalamount", listmodelEntry.getBigDecimal("totalamount"));//税额 // addNew.set("totalamount", listmodelEntry.getBigDecimal("totalamount"));//税额
addNew.set("totaltax", listmodelEntry.getBigDecimal("totaltax"));//税额 // addNew.set("totaltax", listmodelEntry.getBigDecimal("totaltax"));//税额
addNew.set("totaloftaxamount", listmodelEntry.getBigDecimal("totaloftaxamount"));//价税合计 // addNew.set("totaloftaxamount", listmodelEntry.getBigDecimal("totaloftaxamount"));//价税合计
addNew.set("listmodelid", listmodelEntry.getLong(("listmodelid")));//清单模板id // addNew.set("listmodelid", listmodelEntry.getLong(("listmodelid")));//清单模板id
addNew.set("zcgj_jldenrtyid", id);//计量单分录id // addNew.set("zcgj_jldenrtyid", id);//计量单分录id
DynamicObjectCollection listEntry = addNew.getDynamicObjectCollection("listentry");//结算分录 // DynamicObjectCollection listEntry = addNew.getDynamicObjectCollection("listentry");//结算分录
DynamicObjectCollection measureEntry = listmodelEntry.getDynamicObjectCollection("listentry");//计量分录 // DynamicObjectCollection measureEntry = listmodelEntry.getDynamicObjectCollection("listentry");//计量分录
for (DynamicObject dynamicObject : measureEntry) { // for (DynamicObject dynamicObject : measureEntry) {
DynamicObject object = listEntry.addNew(); // DynamicObject object = listEntry.addNew();
object.set("listing", dynamicObject.getDynamicObject("listing"));//清单编码 // object.set("listing", dynamicObject.getDynamicObject("listing"));//清单编码
object.set("listingname", dynamicObject.getString("listingname"));//清单名称 // object.set("listingname", dynamicObject.getString("listingname"));//清单名称
object.set("materiel", dynamicObject.getDynamicObject("materiel"));//物料编码 // object.set("materiel", dynamicObject.getDynamicObject("materiel"));//物料编码
object.set("resourceitem", dynamicObject.getDynamicObject("listing"));//资源编码 // object.set("resourceitem", dynamicObject.getDynamicObject("listing"));//资源编码
object.set("resname", dynamicObject.getString("resname"));//资源名称 // object.set("resname", dynamicObject.getString("resname"));//资源名称
object.set("boqnumber", dynamicObject.getDynamicObject("boqnumber"));//工程量清单编码 // object.set("boqnumber", dynamicObject.getDynamicObject("boqnumber"));//工程量清单编码
object.set("contlistnumber", dynamicObject.getDynamicObject("contlistnumber"));// // object.set("contlistnumber", dynamicObject.getDynamicObject("contlistnumber"));//
object.set("measureunit", dynamicObject.getDynamicObject("measureunit"));//计量单位 // object.set("measureunit", dynamicObject.getDynamicObject("measureunit"));//计量单位
object.set("totalqty", dynamicObject.getBigDecimal("totalqty"));//总数量 // object.set("totalqty", dynamicObject.getBigDecimal("totalqty"));//总数量
object.set("entrytaxrate", dynamicObject.getBigDecimal("entrytaxrate"));//税率（%） // object.set("entrytaxrate", dynamicObject.getBigDecimal("entrytaxrate"));//税率（%）
object.set("curtaxprice", dynamicObject.getBigDecimal("curtaxprice"));//当前含税单价 // object.set("curtaxprice", dynamicObject.getBigDecimal("curtaxprice"));//当前含税单价
object.set("currentprice", dynamicObject.getBigDecimal("currentprice"));//当前单价 // object.set("currentprice", dynamicObject.getBigDecimal("currentprice"));//当前单价
object.set("currentamt", dynamicObject.getBigDecimal("currentamt"));//当前金额 // object.set("currentamt", dynamicObject.getBigDecimal("currentamt"));//当前金额
object.set("currenttaxamt", dynamicObject.getBigDecimal("currenttaxamt"));//当前税额 // object.set("currenttaxamt", dynamicObject.getBigDecimal("currenttaxamt"));//当前税额
object.set("currentoftax", dynamicObject.getBigDecimal("currentoftax"));//当前价税合计 // object.set("currentoftax", dynamicObject.getBigDecimal("currentoftax"));//当前价税合计
object.set("preqty", dynamicObject.getBigDecimal("preqty"));//期初累计计量数量 // object.set("preqty", dynamicObject.getBigDecimal("preqty"));//期初累计计量数量
object.set("preamout", dynamicObject.getBigDecimal("preamout"));//期初累计计量金额 // object.set("preamout", dynamicObject.getBigDecimal("preamout"));//期初累计计量金额
object.set("thisqty", dynamicObject.getBigDecimal("thisqty"));//本期计量数量 // object.set("thisqty", dynamicObject.getBigDecimal("thisqty"));//本期计量数量
object.set("thisamount", dynamicObject.getBigDecimal("thisamount"));//本期计量不含税金额 // object.set("thisamount", dynamicObject.getBigDecimal("thisamount"));//本期计量不含税金额
object.set("thistax", dynamicObject.getBigDecimal("thistax"));//本期税额 // object.set("thistax", dynamicObject.getBigDecimal("thistax"));//本期税额
object.set("thisoftaxmount", dynamicObject.getBigDecimal("thisoftaxmount"));//本期计量含税金额 // object.set("thisoftaxmount", dynamicObject.getBigDecimal("thisoftaxmount"));//本期计量含税金额
object.set("lstqty", dynamicObject.getBigDecimal("lstqty"));//期末累计计量数量 // object.set("lstqty", dynamicObject.getBigDecimal("lstqty"));//期末累计计量数量
object.set("lstamount", dynamicObject.getBigDecimal("lstamount"));//期末累计计量不含税金额 // object.set("lstamount", dynamicObject.getBigDecimal("lstamount"));//期末累计计量不含税金额
object.set("listca", dynamicObject.getDynamicObject("listca"));//成本科目 // object.set("listca", dynamicObject.getDynamicObject("listca"));//成本科目
object.set("listcbs", dynamicObject.getDynamicObject("listcbs"));//成本分解结构 // object.set("listcbs", dynamicObject.getDynamicObject("listcbs"));//成本分解结构
object.set("listboq", dynamicObject.getDynamicObject("listboq"));//工程量清单 // object.set("listboq", dynamicObject.getDynamicObject("listboq"));//工程量清单
object.set("desc", dynamicObject.getString("desc"));//说明 // object.set("desc", dynamicObject.getString("desc"));//说明
} // }
} // }
} // }
} // }
// OperationResult saveOperationResult = SaveServiceHelper.saveOperate(dataEntity1.getDataEntityType().getName(), new DynamicObject[]{dataEntity1}, null);//项目实体 // OperationResult saveOperationResult = SaveServiceHelper.saveOperate(dataEntity1.getDataEntityType().getName(), new DynamicObject[]{dataEntity1}, null);//项目实体
BigDecimal settleOfTaxAmount = dataEntity.getDataEntity().getBigDecimal("settleoftaxamount"); BigDecimal settleOfTaxAmount = dataEntity.getDataEntity().getBigDecimal("settleoftaxamount");