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

Merge branch 'main' into dev-zzs

Browse Source
This commit is contained in:
zzs01@yunemao.com 2024-08-29 09:24:26 +08:00
commit 98a5437cbf
2 changed files with 10 additions and 13 deletions
src/main/java/com/yem/wm/es
declaredocx/convert
DeclareDocxToExportinvoiceConvert.java
salesorder/from
SalesOrderPJEdit.java

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

@ -93,7 +93,6 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn {
calculatePremium(dataEntity);
}
ExtendedDataEntity[] findByname = e.getTargetExtDataEntitySet().FindByEntityKey(targetName);
yemCushscode(findByname);
}
@ -114,9 +113,10 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn {
String yemCushscodeString = yemCushscode.getString("number");
String yemDecmatericalname = dynamicObject.getString("yem_decmatericalname");
BigDecimal yemCusconsalesprice = dynamicObject.getBigDecimal("yem_cusconsalesprice");
QFilter qFilter = new QFilter("yem_ca_cddetailedentry.yem_codets.number", QCP.equals, yemCushscodeString);
qFilter.and(new QFilter("yem_ca_cddetailedentry.yem_codetsname", QCP.equals, yemDecmatericalname));
QFilter qFilter = new QFilter("yem_ca_cddetailedentry.yem_codets", QCP.equals, yemCushscodeString);
qFilter.and(new QFilter("yem_ca_cddetailedentry.yem_gname", QCP.equals, yemDecmatericalname));
qFilter.and(new QFilter("yem_ca_cddetailedentry.yem_declprice", QCP.equals, yemCusconsalesprice));
// qFilter.and("billno",QCP.equals,"431020240000181817");
String selectfield = DynamicObjectUtil.getSelectfields("yem_ca_cusdec", false);
String selectfields = DynamicObjectUtil.getEntrySelectfields(selectfield, "yem_ca_cusdec", "yem_ca_cddetailedentry", false);
//单一窗口报关单
@ -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);
}
}
}
}
}
}

8
src/main/java/com/yem/wm/es/salesorder/from/SalesOrderPJEdit.java
View File

@ -377,10 +377,10 @@ public class SalesOrderPJEdit extends AbstractBillPlugIn implements Plugin, Befo
break;
case "yem_sharethecost":
case "yem_sumedamount":
String dataNewValue =(String) this.getModel().getValue("yem_sharethecost");
if ("A".equals(dataNewValue)){
calculateCostSharing(model);
}
// String dataNewValue =(String) this.getModel().getValue("yem_sharethecost");
// if ("A".equals(dataNewValue)){
// }
calculateCostSharing(model);
break;
}
}