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

入库单提交日期校验逻辑优化；收入财务确认单反写逻辑优化

This commit is contained in:
xuhaihui 2026-01-08 13:41:48 +08:00
parent 7600b81f21
commit d8eab8e0a9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/FinaceConfirmRevWriteAmtOp.java
View File

@ -47,7 +47,7 @@ public class FinaceConfirmRevWriteAmtOp extends AbstractOperationServicePlugIn {
protected void updateInApplyReversaAmt(DynamicObject[] dataEntities, boolean isAudit) {
for (DynamicObject dataEntity : dataEntities) {
String zcgj_bolttype = dataEntity.getString("zcgj_bolttype");//冲销类型
if ("10".equals(zcgj_bolttype)) {
if ("10".equals(zcgj_bolttype) || "40".equals(zcgj_bolttype)) {
//冲销合同履约记录
DynamicObjectCollection PerFormRecCollection = dataEntity.getDynamicObjectCollection("zcgj_performrec");//冲销履约记录分录
for (DynamicObject perFormRec : PerFormRecCollection) {
@ -64,7 +64,8 @@ public class FinaceConfirmRevWriteAmtOp extends AbstractOperationServicePlugIn {
ec_in_perFormRecords.set("zcgj_taxperformflot", zcgj_taxperformflot);//含税履约金额（已冲销）
SaveServiceHelper.save(new DynamicObject[]{ec_in_perFormRecords});
}
} else if ("20".equals(zcgj_bolttype)) {
}
if ("20".equals(zcgj_bolttype) || "40".equals(zcgj_bolttype)) {
//冲销业主支出结算
DynamicObjectCollection expenseReversalCollection = dataEntity.getDynamicObjectCollection("zcgj_expensereversal");//冲销支出结算分录
for (DynamicObject expenseReversal : expenseReversalCollection) {

2
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaterialInBillDateSubValidatorOp.java
View File

@ -58,7 +58,7 @@ public class MaterialInBillDateSubValidatorOp extends AbstractOperationServicePl
boolean zcgj_ispurchaseapplys = ecma_MaterialInBill.getBoolean("zcgj_ispurchaseapplys");//多采购申请
if (zcgj_ispurchaseapplys) {
DynamicObjectCollection zcgj_purchaseapplyentryCollection = ecma_MaterialInBill.getDynamicObjectCollection("zcgj_purchaseapplyentry");//采购申请分录
if (zcgj_purchaseapplyentryCollection.size() > 0) {
if (zcgj_purchaseapplyentryCollection.size() == 1) {
for (DynamicObject zcgj_purchaseapplyentry : zcgj_purchaseapplyentryCollection) {
DynamicObject zcgj_purchaseapply = zcgj_purchaseapplyentry.getDynamicObject("zcgj_purchaseapply_f7");//采购申请
if (zcgj_purchaseapply == null) {