diff --git a/src/main/java/com/yem/wm/es/salesorder/validator/SalesOrderSubmitValidator.java b/src/main/java/com/yem/wm/es/salesorder/validator/SalesOrderSubmitValidator.java index b3e7a8c5..be9af453 100644 --- a/src/main/java/com/yem/wm/es/salesorder/validator/SalesOrderSubmitValidator.java +++ b/src/main/java/com/yem/wm/es/salesorder/validator/SalesOrderSubmitValidator.java @@ -252,19 +252,19 @@ public class SalesOrderSubmitValidator extends AbstractValidator { BigDecimal debcuseamt = dynamicObject.getBigDecimal("yem_debcuseamt"); DynamicObject yemBdProducts = dataEntity.getDynamicObject("yem_bd_products"); Long along = 0L; - if (yemBdProducts!=null){ + if (yemBdProducts != null) { String number = yemBdProducts.getString("number"); - if ("CC".equals(number)||"CCPJ".equals(number)){ + if ("CC".equals(number) || "CCPJ".equals(number)) { DynamicObject loadSingle = BusinessDataServiceHelper.loadSingle("yem_bd_productsgroup", "id,number" , new QFilter[]{new QFilter("number", QCP.equals, "CC")}); along = loadSingle.getLong("id"); } - if ("TLJ".equals(number)||"TLJPJ".equals(number)){ + if ("TLJ".equals(number) || "TLJPJ".equals(number)) { DynamicObject loadSingle = BusinessDataServiceHelper.loadSingle("yem_bd_productsgroup", "id,number" , new QFilter[]{new QFilter("number", QCP.equals, "TLJ")}); along = loadSingle.getLong("id"); } - if ("ZZJ".equals(number)||"ZZJPJ".equals(number)){ + if ("ZZJ".equals(number) || "ZZJPJ".equals(number)) { DynamicObject loadSingle = BusinessDataServiceHelper.loadSingle("yem_bd_productsgroup", "id,number" , new QFilter[]{new QFilter("number", QCP.equals, "ZZJ")}); along = loadSingle.getLong("id"); @@ -275,7 +275,7 @@ public class SalesOrderSubmitValidator extends AbstractValidator { .and("yem_spcapitalpool_a.yem_debcredtype", QCP.equals, debcred) .and("yem_spcapitalpool_a.yem_creditype.id", QCP.equals, debcredtype) .and("yem_customer.id", QCP.equals, groupcustomers) - .and("yem_bd_products.id",QCP.equals,along); + .and("yem_bd_products.id", QCP.equals, along); DynamicObject single = BusinessDataServiceHelper.loadSingle("yem_spcapitalpool", qFilter.toArray()); if (single == null) return; DynamicObjectCollection singleCollection = single.getDynamicObjectCollection("yem_spcapitalpool_a"); @@ -438,7 +438,10 @@ public class SalesOrderSubmitValidator extends AbstractValidator { int row = j + 1; DynamicObject object = yem_accfunddetail.get(j); DynamicObject yem_debcredtype = object.getDynamicObject("yem_debcredtype");//贷记单类型 - long debcredtypeid = yem_debcredtype.getLong("id"); + long debcredtypeid = 0L; + if (yem_debcredtype != null) { + debcredtypeid = yem_debcredtype.getLong("id"); + } DynamicObject yem_debcrednotecurr = object.getDynamicObject("yem_debcrednotecurr");//贷记单使用币别 BigDecimal yem_creditrmbamt = object.getBigDecimal("yem_creditrmbamt");//贷记单人民币金额 BigDecimal yem_creditusdamt = object.getBigDecimal("yem_creditusdamt");//贷记单美元金额 @@ -831,7 +834,7 @@ public class SalesOrderSubmitValidator extends AbstractValidator { } - public static DynamicObject [] getCsrCreditLine(DynamicObject customer, DynamicObject method, DynamicObject company, String swiftCode) { + public static DynamicObject[] getCsrCreditLine(DynamicObject customer, DynamicObject method, DynamicObject company, String swiftCode) { if (YEM.isNotEmpty(customer) && YEM.isNotEmpty(method) && YEM.isNotEmpty(company)) { String selectfields = DynamicObjectUtil.getSelectfields("yem_im_csrcreditline", false); selectfields = DynamicObjectUtil.getEntrySelectfields(selectfields, "yem_im_csrcreditline", "yem_im_info", false);