violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-zzs' into test

Browse Source
This commit is contained in:
zzs01@yunemao.com 2024-08-29 18:08:28 +08:00
commit 7756bbcf57
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/yem/wm/es/salesorder/op/SalesOrderSubmitOp.java
View File

@ -13,6 +13,7 @@ import kd.bos.dataentity.entity.DynamicObjectCollection;
import kd.bos.entity.plugin.AbstractOperationServicePlugIn;
import kd.bos.entity.plugin.AddValidatorsEventArgs;
import kd.bos.entity.plugin.PreparePropertysEventArgs;
import kd.bos.entity.plugin.args.AfterOperationArgs;
import kd.bos.entity.plugin.args.EndOperationTransactionArgs;
import kd.bos.orm.query.QCP;
import kd.bos.orm.query.QFilter;
@ -20,10 +21,7 @@ import kd.bos.servicehelper.BusinessDataServiceHelper;
import kd.bos.servicehelper.operation.SaveServiceHelper;
import java.math.BigDecimal;
import java.util.Calendar;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.*;
/**
* @Description
@ -109,6 +107,29 @@ public class SalesOrderSubmitOp extends AbstractOperationServicePlugIn {
// checkNewPrice(dataEntities);
}
@Override
public void afterExecuteOperationTransaction(AfterOperationArgs e) {
super.afterExecuteOperationTransaction(e);
DynamicObject[] eDataEntities = e.getDataEntities();
for (DynamicObject eDataEntity : eDataEntities) {
long aLong = eDataEntity.getLong("id");
DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle("yem_es_salesorder", "id,billno,yem_es_materialinfo" +
",yem_es_materialinfo.yem_multiconfig,yem_es_materialinfo.yem_optional,yem_multiconfig.yem_configurtypeen"
, new QFilter[]{new QFilter("id", QCP.equals, aLong)});
DynamicObjectCollection yemEsMaterialinfo = dynamicObject.getDynamicObjectCollection("yem_es_materialinfo");
for (DynamicObject yemEsMAterialin : yemEsMaterialinfo) {
DynamicObjectCollection yemMulticonfig = yemEsMAterialin.getDynamicObjectCollection("yem_multiconfig");
List<String> list = new ArrayList<>();
for (DynamicObject yemMulticon : yemMulticonfig) {
String yemConfigurtypeen = yemMulticon.getString("yem_configurtypeen");
list.add(yemConfigurtypeen+"\n");
}
String mergedString = String.join(";", list);
yemEsMAterialin.set("yem_optional",mergedString);
}
}
}
/**
* 更新配件客商额度申请单据
*

3
src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java
View File

@ -1168,6 +1168,7 @@ public class StorageTransEdit extends AbstractBillPlugIn implements BeforeF7Sele
public static void calculateExportAmount(DynamicObject dataEntity) {
String name = dataEntity.getDataEntityType().getName();
DynamicObjectCollection materialinfo = dataEntity.getDynamicObjectCollection("yem_es_materialinfo");
BigDecimal sum = BigDecimal.ZERO;
for (DynamicObject dynamicObject : materialinfo) {
BigDecimal adstamount = dynamicObject.getBigDecimal("yem_adstamount"); // 销售出库金额-提交
@ -1181,7 +1182,9 @@ public class StorageTransEdit extends AbstractBillPlugIn implements BeforeF7Sele
}
BigDecimal amt = adstamount.subtract(saamtpriceclause);
sum = sum.add(amt);
dynamicObject.set("yem_exportmat", amt);
}
dataEntity.set("yem_exportmatsum", sum);
}
}

4
src/main/java/com/yem/wm/im/csrCreditLine/task/CsrCreditLineTask.java
View File

@ -38,7 +38,7 @@ public class CsrCreditLineTask extends AbstractTask
for (DynamicObject object : collection) {
Date receivableDate = object.getDate("yem_paydate1");
if (receivableDate == null) continue;
object.set("yem_countpayback", CalendarUtils.calcPayBackCount(receivableDate));
object.set("yem_countpayback", -CalendarUtils.calcPayBackCount(receivableDate));
}
}
SaveServiceHelper.save(csrcreditlines);
@ -49,7 +49,7 @@ public class CsrCreditLineTask extends AbstractTask
for (DynamicObject object : collection) {
Date receivableDate = object.getDate("yem_paydate1");
if (receivableDate == null) continue;
object.set("yem_countpayback", CalendarUtils.calcPayBackCount(receivableDate));
object.set("yem_countpayback", -CalendarUtils.calcPayBackCount(receivableDate));
}
}
SaveServiceHelper.save(storagetrans);