Merge branch 'dev-ljw'

This commit is contained in:
zzs01@yunemao.com 2024-08-28 22:13:26 +08:00
commit 068d66138b

View File

@ -124,15 +124,13 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn {
if (load != null) {
DynamicObjectCollection dynamicObjectCollection1 = load.getDynamicObjectCollection("yem_ca_cddetailedentry");
for (DynamicObject object : dynamicObjectCollection1) {
DynamicObject yemCodets = object.getDynamicObject("yem_codets");
String yemCodets = object.getString("yem_codets");
BigDecimal bigDecimal = object.getBigDecimal("yem_declprice");
String string = object.getString("yem_codetsname");
String string = object.getString("yem_gname");
DynamicObject yemGunit = object.getDynamicObject("yem_gunit");
DynamicObject yemunit = object.getDynamicObject("yem_unit1");
DynamicObject yemUnit = object.getDynamicObject("yem_unit2");
if (yemCodets != null) {
String yemCodetsString = yemCodets.getString("number");
if (yemCodetsString.equals(yemCushscodeString) && bigDecimal.compareTo(yemCusconsalesprice) == 0 && yemDecmatericalname.equals(string)) {
if (yemCodets.equals(yemCushscodeString) && bigDecimal.compareTo(yemCusconsalesprice) == 0 && yemDecmatericalname.equals(string)) {
DynamicObjectCollection dynamicObjectCollection2 = dataEntity.getDynamicObjectCollection("yem_exportinvoice_c");
for (DynamicObject dynamicObject1 : dynamicObjectCollection2) {
long aLong = dynamicObject1.getLong("yem_sourcebillentryid");
@ -142,7 +140,6 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn {
dynamicObject1.set("yem_measurement", yemUnit);
}
}
}
}
}
}