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

Revert "fix："

Browse Source 
This reverts commit 9b65b9fe15.
This commit is contained in:
ljw 2025-01-21 11:33:55 +08:00
parent 9f98f692fc
commit 923c2c26de
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java
View File

@ -187,6 +187,24 @@ public class CusdecToDeclaredocxTask extends AbstractTask {
declaredocx.set("yem_despportcodebase",user.getDynamicObject("yem_despportcodebase") ); declaredocx.set("yem_despportcodebase",user.getDynamicObject("yem_despportcodebase") );
declaredocx.set("yem_distinateportbase", user.getDynamicObject("yem_distinateportbase")); declaredocx.set("yem_distinateportbase", user.getDynamicObject("yem_distinateportbase"));
declaredocx.set("yem_transmodbase", user.getDynamicObject("yem_transmodbase")); declaredocx.set("yem_transmodbase", user.getDynamicObject("yem_transmodbase"));
// List<DynamicObject> userList = new ArrayList<>();
// DynamicObjectCollection userColl = declaredocx.getDynamicObjectCollection("yem_shipports");
// userList.add(user.getDynamicObject("yem_despportcodebase"));
// for (DynamicObject users: userList) {
// DynamicObject newUser = new DynamicObject(userColl.getDynamicObjectType());
// newUser.set("fbasedataId", users);
// userColl.add(newUser);
// }
// declaredocx.set("yem_shipports",userColl);
// List<DynamicObject> userLists = new ArrayList<>();
// DynamicObjectCollection userColls = declaredocx.getDynamicObjectCollection("yem_destports");
// userLists.add(user.getDynamicObject("yem_distinateportbase"));
// for (DynamicObject users: userLists) {
// DynamicObject newUser = new DynamicObject(userColls.getDynamicObjectType());
// newUser.set("fbasedataId", users);
// userColls.add(newUser);
// }
// declaredocx.set("yem_destports",userColls);
SaveServiceHelper.update(declaredocx); SaveServiceHelper.update(declaredocx);
SaveServiceHelper.save(new DynamicObject[]{declaredocx}); SaveServiceHelper.save(new DynamicObject[]{declaredocx});
if ("结关".equals(yemCusdecstatusname) && !YEM.isEmpty(yemFiedatets)) { if ("结关".equals(yemCusdecstatusname) && !YEM.isEmpty(yemFiedatets)) {

25
src/main/java/com/yem/wm/es/declaredocx/convert/DeclareDocxToExportinvoiceConvert.java
View File

@ -31,7 +31,6 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn {
//上游 //上游
String name = this.getSrcMainType().getName(); String name = this.getSrcMainType().getName();
ExtendedDataEntity[] findByEntityKeys = e.getTargetExtDataEntitySet().FindByEntityKey(targetName); ExtendedDataEntity[] findByEntityKeys = e.getTargetExtDataEntitySet().FindByEntityKey(targetName);
ExtendedDataEntity[] findBynames = e.getTargetExtDataEntitySet().FindByEntityKey(name);
for (ExtendedDataEntity findByEntityKey : findByEntityKeys) { for (ExtendedDataEntity findByEntityKey : findByEntityKeys) {
//携带合同中的佣金率 //携带合同中的佣金率
setRate(findByEntityKey); setRate(findByEntityKey);
@ -60,7 +59,7 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn {
BigDecimal yem_locamt = dynamicObject.getBigDecimal("yem_locamt"); BigDecimal yem_locamt = dynamicObject.getBigDecimal("yem_locamt");
dynamicObject2.set("yem_cusqty", yemCusqty.add(yemQty)); dynamicObject2.set("yem_cusqty", yemCusqty.add(yemQty));
dynamicObject2.set("yem_cusamount", yem_sellamt.add(yem_cusamount)); dynamicObject2.set("yem_cusamount", yem_sellamt.add(yem_cusamount));
dynamicObject2.set("yem_cusconsalesprice", BigDecimalUtils.div(yem_sellamt.add(yem_cusamount), yemCusqty.add(yemQty), 4)); dynamicObject2.set("yem_cusconsalesprice", BigDecimalUtils.div(yem_sellamt.add(yem_cusamount),yemCusqty.add(yemQty),4));
dynamicObject2.set("yem_localamount", yem_locamt.add(yem_localamount)); dynamicObject2.set("yem_localamount", yem_locamt.add(yem_localamount));
// dynamicObject2.set("yem_localamount", yem_locamt.add(yem_localamount)); // dynamicObject2.set("yem_localamount", yem_locamt.add(yem_localamount));
} }
@ -98,30 +97,10 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn {
// } // }
calculatePremium(dataEntity); calculatePremium(dataEntity);
for (ExtendedDataEntity findByname : findBynames) {
List<DynamicObject> userList = new ArrayList<>();
DynamicObjectCollection userColl =findByname.getDataEntity().getDynamicObjectCollection("yem_shipports");
userList.add((DynamicObject) findByEntityKey.getValue("yem_despportcodebase"));
for (DynamicObject users : userList) {
DynamicObject newUser = new DynamicObject(userColl.getDynamicObjectType());
newUser.set("fbasedataId", users);
userColl.add(newUser);
}
findByname.setValue("yem_shipports", userColl);
List<DynamicObject> userLists = new ArrayList<>();
DynamicObjectCollection userColls = findByname.getDataEntity().getDynamicObjectCollection("yem_destports");
userLists.add((DynamicObject) findByEntityKey.getValue("yem_distinateportbase"));
for (DynamicObject users : userLists) {
DynamicObject newUser = new DynamicObject(userColls.getDynamicObjectType());
newUser.set("fbasedataId", users);
userColls.add(newUser);
}
findByname.setValue("yem_destports", userColls);
}
} }
ExtendedDataEntity[] findByname = e.getTargetExtDataEntitySet().FindByEntityKey(targetName); ExtendedDataEntity[] findByname = e.getTargetExtDataEntitySet().FindByEntityKey(targetName);
yemCushscode(findByname); yemCushscode(findByname);
} }
private void yemCushscode(ExtendedDataEntity[] findByname) { private void yemCushscode(ExtendedDataEntity[] findByname) {