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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
zhangzhiguo 2025-11-11 15:58:22 +08:00
parent be2a1315d4 a9a95e4141
commit f12c2c7dbc
2 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractSubmitOp.java
View File

@ -29,15 +29,31 @@ public class OutContractSubmitOp extends AbstractOperationServicePlugIn {
boolean zcgj_transset = ec_out_contract_settle.getBoolean("zcgj_transset");//按入库运费结算
if (zcgj_transset) {
DynamicObjectCollection itemEntryCollection = ec_out_contract_settle.getDynamicObjectCollection("itementry");//支付项分录
if (itemEntryCollection != null && itemEntryCollection.size() > 0) {
if (itemEntryCollection != null && itemEntryCollection.size() > 1) {
DynamicObject itemEntry0 = itemEntryCollection.get(0);
DynamicObject itemEntry1 = itemEntryCollection.get(1);
itemEntry0.set("payitem", itemEntry1.get("payitem"));
itemEntry0.set("oftaxamount", itemEntry1.get("oftaxamount"));
itemEntry0.set("amount", itemEntry1.get("amount"));
itemEntry0.set("rate", itemEntry1.get("rate"));
itemEntry0.set("taxamt", itemEntry1.get("taxamt"));
itemEntry0.set("itemunitproject", itemEntry1.get("itemunitproject"));
itemEntry0.set("itemca", itemEntry1.get("itemca"));
itemEntry0.set("itemcbs", itemEntry1.get("itemcbs"));
itemEntry0.set("itemboq", itemEntry1.get("itemboq"));
itemEntry0.set("remark", itemEntry1.get("remark"));
Iterator<DynamicObject> iterator = itemEntryCollection.iterator();//迭代器
while (iterator.hasNext()) {
DynamicObject itemEntry = iterator.next();
DynamicObject payItem1 = itemEntry.getDynamicObject("payitem");//合同支付项-名称
int seq = (int) itemEntry.get("seq");
if (seq == 2) {
iterator.remove();//注意一定要用迭代器remove
}
/* DynamicObject payItem1 = itemEntry.getDynamicObject("payitem");//合同支付项-名称
boolean hasSettleTrans1 = "HTJL".equals(payItem1.getString("number"));
if (hasSettleTrans1) {
iterator.remove();//注意一定要用迭代器remove
}
}*/
}
}
}

28
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractUnSubmitUnAuditOp.java
View File

@ -9,6 +9,8 @@ import kd.bos.orm.query.QFilter;
import kd.bos.servicehelper.BusinessDataServiceHelper;
import kd.bos.servicehelper.operation.SaveServiceHelper;
import java.math.BigDecimal;
/**
* 支出合同结算撤销反审核操作插件
*/
@ -30,9 +32,29 @@ public class OutContractUnSubmitUnAuditOp extends AbstractOperationServicePlugIn
boolean hasSettleTrans1 = "YFJS".equals(payItem1.getString("number"));
if (hasSettleTrans1) {
DynamicObjectType entrytype = ec_out_contract_settle.getDynamicObjectCollection("itementry").getDynamicObjectType();
DynamicObject newItemEntry = new DynamicObject(entrytype);
newItemEntry.set("payitem", "506427748873442304");
itemEntryCollection.add(0, newItemEntry);
DynamicObject newItemEntry1 = new DynamicObject(entrytype);
newItemEntry1.set("payitem", itemEntry.get("payitem"));
newItemEntry1.set("oftaxamount", itemEntry.get("oftaxamount"));
newItemEntry1.set("amount", itemEntry.get("amount"));
newItemEntry1.set("rate", itemEntry.get("rate"));
newItemEntry1.set("taxamt", itemEntry.get("taxamt"));
newItemEntry1.set("itemunitproject", itemEntry.get("itemunitproject"));
newItemEntry1.set("itemca", itemEntry.get("itemca"));
newItemEntry1.set("itemcbs", itemEntry.get("itemcbs"));
newItemEntry1.set("itemboq", itemEntry.get("itemboq"));
newItemEntry1.set("remark", itemEntry.get("remark"));
newItemEntry1.set("seq", "2");
itemEntryCollection.add(2, newItemEntry1);
itemEntry.set("payitem", "506427748873442304");
itemEntry.set("oftaxamount", BigDecimal.ZERO);
itemEntry.set("amount", BigDecimal.ZERO);
itemEntry.set("rate", BigDecimal.ZERO);
itemEntry.set("taxamt", BigDecimal.ZERO);
itemEntry.set("itemunitproject", null);
itemEntry.set("itemca", null);
itemEntry.set("itemcbs", null);
itemEntry.set("itemboq", null);
itemEntry.set("remark", "");
}
}
}