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

Compare commits

base: violet:98a5437cbf0cb93e2685ae491790637802ed4244
Branches Tags
violet:main
violet:test
violet:dev-1217-req
violet:dev-new-test
violet:dev-comp-price
violet:dev-ljw
violet:dev_zhouc
violet:dev-zhouc
violet:dev-plm
violet:dev-change
violet:fix-warehouse
violet:fix-report-zzs
violet:dev-zzs
violet:dev-price
violet:dev-calc
..
compare: violet:d7458c3f8d01fc0018e7d749296075ab70b951c5
Branches Tags
violet:main
violet:test
violet:dev-1217-req
violet:dev-new-test
violet:dev-comp-price
violet:dev-ljw
violet:dev_zhouc
violet:dev-zhouc
violet:dev-plm
violet:dev-change
violet:fix-warehouse
violet:fix-report-zzs
violet:dev-zzs
violet:dev-price
violet:dev-calc

No commits in common. "98a5437cbf0cb93e2685ae491790637802ed4244" and "d7458c3f8d01fc0018e7d749296075ab70b951c5" have entirely different histories.
98a5437cbf ... d7458c3f8d

2 changed files with 13 additions and 10 deletions
Show Stats Expand all files Collapse all files

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

@ -93,6 +93,7 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn {
calculatePremium(dataEntity); calculatePremium(dataEntity);
} }
ExtendedDataEntity[] findByname = e.getTargetExtDataEntitySet().FindByEntityKey(targetName); ExtendedDataEntity[] findByname = e.getTargetExtDataEntitySet().FindByEntityKey(targetName);
yemCushscode(findByname); yemCushscode(findByname);
} }
@ -113,10 +114,9 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn {
String yemCushscodeString = yemCushscode.getString("number"); String yemCushscodeString = yemCushscode.getString("number");
String yemDecmatericalname = dynamicObject.getString("yem_decmatericalname"); String yemDecmatericalname = dynamicObject.getString("yem_decmatericalname");
BigDecimal yemCusconsalesprice = dynamicObject.getBigDecimal("yem_cusconsalesprice"); BigDecimal yemCusconsalesprice = dynamicObject.getBigDecimal("yem_cusconsalesprice");
QFilter qFilter = new QFilter("yem_ca_cddetailedentry.yem_codets", QCP.equals, yemCushscodeString); QFilter qFilter = new QFilter("yem_ca_cddetailedentry.yem_codets.number", QCP.equals, yemCushscodeString);
qFilter.and(new QFilter("yem_ca_cddetailedentry.yem_gname", QCP.equals, yemDecmatericalname)); qFilter.and(new QFilter("yem_ca_cddetailedentry.yem_codetsname", QCP.equals, yemDecmatericalname));
qFilter.and(new QFilter("yem_ca_cddetailedentry.yem_declprice", QCP.equals, yemCusconsalesprice)); 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 selectfield = DynamicObjectUtil.getSelectfields("yem_ca_cusdec", false);
String selectfields = DynamicObjectUtil.getEntrySelectfields(selectfield, "yem_ca_cusdec", "yem_ca_cddetailedentry", false); String selectfields = DynamicObjectUtil.getEntrySelectfields(selectfield, "yem_ca_cusdec", "yem_ca_cddetailedentry", false);
//单一窗口报关单 //单一窗口报关单
@ -124,13 +124,15 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn {
if (load != null) { if (load != null) {
DynamicObjectCollection dynamicObjectCollection1 = load.getDynamicObjectCollection("yem_ca_cddetailedentry"); DynamicObjectCollection dynamicObjectCollection1 = load.getDynamicObjectCollection("yem_ca_cddetailedentry");
for (DynamicObject object : dynamicObjectCollection1) { for (DynamicObject object : dynamicObjectCollection1) {
String yemCodets = object.getString("yem_codets"); DynamicObject yemCodets = object.getDynamicObject("yem_codets");
BigDecimal bigDecimal = object.getBigDecimal("yem_declprice"); BigDecimal bigDecimal = object.getBigDecimal("yem_declprice");
String string = object.getString("yem_gname"); String string = object.getString("yem_codetsname");
DynamicObject yemGunit = object.getDynamicObject("yem_gunit"); DynamicObject yemGunit = object.getDynamicObject("yem_gunit");
DynamicObject yemunit = object.getDynamicObject("yem_unit1"); DynamicObject yemunit = object.getDynamicObject("yem_unit1");
DynamicObject yemUnit = object.getDynamicObject("yem_unit2"); DynamicObject yemUnit = object.getDynamicObject("yem_unit2");
if (yemCodets.equals(yemCushscodeString) && bigDecimal.compareTo(yemCusconsalesprice) == 0 && yemDecmatericalname.equals(string)) { if (yemCodets != null) {
String yemCodetsString = yemCodets.getString("number");
if (yemCodetsString.equals(yemCushscodeString) && bigDecimal.compareTo(yemCusconsalesprice) == 0 && yemDecmatericalname.equals(string)) {
DynamicObjectCollection dynamicObjectCollection2 = dataEntity.getDynamicObjectCollection("yem_exportinvoice_c"); DynamicObjectCollection dynamicObjectCollection2 = dataEntity.getDynamicObjectCollection("yem_exportinvoice_c");
for (DynamicObject dynamicObject1 : dynamicObjectCollection2) { for (DynamicObject dynamicObject1 : dynamicObjectCollection2) {
long aLong = dynamicObject1.getLong("yem_sourcebillentryid"); long aLong = dynamicObject1.getLong("yem_sourcebillentryid");
@ -140,6 +142,7 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn {
dynamicObject1.set("yem_measurement", yemUnit); 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; break;
case "yem_sharethecost": case "yem_sharethecost":
case "yem_sumedamount": case "yem_sumedamount":
// String dataNewValue =(String) this.getModel().getValue("yem_sharethecost"); String dataNewValue =(String) this.getModel().getValue("yem_sharethecost");
// if ("A".equals(dataNewValue)){ if ("A".equals(dataNewValue)){
// } calculateCostSharing(model);
calculateCostSharing(model); }
break; break;
} }
} }