Merge branch 'dev-ljw'

This commit is contained in:
zzs01@yunemao.com 2024-08-28 22:03:01 +08:00
commit eddc69e089

View File

@ -113,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);
//单一窗口报关单